jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
fvanroie 2020-04-30 17:32:09 +02:00
parent 814006aad8
commit 6e4fa9ee97
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hasp_dispatch.cpp
View File

@ -48,11 +48,15 @@ void dispatchOutput(int output, bool state)
int pin = 0; int pin = 0;
if(pin >= 0) { if(pin >= 0) {
Log.notice(F("PIN OUTPUT STATE %d"),state);
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
ledcWrite(99, state ? 1023 : 0); // ledChannel and value ledcWrite(99, state ? 1023 : 0); // ledChannel and value
#else #elif defined(ARDUINO_ARCH_ESP8266)
analogWrite(pin, state ? 1023 : 0); analogWrite(pin, state ? 1023 : 0);
#else
pinMode (PE0, OUTPUT);
digitalWrite(PE0, state ? 1 : 0);
#endif #endif
} }
} }
@ -95,11 +99,6 @@ void dispatchAttribute(String strTopic, const char * payload)
{ {
if(strTopic.startsWith("p[")) { if(strTopic.startsWith("p[")) {
dispatchButtonAttribute(strTopic, payload); dispatchButtonAttribute(strTopic, payload);
} else if(strTopic.startsWith(F("output"))) {
#if defined(ARDUINO_ARCH_ESP8266)
uint8_t state = isON(payload) ? HIGH : LOW;
digitalWrite(D1, state);
#endif
} else if(strTopic == F("page")) { } else if(strTopic == F("page")) {
dispatchPage(payload); dispatchPage(payload);
@ -184,7 +183,7 @@ void dispatchBacklight(String strPayload)
void dispatchCommand(String cmnd) void dispatchCommand(String cmnd)
{ {
// dispatchPrintln(F("CMND"), cmnd); dispatchPrintln(F("CMND"), cmnd);
if(cmnd.startsWith(F("page "))) { if(cmnd.startsWith(F("page "))) {
cmnd = cmnd.substring(5, cmnd.length()); cmnd = cmnd.substring(5, cmnd.length());
@ -293,6 +292,8 @@ void dispatch_button(uint8_t id, const char * event)
{ {
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
mqtt_send_input(id, event); mqtt_send_input(id, event);
#else
Log.notice(F("OUT: input%d = %s"), id, event);
#endif #endif
} }