jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-04-19 12:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix esp8266 compile errors

Browse Source
This commit is contained in:
fvanroie 2021-05-15 13:33:49 +02:00
parent 882ccaf79c
commit 09b8fa72a7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -196,7 +196,7 @@ build_flags=
; -- lvgl build options -----------------------------
-D LV_MEM_SIZE=12288U ; 12kB lvgl memory
-D LV_ATTRIBUTE_FAST_MEM=
-D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR
-D LV_ATTRIBUTE_TASK_HANDLER=
; -- ArduinoJson build options ----------------------------
-D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
-D ARDUINOJSON_ENABLE_STD_STRING=1 ; for std::string

14
src/sys/gpio/hasp_gpio.cpp
View File

@ -48,8 +48,8 @@ static inline void gpio_update_group(uint8_t group, lv_obj_t* obj, bool power, i
#include "driver/uart.h"
#include <driver/dac.h>
volatile bool touchdetected = false;
RTC_DATA_ATTR int recordCounter = 0;
volatile bool touchdetected = false;
RTC_DATA_ATTR int rtcRecordCounter = 0;
void gotTouch()
{
@ -96,8 +96,8 @@ static void gpio_event_handler(AceButton* button, uint8_t eventType, uint8_t but
} else {
eventid = HASP_EVENT_DOWN;
}
state = true;
touchdetected = false;
state = true;
// touchdetected = false;
break;
case 2: // AceButton::kEventClicked:
eventid = HASP_EVENT_UP;
@ -224,12 +224,14 @@ static void gpio_setup_pin(uint8_t index)
pinMode(gpio->pin, INPUT_PULLUP);
gpio->max = 0;
break;
#if defined(ARDUINO_ARCH_ESP32)
case hasp_gpio_type_t::TOUCH:
if(gpio->btn) delete gpio->btn;
gpio->btn = new AceButton(&touchConfig, gpio->pin, HIGH, index);
gpio->max = 0;
// touchAttachInterrupt(gpio->pin, gotTouch, 33);
break;
#endif
case hasp_gpio_type_t::POWER_RELAY:
case hasp_gpio_type_t::LIGHT_RELAY:
@ -294,7 +296,9 @@ static void gpio_setup_pin(uint8_t index)
void gpioSetup()
{
LOG_INFO(TAG_GPIO, F(D_SERVICE_STARTING));
LOG_WARNING(TAG_GPIO, F("Reboot counter %d"), recordCounter++);
#if defined(ARDUINO_ARCH_ESP32)
LOG_WARNING(TAG_GPIO, F("Reboot counter %d"), rtcRecordCounter++);
#endif
aceButtonSetup();