From 0bb0f9875d2153bf721fdb06554ec206de323e4f Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sat, 2 May 2020 15:19:16 +0200 Subject: [PATCH] Fix for ESP8266 --- include/hasp_conf.h | 2 +- src/hasp_gpio.cpp | 3 ++- src/hasp_slave.cpp | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/hasp_conf.h b/include/hasp_conf.h index 14366c88..3ba35170 100644 --- a/include/hasp_conf.h +++ b/include/hasp_conf.h @@ -48,7 +48,7 @@ #include "hasp_spiffs.h" #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) -//#include "lv_zifont.h" +#include "lv_zifont.h" #endif #endif diff --git a/src/hasp_gpio.cpp b/src/hasp_gpio.cpp index 77797302..4975f49d 100644 --- a/src/hasp_gpio.cpp +++ b/src/hasp_gpio.cpp @@ -107,6 +107,7 @@ void gpioSetup() aceButtonSetup(); //gpioConfig[0] = PD15 * 256 + 5 + (INPUT << 3); + gpioAddButton(D1, INPUT_PULLUP, HIGH, 1); for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { uint8_t pin = (gpioConfig[i] >> 8) & 0xFF; @@ -134,7 +135,7 @@ void gpioSetup() switch(gpiotype) { case HASP_GPIO_SWITCH: case HASP_GPIO_BUTTON: - gpioAddButton(pin, input_mode, default_state, channel); + // gpioAddButton(pin, input_mode, default_state, channel); break; case HASP_GPIO_RELAY: diff --git a/src/hasp_slave.cpp b/src/hasp_slave.cpp index 08e62f6a..0a4eed71 100644 --- a/src/hasp_slave.cpp +++ b/src/hasp_slave.cpp @@ -1,6 +1,8 @@ /********************* * INCLUDES *********************/ +#if HASP_USE_SLAVE>0 + #include "hasp_slave.h" #include #include "ArduinoJson.h" @@ -130,11 +132,11 @@ void TASMO_EVERY_SECOND(void) { if (ledstate) { ledstate = false; - digitalWrite(HASP_OUTPUT_PIN, 1); + //digitalWrite(HASP_OUTPUT_PIN, 1); // Log.verbose(F("LED OFF")); } else { ledstate = true; - digitalWrite(HASP_OUTPUT_PIN, 0); + //digitalWrite(HASP_OUTPUT_PIN, 0); // Log.verbose(F("LED ON")); } } @@ -158,4 +160,6 @@ void slaveLoop(void) // TASMO_EVERY_SECOND(); // } -} \ No newline at end of file +} + +#endif \ No newline at end of file