C3MA/PlantCtrl
5
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Ollo
2024-03-08 20:39:49 +01:00
parent f8629586f8 fbbbc5f5aa
commit 97a88ebb91
7 changed files with 3987 additions and 2995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esp32/defaultWithSmallerSpiffs.csv
View File

@@ -2,7 +2,6 @@
nvs, data, nvs, 0x9000, 0x4000
otadata, data, ota, 0xD000, 0x2000
phy_init, data, phy, 0xF000, 0x1000
factory, app, factory, 0x10000, 0x140000
ota_0, app, ota_0, 0x150000, 0x140000
ota_1, app, ota_1, 0x290000, 0x140000
ota_0, app, ota_0, 0x10000, 0x1E0000
ota_1, app, ota_1, 0x1F0000, 0x1E0000
spiffs, data, spiffs, 0x3D0000, 0x30000
1 # Name, Type, SubType, Offset, Size, Flags
2 nvs, data, nvs, 0x9000, 0x4000
3 otadata, data, ota, 0xD000, 0x2000
4 phy_init, data, phy, 0xF000, 0x1000
5 factory, app, factory, 0x10000, 0x140000 ota_0, app, ota_0, 0x10000, 0x1E0000
6 ota_0, app, ota_0, 0x150000, 0x140000 ota_1, app, ota_1, 0x1F0000, 0x1E0000
ota_1, app, ota_1, 0x290000, 0x140000
7 spiffs, data, spiffs, 0x3D0000, 0x30000

3
esp32/include/ControllerConfiguration.h
View File

@@ -103,8 +103,7 @@
#define FIRMWARE_BASENAME "PlantControl"
#define FIRMWARE_NAME FIRMWARE_BASENAME FIRMWARE_FEATURE1 FIRMWARE_FEATURE2
#define FIRMWARE_VERSION "3.00 HW0.10b"
#define FIRMWARE_VERSION "3.01 HW0.10b"
#define MOIST_SENSOR_MAX_FRQ 5200 // 60kHz (500Hz margin)
#define MOIST_SENSOR_MIN_FRQ 500 // 0.5kHz (500Hz margin)

2
esp32/platformio.ini
View File

@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[env:esp32doit-devkit-v1]
platform = espressif32@4.2.0
platform = espressif32@6.3.2
board = esp32doit-devkit-v1
framework = arduino
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY

1
esp32/src/MQTTUtils.cpp
View File

@@ -33,6 +33,7 @@ void log(int level, String message, int statusCode)
delete logTopic;
}
Serial << statusCode << "@" << level << " : " << message << endl;
Serial.flush();
}