Skip to content

Commit 9ade9f2

Browse files
committed
Resolve partial redefinition
1 parent 34bb2c8 commit 9ade9f2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/TinyGsmClientSIM7020.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "TinyGsmTime.tpp"
3333

3434
#define GSM_NL "\r\n"
35-
static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL;
36-
static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
35+
// static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL;
36+
// static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
3737
#if defined TINY_GSM_DEBUG
3838
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
3939
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
@@ -230,7 +230,7 @@ class TinyGsmSim7020 : public TinyGsmModem<TinyGsmSim7020>, public TinyGsmNBIOT<
230230
* Power functions
231231
*/
232232
protected:
233-
bool restartImpl()
233+
bool restartImpl(const char* pin = NULL)
234234
{
235235
/* Hardware Reset */
236236
pinMode(this->reset_pin, OUTPUT);

src/TinyGsmClientSIM7028.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
#include "TinyGsmGPRS.tpp"
3737
#endif
3838
#define GSM_NL "\r\n"
39-
static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL;
40-
static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
39+
// static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL;
40+
// static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
4141
#if defined TINY_GSM_DEBUG
4242
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
4343
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
@@ -228,7 +228,7 @@ class TinyGsmSim7028 : public TinyGsmModem<TinyGsmSim7028>,
228228
* Power functions
229229
*/
230230
protected:
231-
bool restartImpl()
231+
bool restartImpl(const char* pin = NULL)
232232
{
233233
/* Hardware Reset */
234234
pinMode(this->reset_pin, OUTPUT);

0 commit comments

Comments
 (0)