From 9ade9f2d947d899ef1c4d8bcbe4d0d73de0f9635 Mon Sep 17 00:00:00 2001 From: Junhuang Date: Fri, 14 Jun 2024 11:01:25 +0800 Subject: [PATCH] Resolve partial redefinition --- src/TinyGsmClientSIM7020.h | 6 +++--- src/TinyGsmClientSIM7028.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/TinyGsmClientSIM7020.h b/src/TinyGsmClientSIM7020.h index 5a7d4474..f996e6ba 100644 --- a/src/TinyGsmClientSIM7020.h +++ b/src/TinyGsmClientSIM7020.h @@ -32,8 +32,8 @@ #include "TinyGsmTime.tpp" #define GSM_NL "\r\n" -static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; -static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; +// static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; +// static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; #if defined TINY_GSM_DEBUG static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:"; @@ -230,7 +230,7 @@ class TinyGsmSim7020 : public TinyGsmModem, public TinyGsmNBIOT< * Power functions */ protected: - bool restartImpl() + bool restartImpl(const char* pin = NULL) { /* Hardware Reset */ pinMode(this->reset_pin, OUTPUT); diff --git a/src/TinyGsmClientSIM7028.h b/src/TinyGsmClientSIM7028.h index 05f98758..0b1b51a3 100644 --- a/src/TinyGsmClientSIM7028.h +++ b/src/TinyGsmClientSIM7028.h @@ -36,8 +36,8 @@ #include "TinyGsmGPRS.tpp" #endif #define GSM_NL "\r\n" -static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; -static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; +// static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; +// static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; #if defined TINY_GSM_DEBUG static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:"; @@ -228,7 +228,7 @@ class TinyGsmSim7028 : public TinyGsmModem, * Power functions */ protected: - bool restartImpl() + bool restartImpl(const char* pin = NULL) { /* Hardware Reset */ pinMode(this->reset_pin, OUTPUT);