From ef6fbd4164f8c647f5fab947c17771f7d88760ae Mon Sep 17 00:00:00 2001 From: sean <1026025056@qq.com> Date: Wed, 20 Sep 2023 15:02:46 +0800 Subject: [PATCH] release v0.4.6 --- .gitignore | 5 +++++ examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino | 5 +++++ .../StepmotorGRBL13.2_M035/multi_control/multi_control.ino | 6 +++--- .../StepmotorGRBL13.2_M035/xyz_control/xyz_control.ino | 4 ++-- library.json | 2 +- library.properties | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 879fa434..2b550b97 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ $RECYCLE.BIN/ *.msm *.msp +*.svd +*.cfg + +debug_custom.json + # Windows shortcuts *.lnk diff --git a/examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino b/examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino index b9bccf3f..8d76d743 100644 --- a/examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino +++ b/examples/Advanced/Blynk/Post-DHT12/Post-DHT12.ino @@ -29,6 +29,11 @@ #include //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. diff --git a/examples/Modules/StepmotorGRBL13.2_M035/multi_control/multi_control.ino b/examples/Modules/StepmotorGRBL13.2_M035/multi_control/multi_control.ino index 287f802a..39a98990 100644 --- a/examples/Modules/StepmotorGRBL13.2_M035/multi_control/multi_control.ino +++ b/examples/Modules/StepmotorGRBL13.2_M035/multi_control/multi_control.ino @@ -16,7 +16,7 @@ Module at the same time) */ #include -#include "MODULE_GRBL13.2.h" +#include "Module_GRBL_13.2.h" /* * The I2C address of GRBL 13.2 Module is 0x70 by default. @@ -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: diff --git a/examples/Modules/StepmotorGRBL13.2_M035/xyz_control/xyz_control.ino b/examples/Modules/StepmotorGRBL13.2_M035/xyz_control/xyz_control.ino index 3aeb26a1..2788e716 100644 --- a/examples/Modules/StepmotorGRBL13.2_M035/xyz_control/xyz_control.ino +++ b/examples/Modules/StepmotorGRBL13.2_M035/xyz_control/xyz_control.ino @@ -14,7 +14,7 @@ */ #include -#include "MODULE_GRBL13.2.h" +#include "Module_GRBL_13.2.h" /* * The I2C address of GRBL 13.2 Module is 0x70 by default. @@ -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: diff --git a/library.json b/library.json index 7dcf9e04..fdab41c7 100644 --- a/library.json +++ b/library.json @@ -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" diff --git a/library.properties b/library.properties index 34ffd5b1..e9592143 100644 --- a/library.properties +++ b/library.properties @@ -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 @@ -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 \ No newline at end of file +depends=M5Family,M5Module-4Relay,Module_GRBL_13.2,M5_BMM150 \ No newline at end of file