Merge pull request #304 from IoTManagerProject/ver4dev

Ver4dev
This commit is contained in:
IoT Manager
2023-09-06 16:58:11 +02:00
committed by GitHub
3 changed files with 19 additions and 6 deletions

View File

@@ -126,11 +126,11 @@
"active": false "active": false
}, },
{ {
"path": "src/modules/sensors/Ds2423", "path": "src/modules/sensors/Emon",
"active": false "active": false
}, },
{ {
"path": "src/modules/sensors/Emon", "path": "src/modules/sensors/ExampleModule",
"active": false "active": false
}, },
{ {
@@ -165,6 +165,10 @@
"path": "src/modules/sensors/Ina219", "path": "src/modules/sensors/Ina219",
"active": false "active": false
}, },
{
"path": "src/modules/sensors/Ina226",
"active": false
},
{ {
"path": "src/modules/sensors/IoTWiegand", "path": "src/modules/sensors/IoTWiegand",
"active": false "active": false
@@ -314,6 +318,10 @@
{ {
"path": "src/modules/exec/Thermostat", "path": "src/modules/exec/Thermostat",
"active": false "active": false
},
{
"path": "src/modules/sensors/Ds2423",
"active": false
} }
], ],
"screens": [ "screens": [
@@ -333,6 +341,10 @@
"path": "src/modules/display/Smi2_m", "path": "src/modules/display/Smi2_m",
"active": true "active": true
}, },
{
"path": "src/modules/display/TM16XX",
"active": true
},
{ {
"path": "src/modules/display/Ws2812b", "path": "src/modules/display/Ws2812b",
"active": false "active": false

View File

@@ -162,7 +162,6 @@ lib_deps =
${common_env_data.lib_deps_external} ${common_env_data.lib_deps_external}
${env:esp32_4mb_fromitems.lib_deps} ${env:esp32_4mb_fromitems.lib_deps}
build_flags = -Desp32_4mb="esp32_4mb" build_flags = -Desp32_4mb="esp32_4mb"
-std=c++17
framework = arduino framework = arduino
board = esp32dev board = esp32dev
platform = espressif32 @5.1.1 platform = espressif32 @5.1.1
@@ -186,7 +185,6 @@ build_flags =
-Desp32s2_4mb="esp32s2_4mb" -Desp32s2_4mb="esp32s2_4mb"
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DARDUINO_USB_MODE=0 -DARDUINO_USB_MODE=0
-std=c++17
framework = arduino framework = arduino
board = lolin_s2_mini board = lolin_s2_mini
platform = espressif32 @6.3.1 platform = espressif32 @6.3.1
@@ -466,13 +464,15 @@ lib_deps =
WEMOS SHT3x@1.0.0 WEMOS SHT3x@1.0.0
plerup/EspSoftwareSerial plerup/EspSoftwareSerial
gyverlibs/EncButton @ ^2.0 gyverlibs/EncButton @ ^2.0
https://github.com/RoboticsBrno/ServoESP32 https://github.com/RoboticsBrno/ServoESP32#v1.0.3
adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
adafruit/Adafruit BusIO @ ^1.13.2 adafruit/Adafruit BusIO @ ^1.13.2
dfrobot/DFRobotDFPlayerMini @ ^1.0.5 dfrobot/DFRobotDFPlayerMini @ ^1.0.5
adafruit/Adafruit BusIO @ ^1.13.2 adafruit/Adafruit BusIO @ ^1.13.2
https://github.com/robotclass/RobotClass_LiquidCrystal_I2C https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
marcoschwartz/LiquidCrystal_I2C@^1.1.4 marcoschwartz/LiquidCrystal_I2C@^1.1.4
https://github.com/maxint-rd/TM16xx
adafruit/Adafruit GFX Library @ ^1.11.5
build_src_filter = build_src_filter =
+<modules/virtual/Cron> +<modules/virtual/Cron>
+<modules/virtual/Loging> +<modules/virtual/Loging>
@@ -509,6 +509,7 @@ build_src_filter =
+<modules/exec/TelegramLT> +<modules/exec/TelegramLT>
+<modules/display/Lcd2004> +<modules/display/Lcd2004>
+<modules/display/Smi2_m> +<modules/display/Smi2_m>
+<modules/display/TM16XX>
[env:esp32s2_4mb_fromitems] [env:esp32s2_4mb_fromitems]
lib_deps = lib_deps =

View File

@@ -49,7 +49,7 @@
"defActive": true, "defActive": true,
"usedLibs": { "usedLibs": {
"esp32_4mb": [ "esp32_4mb": [
"https://github.com/RoboticsBrno/ServoESP32" "https://github.com/RoboticsBrno/ServoESP32#v1.0.3"
], ],
"esp8266_4mb": [] "esp8266_4mb": []
} }