fixes

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

@@ -35,10 +35,9 @@
 #include <hal/hal.h>
 #include <lmic.h>
 
-
+#include <CayenneLPP.h>
 #include <MicroNMEA.h>
 #include <Wire.h>
-#include <CayenneLPP.h>
 
 // I2C communication parameters
 #define DEFAULT_DEVICE_ADDRESS 0x3A
@@ -137,13 +136,9 @@ const lmic_pinmap lmic_pins = *Arduino_LMIC::GetPinmap_Disco_L072cz_Lrwan1();
 #error "Unknown target"
 #endif
 
-void ppsHandler(void)
-{
-  ppsTriggered = true;
-}
+void ppsHandler(void) { ppsTriggered = true; }
 
-void gpsHardwareReset()
-{
+void gpsHardwareReset() {
   // reset the device
   digitalWrite(RESET_PIN, LOW);
   delay(50);
@@ -154,23 +149,20 @@ void gpsHardwareReset()
 }
 
 // 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.endTransmission(false);
   gps.requestFrom((uint8_t)DEFAULT_DEVICE_ADDRESS, (uint8_t)32);
   int i = 0;
-   while (gps.available())
-   {
+  while (gps.available()) {
     inBuff[i] = gps.read();
     i++;
   }
 }
 
 // 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);
   MicroNMEA::sendSentence(gps, cmd);
@@ -295,8 +287,7 @@ void onEvent(ev_t ev) {
 
 void readGPS() {
   // If a message is recieved print all the informations
-   if (ppsTriggered)
-   {
+  if (ppsTriggered) {
     ppsTriggered = false;
     ledState = !ledState;
     digitalWrite(LED_BUILTIN, ledState);
@@ -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,13 +348,11 @@ void readGPS() {
     Serial.println(nmea.getCourse() / 1000., 3);
     Serial.println("-----------------------");
     nmea.clear();
-      
   }
-   else
-   {
+
+  while (!ppsTriggered) {
     char c;
-      if (idx == 0)
-      {
+    if (idx == 0) {
       readI2C(buff);
       delay(I2C_DELAY);
     }
@@ -371,8 +361,7 @@ void readGPS() {
     idx++;
     idx %= 32;
     // 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);
     }
@@ -427,18 +416,15 @@ void setup() {
   char c;
   idx = 0;
   memset(buff, 0, 32);
-  do
-  {
-    if (idx == 0)
-    {
+  do {
+    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);