WebSVN – DashDisplay – Diff – /branches/Dashboard_L152_v2/Src/main.c

                          .Min = 0xFFF,
                          .sum = 0,
                          .count = 0,
                          .updated = 0,
                          .lastUpdated = 0,
-                         .observation = PLX_MAX_OBS,
+                         .observation.Obs = PLX_MAX_OBS,
-                         .instance = PLX_MAX_INST};
+                         .observation.Instance = PLX_MAX_INST};
 /// \brief storage for incoming data
 data_t Data;
 uint32_t Latch_Timer = IGNITION_OFF_TIMEOUT;
 // location for GPS data
 Location loc;
+/// @brief Time when the logged data will be sent
+uint32_t nextTickReload = 0;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
   setBaud(ctl, baudRate);
   HAL_Delay(100);
+}
 // workspace for RMC data read from GPS module.
-uint8_t rmc_buff[80];
 volatile uint16_t rmc_length;
 uint8_t rmc_callback(uint8_t *data, uint16_t length)
+{
+  // send it back out
-  rmc_length = length < sizeof(rmc_buff) ? length : sizeof(rmc_buff);
+  rmc_length = length;
-  memcpy(rmc_buff, data, length);
+  sendString(&uc3, (const char *)data, length);
+  nextTickReload = HAL_GetTick() + LOGGER_INTERVAL;
   return 0;
+}
 // check if bluetooth connected
 uint8_t btConnected()
 uint8_t isUnused(int index)
+{
   if (index < 0 || index > MAXRDG)
     return false;
-  return Info[index].instance == PLX_MAX_INST && Info[index].observation == PLX_MAX_OBS;
+  return Info[index].observation.Instance == PLX_MAX_INST && Info[index].observation.Obs == PLX_MAX_OBS;
+}
 /// @brief Determine if an entry is currently valid
 /// @param index the number of the array entry to display
 /// @return true if the entry contains data which is fresh
   uint32_t timeout = 0; //
   // used in NMEA style logging
   uint32_t nextTick = 0;    ///< time to send next
   uint32_t offsetTicks = 0; ///< time to print as offset in mS for each loop
-  //
-  uint8_t log = 0;
   // PLX decoder protocols
   char PLXPacket = 0;
   for (i = 0; i < MAXRDG; i++)
+  {
     // if permitted, log data from RMC packet
     if (btConnected())
+    {
       // Any RMC data, send it, reset the logger timeout
-      if (rmc_length)
-      {
-        sendString(&uc3, (const char *)rmc_buff, rmc_length);
-        rmc_length = 0;
-        offsetTicks = 0;
-        nextTick = HAL_GetTick() + LOGGER_INTERVAL;
-        log = 1;
-      }
       // Timeout for data logging regularly
       if (HAL_GetTick() > nextTick)
+      {
-        offsetTicks += LOGGER_INTERVAL;
+        nextTick = nextTickReload;
-        nextTick = HAL_GetTick() + LOGGER_INTERVAL;
+        nextTickReload += LOGGER_INTERVAL;
-        if (offsetTicks < (1000))
-          log = 1;
-      }
-      if (log)
-      {
-        log = 0;
         // Send items  to BT if it is in connected state
+        // print timestamp as a $PLTIM record.
         char linebuff[20];
         strftime(linebuff, sizeof(linebuff), "%H%M%S", &loc.tv);
+        char outbuff[100];
+        int cnt = small_sprintf(outbuff, "$PLTIM,%s.%03lu\n", linebuff, offsetTicks);
+        sendString(&uc3, outbuff, cnt);
+        offsetTicks += LOGGER_INTERVAL;
+               if (offsetTicks >= (1000))
+        {
+          offsetTicks = 0;
+          loc.tv.tm_sec++;
+          if (loc.tv.tm_sec >= 60)
+          {
+            loc.tv.tm_sec = 0;
+            loc.tv.tm_min++;
+            if (loc.tv.tm_min >= 60)
+            {
+              loc.tv.tm_hour++;
+              if (loc.tv.tm_hour >= 24)
+                loc.tv.tm_hour = 0;
+            }
+          }
+        }
         for (int i = 0; i < MAXRDG; ++i)
+        {
           if (!isValid(i))
             continue;
-          char outbuff[100];
+          // print logger items as $PLLOG record
           int cnt = small_sprintf(outbuff,
-                                  "$PLLOG,%s.%03lu,%d,%d,%ld",
+                                  "$PLLOG,%d,%d,%ld",
-                                  linebuff,
-                                  offsetTicks,
-                                  Info[i].observation,
+                                  Info[i].observation.Obs,
-                                  Info[i].instance,
+                                  Info[i].observation.Instance,
                                   Info[i].count == 0 ? 0 : Info[i].sum / Info[i].count);
+          Info[i].count = 0;
+          Info[i].sum = 0;
           // NMEA style checksum
           int ck;
           int sum = 0;
           for (ck = 1; ck < cnt; ck++)
+      {
         // do turn off screen
+      }
       // wait for a bit if nothing came in.
-      HAL_Delay(10);
+      HAL_Delay(1);
+    }
     /// process the observation list
     for (chr = 0; chr < cc; chr++)
+    {
             // search for the item in the list
             int j;
             for (j = 0; j < MAXRDG; ++j)
+            {
-              if ((Info[j].observation == observation) && (Info[j].instance == instance))
+              if ((Info[j].observation.Obs == observation) && (Info[j].observation.Instance == instance))
                 break;
+            }
             // fallen off the end of the list of existing items without a match, so j points at next new item
             //
             // Find an unused slot
             // give up if we are going to fall off the end of the array
             if (j > MAXRDG)
               break;
-            Info[j].observation = observation;
+            Info[j].observation.Obs = observation;
-            Info[j].instance = instance;
+            Info[j].observation.Instance = instance;
             Info[j].data = ConvPLX(Data.Sensor[j].ReadingH,
                                    Data.Sensor[j].ReadingL);
             if (Info[j].data > Info[j].Max)
+            {
               Info[j].Max = Info[j].data;

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 73 → 74