Fix for ESP8266

This commit is contained in:
fvanroie 2020-05-02 15:19:16 +02:00
parent 11e4d77d9f
commit 0bb0f9875d
3 changed files with 10 additions and 5 deletions

View File

@ -48,7 +48,7 @@
#include "hasp_spiffs.h" #include "hasp_spiffs.h"
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
//#include "lv_zifont.h" #include "lv_zifont.h"
#endif #endif
#endif #endif

View File

@ -107,6 +107,7 @@ void gpioSetup()
aceButtonSetup(); aceButtonSetup();
//gpioConfig[0] = PD15 * 256 + 5 + (INPUT << 3); //gpioConfig[0] = PD15 * 256 + 5 + (INPUT << 3);
gpioAddButton(D1, INPUT_PULLUP, HIGH, 1);
for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) {
uint8_t pin = (gpioConfig[i] >> 8) & 0xFF; uint8_t pin = (gpioConfig[i] >> 8) & 0xFF;
@ -134,7 +135,7 @@ void gpioSetup()
switch(gpiotype) { switch(gpiotype) {
case HASP_GPIO_SWITCH: case HASP_GPIO_SWITCH:
case HASP_GPIO_BUTTON: case HASP_GPIO_BUTTON:
gpioAddButton(pin, input_mode, default_state, channel); // gpioAddButton(pin, input_mode, default_state, channel);
break; break;
case HASP_GPIO_RELAY: case HASP_GPIO_RELAY:

View File

@ -1,6 +1,8 @@
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#if HASP_USE_SLAVE>0
#include "hasp_slave.h" #include "hasp_slave.h"
#include <Arduino.h> #include <Arduino.h>
#include "ArduinoJson.h" #include "ArduinoJson.h"
@ -130,11 +132,11 @@ void TASMO_EVERY_SECOND(void)
{ {
if (ledstate) { if (ledstate) {
ledstate = false; ledstate = false;
digitalWrite(HASP_OUTPUT_PIN, 1); //digitalWrite(HASP_OUTPUT_PIN, 1);
// Log.verbose(F("LED OFF")); // Log.verbose(F("LED OFF"));
} else { } else {
ledstate = true; ledstate = true;
digitalWrite(HASP_OUTPUT_PIN, 0); //digitalWrite(HASP_OUTPUT_PIN, 0);
// Log.verbose(F("LED ON")); // Log.verbose(F("LED ON"));
} }
} }
@ -158,4 +160,6 @@ void slaveLoop(void)
// TASMO_EVERY_SECOND(); // TASMO_EVERY_SECOND();
// } // }
} }
#endif