Diff: main.cpp

Revision:

16:319eece233ff

Parent:

15:b0d74907b9c1

Child:

17:1fed4feeb5a8

--- a/main.cpp	Sat Jan 16 06:54:49 2021 +0000
+++ b/main.cpp	Sat Jan 16 17:50:00 2021 +0000
@@ -21,7 +21,7 @@
  
 // ID
  
-char device_id[] = {'M','I','E','M','H','S','E','-','T','E','S','T','\0'};
+char device_id[] = {'M','I','E','M','H','S','E','-','2','0','2','1','\0'};
  
 //Termometers
 OneWire oneWire(PIN_ONEWIRE);
@@ -159,6 +159,22 @@
     {
        return false;
     }
+    _parser->send("AT+CAPNMODE=1");
+    if (!checkIfOk())
+    {
+       return false;
+    }
+    _parser->send("AT+CBANDCFG=\"NB-IOT\",8");
+    if (!checkIfOk())
+    {
+       return false;
+    }
+    _parser->send("AT+CNDS=2");
+    if (!checkIfOk())
+    {
+       return false;
+    }
+
     return true;
 }
  
@@ -381,7 +397,7 @@
  
     if(Fix_st != 0)
     {
-        if (step_p > 5 )
+        if (step_p >= 4 )
         {
             return true;
         }
@@ -390,6 +406,7 @@
             step_p++;
         }
     }
+    //return true;
     return false;
 }
  
@@ -445,13 +462,15 @@
     wait(1);
      _parser->flush(); 
     //_parser->printf("AT+CCOAPPARA=code,2,token,0,\"%s\",payload,1,",xstr(MTS_COAP_TOKEN));
+    //_parser->printf("AT+CCOAPPARA=code,2,payload,1,");
+
     _parser->printf("AT+CCOAPPARA=code,2,payload,1,");
-     
+
     for (size_t i = 0; i < strlen(bufferString); i++) {
     _parser->printf("%x",bufferString[i]);
     }
-    
     _parser->printf("\r\n");
+    //parser->printf("\r\n");
     checkIfOk();
     //if(!checkIfOk()){ terminateCOAPSession();return false;}
     wait(0.5);
@@ -623,6 +642,7 @@
     wd.Service();
  
     state=STATE_STARTING_GPS;
+    //state = STATE_SENDING_TELEMETRY;
     
     int off = 0;
  
@@ -781,7 +801,10 @@
                     pc.printf("Waiting %d sec\r\n",FIX_CHECK_TIME_S);
                     #endif
                     wd.Service();
-                    wait(FIX_CHECK_TIME_S);
+                    wait(2);
+                    wait(2);
+                    wait(1);
+                    wd.Service();
                 }
             }
         } else if(state==STATE_COLLECTING_TELEMETRY) {
@@ -968,6 +991,7 @@
                 }
  
                 state=STATE_STARTING_GPS;
+                //state=STATE_SENDING_TELEMETRY;
                 sleepTimer=0;
             } else {
                wait(2);