diff --git a/src/drv/tft_driver_tftespi.h b/src/drv/tft_driver_tftespi.h index 05e21792..dbda686f 100644 --- a/src/drv/tft_driver_tftespi.h +++ b/src/drv/tft_driver_tftespi.h @@ -51,8 +51,8 @@ class TftEspi : BaseTft { { if(pin != -1) { char buffer[64]; - snprintf_P(buffer, sizeof(buffer), PSTR("%-11s: %s (GPIO %02d)"), pinfunction, halGpioName(pin).c_str(), - pin); + snprintf_P(buffer, sizeof(buffer), PSTR("%-11s: %s (GPIO %02d)"), String(pinfunction).c_str(), + halGpioName(pin).c_str(), pin); LOG_VERBOSE(TAG_TFT, buffer); } } diff --git a/src/drv/touch/hasp_drv_tft_espi.h b/src/drv/touch/hasp_drv_tft_espi.h index f344efde..0ee3b3b3 100644 --- a/src/drv/touch/hasp_drv_tft_espi.h +++ b/src/drv/touch/hasp_drv_tft_espi.h @@ -11,7 +11,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#if USE_TFT_ESPI +//#if USE_TFT_ESPI #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" @@ -25,7 +25,7 @@ void tft_espi_set_touch(uint16_t* calData); bool tft_espi_get_touch(int16_t* touchX, int16_t* touchY, uint16_t threshold); #endif -#endif /* USE_TFT_ESPI */ +//#endif /* USE_TFT_ESPI */ #ifdef __cplusplus } /* extern "C" */ diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index a3573bd1..6ed4cacf 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -525,7 +525,7 @@ static void dispatch_config(const char* topic, const char* payload) char subtopic[8]; settings.remove(F("pass")); // hide password in output - size_t size = serializeJson(doc, buffer, sizeof(buffer)); + /* size_t size = */ serializeJson(doc, buffer, sizeof(buffer)); memcpy_P(subtopic, PSTR("config"), 7); dispatch_state_subtopic(subtopic, buffer); } diff --git a/src/hasp/hasp_page.h b/src/hasp/hasp_page.h index 1e2bfaa4..e088a2a4 100644 --- a/src/hasp/hasp_page.h +++ b/src/hasp/hasp_page.h @@ -16,7 +16,7 @@ * TYPEDEFS **********************/ -typedef struct hasp_page_meta_data_t +struct hasp_page_meta_data_t { uint8_t prev : 4; uint8_t next : 4;