KevinMidboe/TinyGSM
1
0
Fork 0
mirror of https://github.com/KevinMidboe/TinyGSM.git synced 2025-10-29 18:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleaning

Browse Source
This commit is contained in:
Sara Damiano
2019-07-02 11:29:42 -04:00
parent f006268969
commit 1d0e7791b0
5 changed files with 51 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
extras/AT Command Manuals/SIM7000 Series AT Command Manual V1.03.pdf
View File

Binary file not shown.

BIN
extras/AT Command Manuals/SIM7000 Series_AT Command Manual_V1.04.pdf Normal file
View File

Binary file not shown.

BIN
extras/AT Command Manuals/SIM7000 Series_TCPIP_Application Note_V1.01.pdf Normal file
View File

Binary file not shown.

BIN
extras/AT Command Manuals/SIM800 Series_NTP_Application Note_V1.02.pdf Normal file
View File

Binary file not shown.

33
src/TinyGsmClientSIM800.h
View File

@@ -708,22 +708,18 @@ TINY_GSM_MODEM_WAIT_FOR_NETWORK()
/*
* NTP server functions
*/
boolean isValidNumber(String str)
{
boolean isValidNumber(String str) {
boolean isNum = false;
if(!(str.charAt(0) == '+' || str.charAt(0) == '-' || isDigit(str.charAt(0)))) return false;
for(byte i=1;i < str.length(); i++)
{
for(byte i=1;i < str.length(); i++) {
if(!(isDigit(str.charAt(i)) || str.charAt(i) == '.')) return false;
}
return true;
}
String ShowNTPError(byte error)
{
switch (error)
{
String ShowNTPError(byte error) {
switch (error) {
case 1:
return "Network time synchronization is successful";
case 61:
@@ -741,27 +737,20 @@ String ShowNTPError(byte error)
}
}
byte NTPServerSync(String server = "pool.ntp.org", byte TimeZone = 3)
{
byte NTPServerSync(String server = "pool.ntp.org", byte TimeZone = 3) {
//Serial.println("Sync time with NTP server.");
sendAT(GF("+CNTPCID=1"));
if (waitResponse(10000L) != 1)
{
//Serial.println("AT command \"AT+CNTPCID=1\" executing fault.");
if (waitResponse(10000L) != 1) {
return -1;
}
String CNTP = "+CNTP=" + server + "," + String(TimeZone);
sendAT(GF(CNTP));
if (waitResponse(10000L) != 1)
{
//Serial.println("AT command \"" + CNTP + "\" executing fault.");
sendAT(GF("+CNTP="), server, ',', String(TimeZone));
if (waitResponse(10000L) != 1) {
return -1;
}
sendAT(GF("+CNTP"));
if (waitResponse(10000L, GF(GSM_NL "+CNTP:")))
{
if (waitResponse(10000L, GF(GSM_NL "+CNTP:"))) {
String result = stream.readStringUntil('\n');
result.trim();
if (isValidNumber(result))
@@ -769,9 +758,7 @@ byte NTPServerSync(String server = "pool.ntp.org", byte TimeZone = 3)
return result.toInt();
}
}
else
{
//Serial.println("AT command \"+CNTP\" executing fault.");
else {
return -1;
}
return -1;