From 894a6657d776d6ace11f2ce2fa835d157c45e80a Mon Sep 17 00:00:00 2001 From: fvanroie Date: Fri, 12 May 2023 14:11:05 +0200 Subject: [PATCH] Revert F() and move char* to FlashStringHelper --- src/drv/tft/tft_driver_lovyangfx.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/drv/tft/tft_driver_lovyangfx.cpp b/src/drv/tft/tft_driver_lovyangfx.cpp index f3ecfc16..ae5a97f7 100644 --- a/src/drv/tft/tft_driver_lovyangfx.cpp +++ b/src/drv/tft/tft_driver_lovyangfx.cpp @@ -19,21 +19,11 @@ namespace dev { -// void tftPinInfo(const __FlashStringHelper* pinfunction, int8_t pin) -// { -// if(pin != -1) { -// char buffer[64]; -// snprintf_P(buffer, sizeof(buffer), PSTR("%-12s: %s (GPIO %02d)"), String(pinfunction).c_str(), -// haspDevice.gpio_name(pin).c_str(), pin); -// LOG_VERBOSE(TAG_TFT, buffer); -// } -// } - -void tftPinInfo(const char* pinfunction, int8_t pin) +void tftPinInfo(const __FlashStringHelper* pinfunction, int8_t pin) { if(pin != -1) { char buffer[64]; - snprintf_P(buffer, sizeof(buffer), PSTR("%-12s: %s (GPIO %02d)"), pinfunction, + snprintf_P(buffer, sizeof(buffer), PSTR("%-12s: %s (GPIO %02d)"), String(pinfunction).c_str(), haspDevice.gpio_name(pin).c_str(), pin); LOG_VERBOSE(TAG_TFT, buffer); }