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

Fix merge issue

Browse Source
This commit is contained in:
fvanroie 2020-04-30 17:42:44 +02:00
parent 60e40f8767
commit c15af62a46
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platformio.ini
View File

@ -88,6 +88,7 @@ esp32_flags=
stm32_flags= stm32_flags=
${env.build_flags} ${env.build_flags}
-D IRAM_ATTR= ; No IRAM_ATTR available on STM32 -D IRAM_ATTR= ; No IRAM_ATTR available on STM32
-D STM32
; -- By default there are no ${override.build_flags} set ; -- By default there are no ${override.build_flags} set
; -- to use it, copy platformio_override.ini from the template ; -- to use it, copy platformio_override.ini from the template
@ -144,7 +145,8 @@ build_flags =
-D TFT_BCKL=-1 ;None, configurable via web UI (e.g. 2 for D4) -D TFT_BCKL=-1 ;None, configurable via web UI (e.g. 2 for D4)
-D TOUCH_CS=PC4 ;NC -D TOUCH_CS=PC4 ;NC
-D TFT_RST=-1 ;D4 -D TFT_RST=-1 ;D4
-D STM32 -D HASP_OUTPUT_PIN=PA1 ; User LED D2 on DevEBox board
-D HASP_INPUT_PIN=PA0 ; User Button K1 on DevEBox board
lib_deps = lib_deps =
${env.lib_deps} ${env.lib_deps}

5
src/hasp_dispatch.cpp
View File

@ -98,10 +98,7 @@ void dispatchAttribute(String strTopic, const char * payload)
{ {
if(strTopic.startsWith("p[")) { if(strTopic.startsWith("p[")) {
dispatchButtonAttribute(strTopic, payload); dispatchButtonAttribute(strTopic, payload);
<<<<<<< HEAD
=======
>>>>>>> 408b27b8155bd5f1c11900503df88956925fa6bd
} else if(strTopic == F("page")) { } else if(strTopic == F("page")) {
dispatchPage(payload); dispatchPage(payload);