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

  */
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
-#include <stdlib.h>
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include <math.h>
 #include "libPLX/plx.h"
 #include "libPLX/displayinfo.h"
 #include "libPLX/commsLib.h"
 #include "libSerial/serialUtils.H"
                          .observation = nullObs};
 context_t contexts[MAX_DISPLAYS];
 /// @brief Data storage for readings
-info_t Info[MAXRDG];
+info_t Info[INFO_SIZE];
 uint32_t Latch_Timer;
 // location for GPS data
 Location loc;
 /// @brief return true if this slot is unused
 /// @param ptr pointer to the slot to
 uint8_t isUnused(int index)
+{
-  if (index < 0 || index > MAXRDG)
+  if (index < 0 || index > PLX_MAX_OBS)
     return false;
   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
 uint8_t isValid(int index)
+{
-  if (index < 0 || index > MAXRDG)
+  if (index < 0 || index > INFO_SIZE)
     return false;
   if (isUnused(index))
     return false;
   uint32_t age = HAL_GetTick() - Info[index].lastUpdated;
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
-void libPLXcallbackSendUserData(struct usart_ctl * instance)
+unsigned mapToIndex(unsigned instance, unsigned item)
+{
-  (void)instance;
+  return  instance  + item * PLX_MAX_INST_LIMIT;
+}
+void libPLXcallbackSendUserData(struct usart_ctl *instance)
+{
+  (void)instance;
+}
 void libPLXcallbackRecievedData(PLX_SensorInfo *info)
+{
   // received some data , timeout is reset
   dataTimeout = 0;
   enum PLX_Observations observation = ConvPLX(info->AddrH,
                                               info->AddrL);
   char instance = info->Instance;
-  int16_t data = ConvPLX(info->ReadingH,
-                         info->ReadingL);
   // validate the current item, discard out of range
-  if ((instance > PLX_MAX_INST) || (observation > PLX_MAX_OBS))
+  if ((instance > PLX_MAX_INST_LIMIT) || (observation > PLX_MAX_OBS))
     return;
-  // search for the item in the list
-  int currentSlot;
-  for (currentSlot = 0; currentSlot < MAXRDG; ++currentSlot)
-  {
-    if ((Info[currentSlot].observation.Obs == observation) && (Info[currentSlot].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
-  if (currentSlot == MAXRDG)
-  {
-    int k;
-    {
-      for (k = 0; k < MAXRDG; ++k)
-        if (!isValid(k))
-        {
-          currentSlot = k; // found a spare slot
+  unsigned currentSlot = mapToIndex(instance ,observation);
-          Info[currentSlot] = nullInfo;
-          break;
-        }
-    }
-    if (k == MAXRDG)
-      return; // abandon this iteration
-  }
-  // give up if we are going to fall off the end of the array
+  int16_t data = ConvPLX(info->ReadingH,
-  if (currentSlot >= MAXRDG)
+                         info->ReadingL);
-    return;
   Info[currentSlot].observation.Obs = observation;
   Info[currentSlot].observation.Instance = instance;
   Info[currentSlot].data = data;
   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
-  // scan through and invalidate all old items
-  for (int i = 0; i < MAXRDG; ++i)
-  {
-    if (!isValid(i))
-      Info[i] = nullInfo;
-  }
+}
 /* USER CODE END 0 */
 /**
  * @brief  The application entry point.
  * @retval int
  */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
   __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
   // used in NMEA style logging
   uint32_t nextTick = 0; ///< time to send next
   nextTickReload = 0;
   uint32_t offsetTicks = 0; ///< time to print as offset in mS for each loop
-  for (int i = 0; i < MAXRDG; ++i)
+  for (int i = 0; i < INFO_SIZE; ++i)
+  {
     Info[i] = nullInfo;
+  }
   uint32_t resetCounter = 0; // record time at which both reset buttons were first pressed.
                 loc.tv.tm_hour = 0;
+            }
+          }
+        }
-        for (int i = 0; i < MAXRDG; ++i)
+        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 (dataTimeout > 60000)
+    {
       // do turn off screen
+    }
-    // wait for a bit if nothing came in.
-    HAL_Delay(1);
-  }
-  // handle switch rotation
+    // handle switch rotation
-  for (int i = 0; i < MAX_DIALS; ++i)
+    for (int i = 0; i < MAX_DIALS; ++i)
-  {
-    int delta = get_dial_diff(i);
-    int pos = contexts[i].knobPos;
-    if (pos < 0)
-      break; // dont process until we have read NVRAM for the first time .
-    int start = pos;
-    // move in positive direction
-    while (delta > 0)
+    {
-      // skip invalid items, dont count
+      int delta = get_dial_diff(i);
-      if (pos < MAXRDG - 1)
+      int pos = contexts[i].knobPos;
-        pos++;
+      if (pos < 0)
-      else
+        break; // dont process until we have read NVRAM for the first time .
-        pos = 0;
+      int start = pos;
-      if (isValid(pos))
+      // move in positive direction
-        delta--; // count a valid item
+      while (delta > 0)
-      // wrap
+      {
+        // skip invalid items, dont count
-      if (pos == start)
+        if (pos < INFO_SIZE - 1)
-        break;
+          pos++;
-    }
+        else
+          pos = 0;
-    // move in negative direction
-    while (delta < 0)
-    {
-      // skip invalid items, dont count
-      if (pos > 0)
-        pos--;
-      else
-        pos = MAXRDG - 1;
-      if (isValid(pos))
+        if (isValid(pos))
-        delta++; // count a valid item
+          delta--; // count a valid item
-      // wrap
-      if (pos == start)
-        break;
-    }
-    contexts[i].knobPos = pos;
+        // wrap
-    if (pos != start)
+        if (pos == start)
-      contexts[i].dial_timer = DialTimeout;
+          break;
-  }
+      }
+      // move in negative direction
-  int suppress = -1;
+      while (delta < 0)
+      {
-  for (int i = 0; i < MAX_DISPLAYS; ++i)
+        // skip invalid items, dont count
-  { // now to display the information
+        if (pos > 0)
+          pos--;
+        else
-    suppress = DisplayCurrent(i, suppress);
+          pos = INFO_SIZE - 1;
-    cc_check_nvram(i);
+        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;
-  }
+    }
-  /* USER CODE END WHILE */
+    int suppress = -1;
+    for (int i = 0; i < MAX_DISPLAYS; ++i)
+    { // now to display the information
+      suppress = DisplayCurrent(i, suppress);
+      cc_check_nvram(i);
+    }
+    HAL_Delay(1);
+    /* USER CODE END WHILE */
+  }
   /* USER CODE BEGIN 3 */
   /* USER CODE END 3 */
+}
  * @retval None
  */
 static void MX_GPIO_Init(void)
+{
   GPIO_InitTypeDef GPIO_InitStruct = {0};
+  /* USER CODE BEGIN MX_GPIO_Init_1 */
+  /* USER CODE END MX_GPIO_Init_1 */
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOH_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOC_CLK_ENABLE();
   GPIO_InitStruct.Pin = BT_RESET_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(BT_RESET_GPIO_Port, &GPIO_InitStruct);
+  /* USER CODE BEGIN MX_GPIO_Init_2 */
+  /* USER CODE END MX_GPIO_Init_2 */
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 76 → 77