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

Merge branch 'master' of github.com:0110/PlantCtrl

Browse Source 
# Conflicts:
#	esp32/src/main.cpp
This commit is contained in:
Empire 2021-12-03 18:42:37 +00:00
commit b9d8831dea
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp32/include/HomieConfiguration.h
View File

@ -24,7 +24,7 @@
* @{ * @{
**/ **/
#define NUMBER_TYPE "Number" /**< numberic information, published or read in Homie */ #define NUMBER_TYPE "Float" /**< numberic information, published or read in Homie */
/** /**
* @name Temperatur Node * @name Temperatur Node

2
esp32/platformio.ini
View File

@ -12,7 +12,7 @@
platform = espressif32 platform = espressif32
board = esp32doit-devkit-v1 board = esp32doit-devkit-v1
framework = arduino framework = arduino
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -fexceptions -lstdc++-exc build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
board_build.partitions = defaultWithSmallerSpiffs.csv board_build.partitions = defaultWithSmallerSpiffs.csv

10
esp32/src/PlantCtrl.cpp
View File

@ -202,9 +202,9 @@ void Plant::setSwitchHandler(HomieInternals::PropertyInputHandler f) {
void Plant::advertise(void) void Plant::advertise(void)
{ {
// Advertise topics // Advertise topics
mPump = this->mPlant->advertise("switch").setName("Pump").setDatatype("boolean"); mPump = this->mPlant->advertise("switch").setName("Pump").setDatatype("Boolean");
this->mPlant->advertise("lastPump").setName("lastPump").setDatatype("Number").setUnit("unixtime"); this->mPlant->advertise("lastPump").setName("lastPump").setDatatype("Integer").setUnit("unixtime");
this->mPlant->advertise("moist").setName("Percent").setDatatype("Number").setUnit("%"); this->mPlant->advertise("moist").setName("Percent").setDatatype("Float").setUnit("%");
this->mPlant->advertise("moistraw").setName("adc").setDatatype("Number").setUnit("3.3/4096V"); this->mPlant->advertise("moistraw").setName("adc").setDatatype("Float").setUnit("3.3/4096V");
this->mPlant->advertise("state").setName("state").setDatatype("string"); this->mPlant->advertise("state").setName("state").setDatatype("String");
} }

1
esp32/src/main.cpp
View File

@ -660,7 +660,6 @@ void pumpActiveLoop()
void safeSetup() void safeSetup()
{ {
//throw std::runtime_error("Shit happened");
/* reduce power consumption */ /* reduce power consumption */
setCpuFrequencyMhz(80); setCpuFrequencyMhz(80);