arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

fix DEBUG macros (#5728)

Browse Source 
* fix DEBUG macros

All fmt strings in flash
fix #5658

This also allows to avoid warnings and easy mistakes with (no brace):
    if (something)
        DEBUGV("blah");

* use newlib unaligned-compatible printf for DEBUGV

* remove useless putprintf since ::printf already uses ets_putc
This commit is contained in:
david gauchard 2019-03-14 11:19:21 +01:00 committed by GitHub
parent 9365f6d116
commit e5b4de3633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cores/esp8266/debug.cpp
View File

@ -34,4 +34,3 @@ void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) {
} }
os_printf("\n"); os_printf("\n");
} }

4
cores/esp8266/debug.h
View File

@ -5,11 +5,11 @@
#include <stdint.h> #include <stdint.h>
#ifdef DEBUG_ESP_CORE #ifdef DEBUG_ESP_CORE
#define DEBUGV(...) ets_printf(__VA_ARGS__) #define DEBUGV(fmt, ...) ::printf((PGM_P)PSTR(fmt), ## __VA_ARGS__)
#endif #endif
#ifndef DEBUGV #ifndef DEBUGV
#define DEBUGV(...) #define DEBUGV(...) do { (void)0; } while (0)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

2
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
View File

@ -42,7 +42,7 @@
#endif #endif
#ifndef DEBUG_HTTPCLIENT #ifndef DEBUG_HTTPCLIENT
#define DEBUG_HTTPCLIENT(...) #define DEBUG_HTTPCLIENT(...) do { (void)0; } while (0)
#endif #endif
#define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (5000) #define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (5000)

2
libraries/ESP8266WiFi/src/ESP8266WiFi.h
View File

@ -50,7 +50,7 @@ extern "C" {
#endif #endif
#ifndef DEBUG_WIFI #ifndef DEBUG_WIFI
#define DEBUG_WIFI(...) #define DEBUG_WIFI(...) do { (void)0; } while (0)
#endif #endif

4
libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
View File

@ -29,12 +29,12 @@
#ifdef DEBUG_ESP_WIFI #ifdef DEBUG_ESP_WIFI
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
#define DEBUG_WIFI_GENERIC(fmt, ...) DEBUG_ESP_PORT.printf( (PGM_P)PSTR(fmt), ##__VA_ARGS__ ) #define DEBUG_WIFI_GENERIC(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
#endif #endif
#endif #endif
#ifndef DEBUG_WIFI_GENERIC #ifndef DEBUG_WIFI_GENERIC
#define DEBUG_WIFI_GENERIC(...) #define DEBUG_WIFI_GENERIC(...) do { (void)0; } while (0)
#endif #endif
struct WiFiEventHandlerOpaque; struct WiFiEventHandlerOpaque;

4
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
View File

@ -32,12 +32,12 @@
#ifdef DEBUG_ESP_WIFI #ifdef DEBUG_ESP_WIFI
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
#define DEBUG_WIFI_MULTI(fmt, ...) DEBUG_ESP_PORT.printf( (PGM_P)PSTR(fmt), ##__VA_ARGS__ ) #define DEBUG_WIFI_MULTI(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
#endif #endif
#endif #endif
#ifndef DEBUG_WIFI_MULTI #ifndef DEBUG_WIFI_MULTI
#define DEBUG_WIFI_MULTI(...) #define DEBUG_WIFI_MULTI(...) do { (void)0; } while (0)
#endif #endif
struct WifiAPEntry { struct WifiAPEntry {

4
libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
View File

@ -36,12 +36,12 @@
#ifdef DEBUG_ESP_HTTP_UPDATE #ifdef DEBUG_ESP_HTTP_UPDATE
#ifdef DEBUG_ESP_PORT #ifdef DEBUG_ESP_PORT
#define DEBUG_HTTP_UPDATE(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ ) #define DEBUG_HTTP_UPDATE(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
#endif #endif
#endif #endif
#ifndef DEBUG_HTTP_UPDATE #ifndef DEBUG_HTTP_UPDATE
#define DEBUG_HTTP_UPDATE(...) #define DEBUG_HTTP_UPDATE(...) do { (void)0; } while(0)
#endif #endif
/// note we use HTTP client errors too so we start at 100 /// note we use HTTP client errors too so we start at 100