ise-senior-iot
/
iot-firmware
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into cud

This commit is contained in:
Siwat Sirichai 2023-11-16 15:18:15 +07:00
parent 98fc132e3f 47402e1c71
commit cb6556b333
2 changed files with 87 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@
.vscode/launch.json .vscode/launch.json
.vscode/ipch .vscode/ipch
.vs/ .vs/
.vscode/
.vscode/settings.json

7
src/espmega_iot_core.cpp
View File

@ -453,7 +453,6 @@ void ota_begin()
} }
#endif #endif
void io_begin() void io_begin()
{ {
Serial.println("Initializing I/O . . ."); Serial.println("Initializing I/O . . .");
@ -591,12 +590,16 @@ void mqtt_callback(char *topic, byte *payload, unsigned int length)
else if ((!strncmp(topic_trim, "/pwm/", 5)) && !strncmp(topic_trim + 7, "/set/value", 10)) else if ((!strncmp(topic_trim, "/pwm/", 5)) && !strncmp(topic_trim + 7, "/set/value", 10))
{ {
pwm_value_callback(topic_trim, topic_length, payload_nt, length); pwm_value_callback(topic_trim, topic_length, payload_nt, length);
} else if(!strcmp(topic,STATE_REQUEST_TOPIC)) { }
else if (!strcmp(topic, STATE_REQUEST_TOPIC))
{
state_request_callback(); state_request_callback();
} }
else else
{ {
#ifdef ENABLE_CLIMATE_MODULE
ac_state_callback(topic, topic_length, payload_nt, length); ac_state_callback(topic, topic_length, payload_nt, length);
#endif
} }
user_mqtt_callback(topic, topic_length, payload_nt, length); user_mqtt_callback(topic, topic_length, payload_nt, length);
} }