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

+ *
  ******************************************************************************
  */
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include <stdio.h>
 #include <stdlib.h>
 #include "libPLX/plx.h"
 #include "libPLX/displayinfo.h"
 #include "libPLX/commsLib.h"
 uint32_t const IGNITION_OFF_TIMEOUT = 30000UL;
 /// @brief 1000mS per logger period, print average per period
 uint32_t const LOGGER_INTERVAL = 250UL;
-/// @brief  about 10 seconds after twiddle, save the dial position.
+/// @brief  about 2 seconds after twiddle, save the dial position.
-const int DialTimeout = 100;
+const int DialTimeout = 2000;
+/// @brief Observations are stale if not seen for 1 second
+const int MAX_OBS_AGE = 1000;
 /// @brief Unused Observation
 uniqueObs_t const nullObs = {PLX_MAX_OBS,
                              PLX_MAX_INST};
 context_t contexts[MAX_DISPLAYS];
 /// @brief Data storage for readings
 info_t Info[INFO_SIZE];
-uint32_t Latch_Timer;
+uint32_t Latch_Timer = 0 ;
 // location for GPS data
-Location loc;
+Location loc = {};
 /// @brief Time when the logged data will be sent
-uint32_t nextTickReload;
+uint32_t nextTickReload = 0;
 // data timeout
 uint32_t dataTimeout = 0; //
 // USART buffers
   if (isUnused(index))
     return false;
   uint32_t age = HAL_GetTick() - Info[index].lastUpdated;
-  if (age > 300)
+  if (age > MAX_OBS_AGE )
     return false;
   return true;
+}
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 unsigned mapToIndex(unsigned instance, unsigned item)
+{
-  return  instance  + item * PLX_MAX_INST_LIMIT;
+  return instance + item * PLX_MAX_INST_LIMIT;
+}
 void libPLXcallbackSendUserData(struct usart_ctl *instance)
+{
   (void)instance;
   // validate the current item, discard out of range
   if ((instance > PLX_MAX_INST_LIMIT) || (observation > PLX_MAX_OBS))
     return;
+  unsigned currentSlot = mapToIndex(instance, observation);
-  unsigned currentSlot = mapToIndex(instance ,observation);
   int16_t data = ConvPLX(info->ReadingH,
                          info->ReadingL);
   Info[currentSlot].observation.Obs = observation;
   Info[currentSlot].sum += data;
   Info[currentSlot].count++;
   // note the last update time
   Info[currentSlot].lastUpdated = HAL_GetTick();
   Info[currentSlot].updated = 1; // it has been updated
+}
+// move to the next valid item if the current is not valid
+int nextItem(int pos, int delta)
+{
+  int start = pos;
+  // move in positive direction
+  while (delta > 0)
+  {
+    // skip invalid items, dont count
+    if (pos < INFO_SIZE - 1)
+      pos++;
+    else
+      pos = 0;
+    if (isValid(pos))
+      delta--; // count a valid item
+    // wrap
+    if (pos == start)
+      break;
+  }
+  // move in negative direction
+  while (delta < 0)
+  {
+    // skip invalid items, dont count
+    if (pos > 0)
+      pos--;
+    else
+      pos = INFO_SIZE - 1;
+    if (isValid(pos))
+      delta++; // count a valid item
+    // wrap
+    if (pos == start)
+      break;
+  }
+  return pos;
+}
+/// @brief Log data to bluetooth as a sort of NMEA0183
+/// @param offsetTicks fraction of a second offset
+/// @return new offsetTicks value
+uint32_t logBt( uint32_t offsetTicks)
+{
+  // 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;
+  // increment timer
+  if (offsetTicks >= (1000))
+  {
+    offsetTicks -= 1000;
+    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 < INFO_SIZE; ++i)
+  {
+    if (!isValid(i))
+      continue;
+    // format output
+    // avoid division by zero for items with no sample data this iteration
+    if (Info[i].count == 0)
+      continue;
+    double average = (double)Info[i].sum / Info[i].count;
+    enum PLX_Observations Observation = Info[i].observation.Obs;
+    double cur_rdg = ConveriMFDRaw2Data((enum PLX_Observations)Observation, DisplayInfo[Observation].Units,
+                                        average);
+    int cnt;
+    int intPart;
+    // depending on digits after the decimal point,
+    // choose how to format data
+    switch (DisplayInfo[Observation].DP)
+    {
+    default:
+    case 0:
+      cnt = small_sprintf(outbuff,
+                          "$PLLOG,%s,%d,%d",
+                          DisplayInfo[Info[i].observation.Obs].name,
+                          Info[i].observation.Instance,
+                          (int)cur_rdg);
+      break;
+    case 1:
+      intPart = (int)(cur_rdg * 10);
+      cnt = small_sprintf(outbuff,
+                          "$PLLOG,%s,%d,%d.%1d",
+                          DisplayInfo[Info[i].observation.Obs].name,
+                          Info[i].observation.Instance,
+                          intPart / 10, abs(intPart) % 10);
+      break;
+    case 2:
+      intPart = (int)(cur_rdg * 100);
+      cnt = small_sprintf(outbuff,
+                          "$PLLOG,%s,%d,%d.%02d",
+                          DisplayInfo[Info[i].observation.Obs].name,
+                          Info[i].observation.Instance,
+                          intPart / 100, abs(intPart) % 100);
+      break;
+    }
+    Info[i].count = 0;
+    Info[i].sum = 0;
+    // NMEA style checksum
+    int ck;
+    int sum = 0;
+    for (ck = 1; ck < cnt; ck++)
+      sum += outbuff[ck];
+    cnt += small_sprintf(outbuff + cnt, "*%02X\n",
+                         sum & 0xFF);
+    sendString(&uc3, outbuff, cnt);
+  }
+return offsetTicks;
+}
+void resetDialTimer(int index)
+{
+  contexts[index].dial_timer =  HAL_GetTick() + DialTimeout;
+}
 /* USER CODE END 0 */
 /**
  * @brief  The application entry point.
  * @retval int
  */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
+#if defined SEMIHOSTING
+  initialise_monitor_handles();
+  #endif
   __HAL_RCC_SPI1_CLK_ENABLE();
   __HAL_RCC_USART1_CLK_ENABLE(); // PLX main port
   __HAL_RCC_USART2_CLK_ENABLE(); // debug port
   __HAL_RCC_USART3_CLK_ENABLE(); // Bluetooth port
   __HAL_RCC_UART4_CLK_ENABLE();  // NMEA0183 port
   cc_init();
   for (int i = 0; i < MAX_DISPLAYS; ++i)
+  {
     contexts[i] = nullContext; // set the knob position
+    resetDialTimer(i);
+  }
   /* reset the display timeout, latch on power from accessories */
   Latch_Timer = IGNITION_OFF_TIMEOUT;
   HAL_GPIO_WritePin(POWER_LATCH_GPIO_Port, POWER_LATCH_Pin, GPIO_PIN_RESET);
+  }
   uint32_t resetCounter = 0; // record time at which both reset buttons were first pressed.
   resetPLX();
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
         if ((HAL_GetTick() - resetCounter) > 10000)
+        {
           for (int i = 0; i < MAX_DISPLAYS; i++)
+          {
             contexts[i] = nullContext;
-            contexts[i].dial_timer = 1; // timeout immediately when decremented
+            contexts[i].dial_timer = HAL_GetTick(); // timeout immediately when decremented
+          }
           erase_nvram();
+        }
         resetCounter = 0;
+      }
       memset(loc.time, '-', 6);
     // if permitted, log data from RMC packet
     if (btConnected())
+    {
       // Timeout for data logging regularly
       if (HAL_GetTick() > nextTick)
+      {
         nextTick = nextTickReload;
         nextTickReload += LOGGER_INTERVAL;
-        // 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;
+        offsetTicks = logBt(offsetTicks);
-        // increment timer
-        if (offsetTicks >= (1000))
-        {
-          offsetTicks -= 1000;
-          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 < INFO_SIZE; ++i)
-        {
-          if (!isValid(i))
-            continue;
-          // format output
-          // avoid division by zero for items with no sample data this iteration
-          if (Info[i].count == 0)
-            continue;
-          double average = (double)Info[i].sum / Info[i].count;
-          enum PLX_Observations Observation = Info[i].observation.Obs;
-          double cur_rdg = ConveriMFDRaw2Data((enum PLX_Observations)Observation, DisplayInfo[Observation].Units,
-                                              average);
-          int cnt;
-          int intPart;
-          // depending on digits after the decimal point,
-          // choose how to format data
-          switch (DisplayInfo[Observation].DP)
-          {
-          default:
-          case 0:
-            cnt = small_sprintf(outbuff,
-                                "$PLLOG,%s,%d,%d",
-                                DisplayInfo[Info[i].observation.Obs].name,
-                                Info[i].observation.Instance,
-                                (int)cur_rdg);
-            break;
-          case 1:
-            intPart = (int)(cur_rdg * 10);
-            cnt = small_sprintf(outbuff,
-                                "$PLLOG,%s,%d,%d.%1d",
-                                DisplayInfo[Info[i].observation.Obs].name,
-                                Info[i].observation.Instance,
-                                intPart / 10, abs(intPart) % 10);
-            break;
-          case 2:
-            intPart = (int)(cur_rdg * 100);
-            cnt = small_sprintf(outbuff,
-                                "$PLLOG,%s,%d,%d.%02d",
-                                DisplayInfo[Info[i].observation.Obs].name,
-                                Info[i].observation.Instance,
-                                intPart / 100, abs(intPart) % 100);
-            break;
-          }
-          Info[i].count = 0;
-          Info[i].sum = 0;
-          // NMEA style checksum
-          int ck;
-          int sum = 0;
-          for (ck = 1; ck < cnt; ck++)
-            sum += outbuff[ck];
-          cnt += small_sprintf(outbuff + cnt, "*%02X\n",
-                               sum & 0xFF);
-          sendString(&uc3, outbuff, cnt);
-        }
+      }
+    }
     // poll data into libPLX
     libPLXpollData(&uc1);
       sendString(&uc3, msg, sizeof(msg));
+    }
     if (dataTimeout > 60000)
+    {
       // do turn off screen
+    }
     // handle switch rotation
     for (int i = 0; i < MAX_DIALS; ++i)
+    {
       int pos = contexts[i].knobPos;
       if (pos < 0)
         break; // dont process until we have read NVRAM for the first time .
       int start = pos;
-      int delta = get_dial_diff(i);
+      pos = nextItem(pos, get_dial_diff(i));
-      // move in positive direction
-      while (delta > 0)
-      {
-        // skip invalid items, dont count
-        if (pos < INFO_SIZE - 1)
-          pos++;
-        else
-          pos = 0;
-        if (isValid(pos))
-          delta--; // count a valid item
-        // wrap
-        if (pos == start)
-          break;
-      }
-      // move in negative direction
-      while (delta < 0)
-      {
-        // skip invalid items, dont count
-        if (pos > 0)
-          pos--;
-        else
-          pos = INFO_SIZE - 1;
-        if (isValid(pos))
-          delta++; // count a valid item
-        // wrap
-        if (pos == start)
-          break;
-      }
       contexts[i].knobPos = pos;
       if (pos != start)
-        contexts[i].dial_timer = DialTimeout;
+       resetDialTimer(i);
+    }
     int suppress = -1;
     for (int i = 0; i < MAX_DISPLAYS; ++i)
     { // now to display the information

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 79 → 80