Resolve partial redefinition

m5stack · Jun 14, 2024 · 9ade9f2 · 9ade9f2
1 parent 34bb2c8
commit 9ade9f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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<TinyGsmSim7020>, 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
@@ -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<TinyGsmSim7028>,
      * Power functions
      */
   protected:
-    bool restartImpl()
+    bool restartImpl(const char* pin = NULL)
     {
         /* Hardware Reset */
         pinMode(this->reset_pin, OUTPUT);