Thales: Added some minor changes

- modified network registration for GNSS and GSM example
- fixed indennation of src .h .cpp removed unused structure

Author: Rocketct

libraries/GPS/library.properties

@@ -1,8 +1,8 @@
-name=GSM
+name=GPS
 version=1.0
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=GSM wrapper
+sentence=GPS Support Library
 paragraph=
 category=Other
 url=http://www.arduino.cc/en/Reference/GSM

libraries/GPS/src/GPS.cpp

@@ -37,6 +37,7 @@ void arduino::GPSClass::begin(unsigned long baudrate, uint16_t config)
 
     _serial->write("AT^SSIO=7,1\r\n", sizeof("AT^SSIO=7,1\r\n"));
     readAndDrop();
+
     _serial->write("AT^SGIO=7\r\n", sizeof("AT^SGIO=7\r\n"));
   } while (!checkGNSSEngine("^SGIO: 1"));
 
@@ -108,7 +109,7 @@ void arduino::GPSClass::readAndDrop()
 }
 
 void arduino::GPSClass::begin(unsigned long baudrate)
-{ //  alligne with other begin
+{
   auto cmux = arduino::CMUXClass::get_default_instance();
 
   auto serial = cmux->get_serial(1);
@@ -118,27 +119,37 @@ void arduino::GPSClass::begin(unsigned long baudrate)
   _serial->write("ATE0\r\n", sizeof("ATE0\r\n"));
   readAndDrop();
 
-  _serial->write("AT^SGPSC=Engine/StartMode,0\r\n", sizeof("AT^SGPSC=Engine/StartMode,0\r\n"));
+  // burn any incoming message on gps rx buffer
   readAndDrop();
 
-  _serial->write("AT^SPIO=1\r\n", sizeof("AT^SPIO=1\r\n"));
-  readAndDrop();
+  do
+  {
+    _serial->write("AT^SPIO=0\r\n", sizeof("AT^SPIO=0\r\n"));
+    readAndDrop();
 
-  _serial->write("AT^SCPIN=1,7,1,0\r\n", sizeof("AT^SCPIN=1,7,1,0\r\n"));
-  readAndDrop();
+    _serial->write("AT^SPIO=1\r\n", sizeof("AT^SPIO=1\r\n"));
+    readAndDrop();
 
-  _serial->write("AT^SSIO=7,1\r\n", sizeof("AT^SSIO=7,1\r\n"));
-  readAndDrop();
+    _serial->write("AT^SCPIN=1,7,1,0\r\n", sizeof("AT^SCPIN=1,7,1,0\r\n"));
+    readAndDrop();
+
+    _serial->write("AT^SSIO=7,1\r\n", sizeof("AT^SSIO=7,1\r\n"));
+    readAndDrop();
+
+    _serial->write("AT^SGIO=7\r\n", sizeof("AT^SGIO=7\r\n"));
+  } while (!checkGNSSEngine("^SGIO: 1"));
 
-  _serial->write("AT^SGPSC=Engine,3\r\n", sizeof("AT^SGPSC=Engine,3\r\n")); //
-  checkGNSSEngine("^SGPSC: \"Engine\",\"3\"");
-  _engine = true;
+  _serial->write("AT^SGPSC=Engine/StartMode,0\r\n", sizeof("AT^SGPSC=Engine/StartMode,0\r\n"));
+  checkGNSSEngine("^SGPSC: \"Engine/StartMode\",\"0\"");
 
-  if (_engine)
+  while (!_engine)
   {
-    _serial->write("AT^SGPSC=Nmea/Urc,on\r\n", sizeof("AT^SGPSC=Nmea/Urc,on\r\n"));
-    readAndDrop();
+    _serial->write("AT^SGPSC=Engine,3\r\n", sizeof("AT^SGPSC=Engine,3\r\n"));
+    _engine = checkGNSSEngine("^SGPSC: \"Engine\",\"3\"");
   }
+
+  _serial->write("AT^SGPSC=Nmea/Urc,on\r\n", sizeof("AT^SGPSC=Nmea/Urc,on\r\n"));
+  readAndDrop();
 }
 
 int arduino::GPSClass::peek(void)
@@ -177,7 +188,6 @@ size_t arduino::GPSClass::write(uint8_t c)
 
 void arduino::GPSClass::end()
 {
-
   _serial->write("AT^SGPSC=Nmea/Urc,off\r\n", sizeof("AT^SGPSC=Nmea/Urc,off\r\n"));
   readAndDrop();
 
@@ -188,7 +198,7 @@ void arduino::GPSClass::end()
   }
 
   _serial->write("^SSIO=7,0\r\n", sizeof("^SSIO=7,0\r\n"));
-  readAndDrop(); // sgio in modo da verificare l effettivo spegnimento
+  readAndDrop();
 }
 
 arduino::GPSClass::operator bool()

libraries/GPS/src/GPS.h

@@ -1,5 +1,5 @@
 /*
-  GSM.h - Library for GSM on mbed platforms.
+  GPS.h - Library for GSM on mbed platforms.
   Copyright (c) 2011-2021 Arduino LLC.  All right reserved.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

libraries/GSM/examples/GNSSClient/GNSSClient.ino

@@ -12,21 +12,25 @@ char pass[]     = SECRET_PASSWORD;
 void setup() {
   Serial.begin(115200);
   while (!Serial) {}
-  //GSM.debug(Serial);
-  Serial.println("\nStarting connection to server...");
-  GSM.begin(pin, apn, username, pass, CATNB);
+
+  Serial.println("Starting Carrier Network registration");
+  if(!GSM.begin(pin, apn, username, pass, CATNB)){
+    Serial.println("The board was not able to register to the network...");
+    // do nothing forevermore:
+    while(1);
+  }
   Serial.println("\nEnable GNSS Engine...");
   // GPS.begin() start and eanble the GNSS engine
   GPS.begin();
   Serial.println("\nGNSS Engine enabled...");
 }
 
 void loop() {
-  //GPS.begin();
   if(GPS.available()){
     Serial.print((char) GPS.read());
     delay(1);
   }
-  // GPS.end() stop and disable the GNSS engine
+  // After geting valid packet GPS.end() can be used to stop and
+  // disable the GNSS engine
   // GPS.end();
-}
+}

libraries/GSM/examples/GSMClient/GSMClient.ino

@@ -17,9 +17,12 @@ GSMClient client;
 void setup() {
   Serial.begin(115200);
   while(!Serial) {}
-
-  GSM.begin(pin, apn, username, pass, CATNB);
-  
+  Serial.println("Starting Carrier Network registration");
+  if(!GSM.begin(pin, apn, username, pass, CATNB)){
+    Serial.println("The board was not able to register to the network...");
+    // do nothing forevermore:
+    while(1);
+  }
   Serial.println("\nStarting connection to server...");
   // if you get a connection, report back via serial:
   if (client.connect(server, port)) {