Obbart/ETcontroller_PRO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed pinlist and temperature sensor map

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-08-29 10:21:44 +02:00
parent 637304781c
commit fc2687947a
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/pinlist.h
View File

@@ -11,11 +11,11 @@ enum RO // relay output channels
GND_FLOOR = 6, GND_FLOOR = 6,
PUMP_HT = 7, PUMP_HT = 7,
PUMP_IRR = 8, PUMP_IRR = 8,
ZONE1 = 9, RETURN = 9,
ZONE2 = 10, ZONE1 = 10,
ZONE3 = 11, ZONE2 = 11,
DRIP = 12, ZONE3 = 12,
RETURN = 13, DRIP = 13,
RO_14 = 14, RO_14 = 14,
RO_15 = 15, RO_15 = 15,
RO_MAX = 16 // unused to detect invalid values RO_MAX = 16 // unused to detect invalid values

4
platformio.ini
View File

@@ -23,8 +23,8 @@ build_type = release
board_build.filesystem = ffat board_build.filesystem = ffat
board_build.partitions = fatfs_partition.csv ; se stai usando uno custom board_build.partitions = fatfs_partition.csv ; se stai usando uno custom
upload_protocol = espota #upload_protocol = espota
upload_port = 10.0.2.139 #upload_port = 10.0.2.139
[env:esp32-s3-waveshare8-debug] [env:esp32-s3-waveshare8-debug]

2
src/commands.cpp
View File

@@ -204,6 +204,8 @@ namespace commands
} }
for (const auto [lvl, ro] : c_hpLimitsMap) for (const auto [lvl, ro] : c_hpLimitsMap)
{ {
if (ro == RO::RO_MAX)
continue; // avoid overshooting relay range
if (level == lvl && level != "UNLIMITED") if (level == lvl && level != "UNLIMITED")
dev.io.digitalOutWrite(ro, true); dev.io.digitalOutWrite(ro, true);
else else

11
src/main.cpp
View File

@@ -94,13 +94,13 @@ void loop()
MQTTwrapper::MessageCallback onMessage = [&devices](const MQTTwrapper::Topic &topic, const MQTTwrapper::Message &message) MQTTwrapper::MessageCallback onMessage = [&devices](const MQTTwrapper::Topic &topic, const MQTTwrapper::Message &message)
{ {
LOG_DEBUG("onMessage callback [", topic.c_str(), "]"); LOG_DEBUG("onMessage callback [", topic.c_str(), "]\n", message.c_str());
devices.led.setColor(devices.led.COLOR_MAGENTA); devices.led.setColor(devices.led.COLOR_MAGENTA);
}; };
MQTTwrapper::MessageCallback onPublish = [&devices](const MQTTwrapper::Topic &topic, const MQTTwrapper::Message &message) MQTTwrapper::MessageCallback onPublish = [&devices](const MQTTwrapper::Topic &topic, const MQTTwrapper::Message &message)
{ {
LOG_DEBUG("onPublish callback [", topic.c_str(), "]"); LOG_DEBUG("onPublish callback [", topic.c_str(), "]\n", message.c_str());
devices.led.setColor(devices.led.COLOR_SKYBLUE); devices.led.setColor(devices.led.COLOR_SKYBLUE);
}; };
@@ -154,7 +154,6 @@ void loop()
{ // skip NTP update for drift testing { // skip NTP update for drift testing
buzzer.beep(250, NOTE_A); buzzer.beep(250, NOTE_A);
led.setColor(led.COLOR_ORANGE); led.setColor(led.COLOR_ORANGE);
// rtc.setDatetime(drivers::PCF85063::fromEpoch(ntpTime));
const drivers::PCF85063::datetime_t dt(drivers::PCF85063::fromEpoch(ntpTime)); const drivers::PCF85063::datetime_t dt(drivers::PCF85063::fromEpoch(ntpTime));
LOG_INFO("NTP Time: ", drivers::PCF85063::datetime2str(dt).c_str()); LOG_INFO("NTP Time: ", drivers::PCF85063::datetime2str(dt).c_str());
break; break;
@@ -201,8 +200,8 @@ void loop()
ArduinoJson::JsonDocument ti; ArduinoJson::JsonDocument ti;
auto tempinfo = tmp.getTempAll(); auto tempinfo = tmp.getTempAll();
ti["solar"] = tempinfo.at(0); ti["solar"] = tempinfo.at(0);
ti["acs"] = tempinfo.at(0); ti["acs"] = tempinfo.at(1);
ti["heating"] = tempinfo.at(0); ti["heating"] = tempinfo.at(2);
mqtt.publish(conf.m_mqttPublish["temperatures"], ti); mqtt.publish(conf.m_mqttPublish["temperatures"], ti);
}; };
@@ -228,4 +227,4 @@ void loop()
//////////////////////////////////////// ////////////////////////////////////////
///////// MAIN LOOP INSIDE LOOP //////// ///////// MAIN LOOP INSIDE LOOP ////////
//////////////////////////////////////// ////////////////////////////////////////
} }