fixes

ST-B-L072Z-LRWAN1/longfi-us915-cayenne-gnss/longfi-us915-cayenne-gnss.ino

@@ -35,12 +35,11 @@
 #include <hal/hal.h>
 #include <lmic.h>
 
-
+#include <CayenneLPP.h>
 #include <MicroNMEA.h>
 #include <Wire.h>
-#include <CayenneLPP.h>
 
-//I2C communication parameters
+// I2C communication parameters
 #define DEFAULT_DEVICE_ADDRESS 0x3A
 #define DEFAULT_DEVICE_PORT 0xFF
 #define I2C_DELAY 1
@@ -63,8 +62,8 @@ static const u1_t PROGMEM APPKEY[16] = {0};
 void os_getDevKey(u1_t *buf) { memcpy_P(buf, APPKEY, 16); }
 
 CayenneLPP lpp(51);
-TwoWire& gps = DEV_I2C;
+TwoWire &gps = DEV_I2C;
-//I2C read data structures
+// I2C read data structures
 char buff[32];
 int idx = 0;
 
@@ -137,42 +136,35 @@ const lmic_pinmap lmic_pins = *Arduino_LMIC::GetPinmap_Disco_L072cz_Lrwan1();
 #error "Unknown target"
 #endif
 
-void ppsHandler(void)
+void ppsHandler(void) { ppsTriggered = true; }
-{
-  ppsTriggered = true;
-}
 
-void gpsHardwareReset()
+void gpsHardwareReset() {
-{
+  // reset the device
-   //reset the device
   digitalWrite(RESET_PIN, LOW);
   delay(50);
   digitalWrite(RESET_PIN, HIGH);
 
-   //wait for reset to apply
+  // wait for reset to apply
   delay(2000);
 }
 
-//Read 32 bytes from I2C
+// Read 32 bytes from I2C
-void readI2C(char *inBuff)
+void readI2C(char *inBuff) {
-{
   gps.beginTransmission(DEFAULT_DEVICE_ADDRESS);
-   gps.write((uint8_t) DEFAULT_DEVICE_PORT);
+  gps.write((uint8_t)DEFAULT_DEVICE_PORT);
   gps.endTransmission(false);
-   gps.requestFrom((uint8_t)DEFAULT_DEVICE_ADDRESS, (uint8_t) 32);
+  gps.requestFrom((uint8_t)DEFAULT_DEVICE_ADDRESS, (uint8_t)32);
   int i = 0;
-   while (gps.available())
+  while (gps.available()) {
-   {
+    inBuff[i] = gps.read();
-      inBuff[i]= gps.read();
     i++;
   }
 }
 
-//Send a NMEA command via I2C
+// Send a NMEA command via I2C
-void sendCommand(char *cmd)
+void sendCommand(char *cmd) {
-{
   gps.beginTransmission(DEFAULT_DEVICE_ADDRESS);
-   gps.write((uint8_t) DEFAULT_DEVICE_PORT);
+  gps.write((uint8_t)DEFAULT_DEVICE_PORT);
   MicroNMEA::sendSentence(gps, cmd);
   gps.endTransmission(true);
 }
@@ -294,9 +286,8 @@ void onEvent(ev_t ev) {
 }
 
 void readGPS() {
-   //If a message is recieved print all the informations
+  // If a message is recieved print all the informations
-   if (ppsTriggered)
+  if (ppsTriggered) {
-   {
     ppsTriggered = false;
     ledState = !ledState;
     digitalWrite(LED_BUILTIN, ledState);
@@ -318,7 +309,7 @@ void readGPS() {
     Serial.println(nmea.getNumSatellites());
 
     Serial.print("HDOP: ");
-      Serial.println(nmea.getHDOP()/10., 1);
+    Serial.println(nmea.getHDOP() / 10., 1);
 
     Serial.print("Date/time: ");
     Serial.print(nmea.getYear());
@@ -348,6 +339,7 @@ void readGPS() {
     else
       Serial.println("not available");
 
+    // Pack CayenneLPP Payload
     lpp.addGPS(1, latitude_mdeg, longitude_mdeg, alt);
 
     Serial.print("Speed: ");
@@ -356,23 +348,20 @@ void readGPS() {
     Serial.println(nmea.getCourse() / 1000., 3);
     Serial.println("-----------------------");
     nmea.clear();
-      
   }
-   else
+
-   {
+  while (!ppsTriggered) {
-      char c ;
+    char c;
-      if (idx == 0)
+    if (idx == 0) {
-      {
       readI2C(buff);
       delay(I2C_DELAY);
     }
-      //Fetch the character one by one
+    // Fetch the character one by one
     c = buff[idx];
     idx++;
     idx %= 32;
-      //If we have a valid character pass it to the library
+    // If we have a valid character pass it to the library
-      if ((uint8_t) c != 0xFF)
+    if ((uint8_t)c != 0xFF) {
-      {
       Serial.print(c);
       nmea.process(c);
     }
@@ -404,7 +393,7 @@ void setup() {
   pinMode(LED_BUILTIN, OUTPUT);
   digitalWrite(LED_BUILTIN, ledState);
 
-  //Start the module
+  // Start the module
   pinMode(RESET_PIN, OUTPUT);
   digitalWrite(RESET_PIN, HIGH);
   Serial.println("Resetting GPS module ...");
@@ -415,30 +404,27 @@ void setup() {
   sendCommand((char *)"$PSTMSETPAR,1231,0x00000042");
   sendCommand((char *)"$PSTMSAVEPAR");
 
-  //Reset the device so that the changes could take plaace
+  // Reset the device so that the changes could take plaace
   sendCommand((char *)"$PSTMSRR");
 
   delay(4000);
 
-  //Reinitialize I2C after the reset
+  // Reinitialize I2C after the reset
   gps.begin();
 
-  //clear i2c buffer
+  // clear i2c buffer
   char c;
   idx = 0;
   memset(buff, 0, 32);
-  do
+  do {
-  {
+    if (idx == 0) {
-    if (idx == 0)
-    {
       readI2C(buff);
       delay(I2C_DELAY);
     }
     c = buff[idx];
     idx++;
     idx %= 32;
-  }
+  } while ((uint8_t)c != 0xFF);
-  while ((uint8_t) c != 0xFF);
 
   pinMode(2, INPUT);
   attachInterrupt(digitalPinToInterrupt(2), ppsHandler, RISING);