JSD/TinyGSM_Senseright
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed conflicting date/time functions

Browse Source
This commit is contained in:
SRGDamia1
2018-05-10 16:21:31 -04:00
parent f7cfa5eb1c
commit 5824f290d1
2 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/AllFunctions/AllFunctions.ino
View File

@@ -107,7 +107,7 @@ void loop() {
String cop = modem.getOperator(); String cop = modem.getOperator();
DBG("Operator:", cop); DBG("Operator:", cop);
IPAddress local = modem.localIP(); IPAddress local = modem.localIP();
DBG("Local IP:", local); DBG("Local IP:", local);
@@ -127,10 +127,10 @@ void loop() {
DBG("GSM location:", gsmLoc); DBG("GSM location:", gsmLoc);
// This is only supported on SIMxxx series // This is only supported on SIMxxx series
String gsmTime = modem.getGSMDateTime(DATE_TIME); // String gsmTime = modem.getGSMDateTime(DATE_TIME);
DBG("GSM Time:", gsmTime); // DBG("GSM Time:", gsmTime);
String gsmDate = modem.getGSMDateTime(DATE_DATE); // String gsmDate = modem.getGSMDateTime(DATE_DATE);
DBG("GSM Date:", gsmDate); // DBG("GSM Date:", gsmDate);
String ussd_balance = modem.sendUSSD("*111#"); String ussd_balance = modem.sendUSSD("*111#");
DBG("Balance (USSD):", ussd_balance); DBG("Balance (USSD):", ussd_balance);
@@ -196,4 +196,3 @@ void loop() {
modem.maintain(); modem.maintain();
} }
} }

32
src/TinyGsmClientSIM800.h
View File

@@ -39,12 +39,6 @@ enum RegStatus {
REG_UNKNOWN = 4, REG_UNKNOWN = 4,
}; };
enum DateTime {
DATE_FULL = 0,
DATE_TIME = 1,
DATE_DATE = 2
};
//============================================================================// //============================================================================//
//============================================================================// //============================================================================//
// Declaration of the TinyGsmSim800 Class // Declaration of the TinyGsmSim800 Class
@@ -720,32 +714,6 @@ public:
return res; return res;
} }
/*
* Time functions
*/
String getGSMDateTime(DateTime format) {
sendAT(GF("+CCLK?"));
if (waitResponse(2000L, GF(GSM_NL "+CCLK: \"")) != 1) {
return "";
}
String res;
switch(format) {
case DATE_FULL:
res = stream.readStringUntil('"');
break;
case DATE_TIME:
streamSkipUntil(',');
res = stream.readStringUntil('"');
break;
case DATE_DATE:
res = stream.readStringUntil(',');
break;
}
return res;
}
/* /*
* Battery functions * Battery functions
*/ */