Skip to content

Commit

Permalink
timeout for bad weather
Browse files Browse the repository at this point in the history
  • Loading branch information
jaka87 committed Dec 11, 2020
1 parent add9265 commit 4680a7b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions src/GPRS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Result openGPRSContext(SIM800 *sim800, const char *apn)

sim800->sendATTest();

while ((sim800->sendCmdAndWaitForResp_P(REGISTRATION_STATUS, CONNECTED, 10000) != TRUE &&
sim800->sendCmdAndWaitForResp_P(REGISTRATION_STATUS, ROAMING, 10000) != TRUE) &&
while ((sim800->sendCmdAndWaitForResp_P(REGISTRATION_STATUS, CONNECTED, 12000) != TRUE &&
sim800->sendCmdAndWaitForResp_P(REGISTRATION_STATUS, ROAMING, 12000) != TRUE) &&
attempts < MAX_ATTEMPTS)
{
sim800->sendCmdAndWaitForResp_P(READ_VOLTAGE, AT_OK, 2000);
Expand All @@ -67,20 +67,20 @@ Result openGPRSContext(SIM800 *sim800, const char *apn)
}
}

if (sim800->sendCmdAndWaitForResp_P(BEARER_PROFILE_GPRS, AT_OK, 12000) == FALSE)
if (sim800->sendCmdAndWaitForResp_P(BEARER_PROFILE_GPRS, AT_OK, 14000) == FALSE)
result = ERROR_BEARER_PROFILE_GPRS;

char httpApn[64];
char tmp[24];
strcpy_P(tmp, apn);
sprintf_P(httpApn, BEARER_PROFILE_APN, tmp);
if (sim800->sendCmdAndWaitForResp(httpApn, AT_OK_, 8000) == FALSE)
if (sim800->sendCmdAndWaitForResp(httpApn, AT_OK_, 10000) == FALSE)
result = ERROR_BEARER_PROFILE_APN;

while (sim800->sendCmdAndWaitForResp_P(QUERY_BEARER, BEARER_OPEN, 8000) == FALSE && attempts < MAX_ATTEMPTS)
while (sim800->sendCmdAndWaitForResp_P(QUERY_BEARER, BEARER_OPEN, 10000) == FALSE && attempts < MAX_ATTEMPTS)
{
attempts++;
if (sim800->sendCmdAndWaitForResp_P(OPEN_GPRS_CONTEXT, AT_OK, 8000) == FALSE)
if (sim800->sendCmdAndWaitForResp_P(OPEN_GPRS_CONTEXT, AT_OK, 10000) == FALSE)
{
result = ERROR_OPEN_GPRS_CONTEXT;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Http.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Result HTTP::connect(const char *apn)
{
Result result = openGPRSContext(this, apn);

if (sendCmdAndWaitForResp_P(HTTP_INIT, AT_OK, 6000) == FALSE)
if (sendCmdAndWaitForResp_P(HTTP_INIT, AT_OK, 8000) == FALSE)
result = ERROR_HTTP_INIT;

return result;
Expand Down Expand Up @@ -83,7 +83,7 @@ Result HTTP::post(const char *uri, const char *body, char *response)
sprintf_P(buffer, HTTP_DATA, strlen(body), delayToDownload);
strcpy_P(resp, DOWNLOAD);

sendCmdAndWaitForResp(buffer, resp, 5000);
sendCmdAndWaitForResp(buffer, resp, 7000);

purgeSerial();
sendCmd(body);
Expand All @@ -108,7 +108,7 @@ Result HTTP::get(const char *uri, char *response)
Result result;
setHTTPSession(uri);

if (sendCmdAndWaitForResp_P(HTTP_GET, HTTP_2XX, 2000) == TRUE)
if (sendCmdAndWaitForResp_P(HTTP_GET, HTTP_2XX, 7000) == TRUE)
{
char buffer[16];
strcpy_P(buffer, HTTP_READ);
Expand Down

0 comments on commit 4680a7b

Please sign in to comment.