Merge pull request #100 from Patrick-McGuire/master

aentinger · web-flow · commit a6a7f71e52ba · 2022-06-07T06:23:49.000+02:00
Fix bug in SMS::peek(), and allow for multiple CIDs in GPRS::ready()
diff --git a/src/GPRS.cpp b/src/GPRS.cpp
@@ -127,7 +127,7 @@ int GPRS::ready()
         _state = GPRS_STATE_IDLE;
         _status = ERROR;
       } else {
-        if (_response.endsWith("1,1")) {
+          if (_response.indexOf("1,1") >= 0) {
           _state = GPRS_STATE_IDLE;
           _status = GPRS_READY;
           ready = 1;
diff --git a/src/NB_SMS.cpp b/src/NB_SMS.cpp
@@ -394,7 +394,7 @@ int NB_SMS::peek()
     return *_ptrUTF8;
   }
   if (_smsDataIndex < (signed)_incomingBuffer.length() && _smsDataIndex <= _smsDataEndIndex) {
-    char c = _incomingBuffer[_smsDataIndex++];
+    char c = _incomingBuffer[_smsDataIndex+1];
     if (_charset == SMS_CHARSET_GSM
         && (c >= 0x80 || c <= 0x24 || (c&0x1F) == 0 || (c&0x1F) >= 0x1B)) {
       for (auto &gsmchar : _gsmUTF8map) {

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ int NB_SMS::peek()`
`394`	`394`	`return *_ptrUTF8;`
`395`	`395`	`}`
`396`	`396`	`if (_smsDataIndex < (signed)_incomingBuffer.length() && _smsDataIndex <= _smsDataEndIndex) {`
`397`		`- char c = _incomingBuffer[_smsDataIndex++];`
	`397`	`+ char c = _incomingBuffer[_smsDataIndex+1];`
`398`	`398`	`if (_charset == SMS_CHARSET_GSM`
`399`	`399`	`&& (c >= 0x80 \|\| c <= 0x24 \|\| (c&0x1F) == 0 \|\| (c&0x1F) >= 0x1B)) {`
`400`	`400`	`for (auto &gsmchar : _gsmUTF8map) {`