Skip to content

Commit

Permalink
release v0.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Gitshaoxiang committed Sep 20, 2023
1 parent 1e81176 commit ef6fbd4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ $RECYCLE.BIN/
*.msm
*.msp

*.svd
*.cfg

debug_custom.json

# Windows shortcuts
*.lnk

Expand Down
5 changes: 5 additions & 0 deletions examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
#include <Wire.h> //The DHT12 uses I2C comunication.

#include "DHT12.h"


#define BLYNK_TEMPLATE_ID "TMPxxxxxx"
#define BLYNK_TEMPLATE_NAME "Device"

DHT12 dht12; // Preset scale CELSIUS and ID 0x5c.

// You should get Auth Token in the Blynk App.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Module at the same time)
*/
#include <M5Stack.h>

#include "MODULE_GRBL13.2.h"
#include "Module_GRBL_13.2.h"

/*
* The I2C address of GRBL 13.2 Module is 0x70 by default.
Expand All @@ -28,8 +28,8 @@ Module at the same time)
#define STEPMOTOR_I2C_ADDR_1 0x70
#define STEPMOTOR_I2C_ADDR_2 0x71

GRBL _GRBL_A = GRBL(STEPMOTOR_I2C_ADDR_1);
GRBL _GRBL_B = GRBL(STEPMOTOR_I2C_ADDR_2);
Module_GRBL _GRBL_A(STEPMOTOR_I2C_ADDR_1);
Module_GRBL _GRBL_B(STEPMOTOR_I2C_ADDR_2);

void setup() {
// put your setup code here, to run once:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
#include <M5Stack.h>

#include "MODULE_GRBL13.2.h"
#include "Module_GRBL_13.2.h"

/*
* The I2C address of GRBL 13.2 Module is 0x70 by default.
Expand All @@ -26,7 +26,7 @@
#define STEPMOTOR_I2C_ADDR 0x70
// #define STEPMOTOR_I2C_ADDR 0x71

GRBL _GRBL = GRBL(STEPMOTOR_I2C_ADDR);
Module_GRBL _GRBL(STEPMOTOR_I2C_ADDR);

void setup() {
// put your setup code here, to run once:
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type": "git",
"url": "https://github.com/m5stack/m5stack.git"
},
"version": "0.4.5",
"version": "0.4.6",
"frameworks": "arduino",
"platforms": "espressif32",
"headers": "M5Stack.h"
Expand Down
4 changes: 2 additions & 2 deletions library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=M5Stack
version=0.4.5
version=0.4.6
author=M5Stack
maintainer=M5Stack
sentence=Library for M5Stack Core development kit
Expand All @@ -8,4 +8,4 @@ category=Device Control
url=https://github.com/m5stack/m5stack
architectures=esp32
includes=M5Stack.h
depends=M5Family,M5Module-4Relay,MODULE_GRBL13.2,M5_BMM150
depends=M5Family,M5Module-4Relay,Module_GRBL_13.2,M5_BMM150

0 comments on commit ef6fbd4

Please sign in to comment.