Support NO ANSWER in callNumber

This commit is contained in:
Volodymyr Shymanskyy
2017-09-11 19:57:23 +03:00
parent 601892d106
commit 2b099c6e73

View File

@@ -228,7 +228,7 @@ public:
return ""; return "";
} }
res.replace(GSM_NL "OK" GSM_NL, ""); res.replace(GSM_NL "OK" GSM_NL, "");
res.replace(GSM_NL, ""); res.replace(GSM_NL, " ");
res.trim(); res.trim();
return res; return res;
} }
@@ -420,13 +420,13 @@ public:
return false; return false;
} }
if (waitResponse(60000L, GF(GSM_NL "+CIEV: \"CALL\",1")) != 1) { if (waitResponse(60000L, GF(GSM_NL "+CIEV: \"CALL\",1"), GF(GSM_NL "+CIEV: \"CALL\",0")) != 1) {
return false; return false;
} }
int rsp = waitResponse(60000L, GF(GSM_NL "+CIEV: \"SOUNDER\",0")); int rsp = waitResponse(60000L, GF(GSM_NL "+CIEV: \"SOUNDER\",0"), GF(GSM_NL "+CIEV: \"CALL\",0"));
int rsp2 = waitResponse(300L, GF(GSM_NL "BUSY" GSM_NL)); int rsp2 = waitResponse(300L, GF(GSM_NL "BUSY" GSM_NL), GF(GSM_NL "NO ANSWER" GSM_NL));
return rsp == 1 && rsp2 == 0; return rsp == 1 && rsp2 == 0;
} }