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

 /* USER CODE BEGIN PV */
 /* Private variables ---------------------------------------------------------*/
 context_t contexts[MAX_DISPLAYS];
-/* timeout when the ignition is switched off */
+///@brief  timeout when the ignition is switched off
 #define IGNITION_OFF_TIMEOUT 30000UL
-// 500mS per logger period.
+/// @brief 1000mS per logger period, print average per period
-#define LOGGER_INTERVAL 500UL
+#define LOGGER_INTERVAL 1000UL
-const int DialTimeout = 100; // about 10 seconds after twiddle, save the dial position.
+/// @brief  about 10 seconds after twiddle, save the dial position.
-nvram_info_t dial_nvram[MAX_DISPLAYS];
+const int DialTimeout = 100;
+/// @brief Data storage for readings
 info_t Info[MAXRDG];
+/// @brief Define a null item
+const info_t nullInfo = {.Max = 0,
+                         .Min = 0xFFF,
+                         .sum = 0,
+                         .count = 0,
+                         .updated = 0,
+                         .lastUpdated = 0,
+                         .observation = PLX_MAX_OBS,
+                         .instance = PLX_MAX_INST};
 /// \brief storage for incoming data
 data_t Data;
-int PLXItems;
 uint32_t Latch_Timer = IGNITION_OFF_TIMEOUT;
 // location for GPS data
 Location loc;
   if (contexts[dial].knobPos < 0)
     return -1;
   return cc_display(dial, suppress);
+}
-/// \note this code doesnt work so it leaves speed as 9600.
+/// \note  HC-05 only accepts : 9600,19200,38400,57600,115200,230400,460800 baud
 /// \brief Setup Bluetooth module
 void initModule(usart_ctl *ctl, uint32_t baudRate)
+{
   char initBuf[30];
   // switch to command mode
-  HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(BT_RESET_GPIO_Port, BT_RESET_Pin, GPIO_PIN_RESET);
   HAL_Delay(500);
-  int initLen = small_sprintf(initBuf, "AT+UART=%lu,1,2\n", baudRate);
   setBaud(ctl, 38400);
+  int initLen = small_sprintf(initBuf, "AT+UART=%lu,0,0\n", baudRate);
+  const char buf[] = "AT+RESET\n";
   sendString(ctl, initBuf, initLen);
+  HAL_Delay(500);
+  initLen = small_sprintf(initBuf, buf);
+  sendString(ctl, initBuf, initLen);
   TxWaitEmpty(ctl);
-  // switch back to normal comms at new baud rate
+  // clear the button press
-  HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(BT_RESET_GPIO_Port, BT_RESET_Pin, GPIO_PIN_SET);
+  // switch back to normal comms at new baud rate
   setBaud(ctl, baudRate);
   HAL_Delay(100);
+}
 // workspace for RMC data read from GPS module.
 uint8_t btConnected()
+{
   return HAL_GPIO_ReadPin(BT_STATE_GPIO_Port, BT_STATE_Pin) == GPIO_PIN_SET;
+}
+/// @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)
+    return false;
+  return Info[index].instance == PLX_MAX_INST && Info[index].observation == 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)
+    return false;
+  if (isUnused(index))
+    return false;
+  uint32_t age = HAL_GetTick() - Info[index].lastUpdated;
+  if (age > 300)
+    return false;
+  return true;
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
   HAL_TIM_Encoder_Start(&htim3, TIM_CHANNEL_ALL);
   HAL_TIM_Encoder_Start(&htim9, TIM_CHANNEL_ALL);
-  initModule(&uc3, 9600);
+  initModule(&uc3, 38400);
   // Initialise UART for 4800 baud NMEA
   setBaud(&uc2, 4800);
   // Initialuse UART4 for 4800 baud NMEA.
   uint32_t nextTick = 0;
   uint8_t log = 0;
   // PLX decoder protocols
   char PLXPacket = 0;
   for (i = 0; i < MAXRDG; i++)
+  {
-    Info[i].Max = 0;
-    Info[i].Min = 0xFFF;
-    Info[i].sum = 0;
-    Info[i].count = 0;
+    Info[i] = nullInfo;
-    Info[i].updated = 0;
-    Info[i].lastUpdated = 0;
+  }
   int PLXPtr = 0;
   int logCount = 0;
+  uint32_t resetCounter; // record time at which both reset buttons were first pressed.
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
     // Handle the bluetooth pairing / reset function by pressing both buttons.
     if ((push_pos[0] == 1) && (push_pos[1] == 1))
+    {
       HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin,
                         GPIO_PIN_RESET);
+      if (resetCounter == 0)
+        resetCounter = HAL_GetTick();
+    }
     else
+    {
       HAL_GPIO_WritePin(BT_BUTTON_GPIO_Port, BT_BUTTON_Pin,
                         GPIO_PIN_SET);
+      if (resetCounter != 0)
+      {
+        // Held down reset button for 10 seconds, clear NVRAM.
+        if ((HAL_GetTick() - resetCounter) > 10000)
+        {
+          for (i = 0; i < 2; i++)
+          {
+            dial_pos[i] = 0;            // default to items 0 and 1
+            contexts[i].knobPos = -1;   // set the knob position
+            contexts[i].dial_timer = 1; // timeout immediately when decremented
+          }
+          erase_nvram();
+        }
+        resetCounter = 0;
+      }
+    }
     // poll GPS Position/time on UART4
     (void)updateLocation(&loc, &uc4);
     if (loc.valid == 'V')
       if (log)
+      {
         log = 0;
         // Send items  to BT if it is in connected state
-        for (int i = 0; i < PLXItems; ++i)
+        for (int i = 0; i <  MAXRDG; ++i)
+        {
+          if(!isValid(i))
+            continue;
           char outbuff[100];
           int cnt = small_sprintf(outbuff,
                                   "$PLLOG,%d,%d,%d,%ld",
                                   logCount,
       if (c == PLX_Stop)
+      {
         if (PLXPacket)
+        {
           // we can now decode the selected parameter
-          PLXItems = PLXPtr / sizeof(PLX_SensorInfo); // total
+          int PLXNewItems = PLXPtr / sizeof(PLX_SensorInfo); // total items in last reading batch
-          // saturate the rotary switch position
-          // process min/max
+          // process items
-          for (i = 0; i < PLXItems; i++)
+          for (i = 0; i < PLXNewItems; i++)
+          {
+            // search to see if the item already has a slot in the Info[] array
+            // match the observation and instance: if found, update entry
-            Info[i].observation = ConvPLX(Data.Sensor[i].AddrH,
+            enum PLX_Observations observation = ConvPLX(Data.Sensor[i].AddrH,
-                                          Data.Sensor[i].AddrL);
+                                                        Data.Sensor[i].AddrL);
+            char instance = Data.Sensor[i].Instance;
+            // validate the current item, discard out of range
-            Info[i].instance = Data.Sensor[i].Instance;
+            if ((instance > PLX_MAX_INST) || (observation > PLX_MAX_OBS))
-            Info[i].data = ConvPLX(Data.Sensor[i].ReadingH,
+              continue;
-                                   Data.Sensor[i].ReadingL);
+            // search for the item in the list
+            int j;
-            if (Info[i].data > Info[i].Max)
+            for (j = 0; j < MAXRDG; ++j)
+            {
+              if ((Info[j].observation == observation) && (Info[j].instance == instance))
-              Info[i].Max = Info[i].data;
+                break;
+            }
+            // fallen off the end of the list of existing items without a match, so j points at next new item
+            //
-            if (Info[i].data < Info[i].Min)
+            // Find an unused slot
+            if (j == MAXRDG)
+            {
+              int k;
+              {
+                for (k = 0; k < MAXRDG; ++k)
+                  if (!isValid(k))
+                  {
+                    j = k; // found a spare slot
+                    break;
+                  }
+              }
+              if (k == MAXRDG)
+                continue; // abandon this iteration
+            }
+            // give up if we are going to fall off the end of the array
+            if (j > MAXRDG)
+              break;
+            Info[j].observation = observation;
+            Info[j].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;
+            }
+            if (Info[j].data < Info[j].Min)
+            {
-              Info[i].Min = Info[i].data;
+              Info[j].Min = Info[j].data;
+            }
             // take an average
-            Info[i].sum += Info[i].data;
+            Info[j].sum += Info[j].data;
-            Info[i].count++;
+            Info[j].count++;
             // note the last update time
-            Info[i].lastUpdated = HAL_GetTick();
+            Info[j].lastUpdated = HAL_GetTick();
-            Info[i].updated = 1; // it has been updated
+            Info[j].updated = 1; // it has been updated
+          }
           PLXPtr = 0;
           PLXPacket = 0;
+          // scan through and invalidate all old items
+          for (int i = 0; i < MAXRDG; ++i)
+          {
+            if (!isValid(i))
+              Info[i] = nullInfo;
+          }
           break; // something to process
+        }
+      }
       if (c > PLX_Stop) // illegal char, restart reading
+      {
         PLXPacket = 0;
+    }
     int suppress = -1;
     for (i = 0; i < MAX_DISPLAYS; i++)
     { // now to display the information
       suppress = DisplayCurrent(i, suppress);
       if (dial_pos[i] < 0)
-        dial_pos[i] = PLXItems - 1;
+        dial_pos[i] = MAXRDG - 1;
-      if (dial_pos[i] >= PLXItems)
+      if (dial_pos[i] >= MAXRDG)
         dial_pos[i] = 0;
       int prevPos = contexts[i].knobPos;
       if (contexts[i].knobPos >= 0)
         contexts[i].knobPos = dial_pos[i];
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOA, SPI_NSS1_Pin | BT_RESET_Pin, GPIO_PIN_SET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOA, SPI_CD_Pin | BT_BUTTON_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   GPIO_InitStruct.Pin = IGNITION_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(IGNITION_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pin : BT_BUTTON_Pin */
+  /*Configure GPIO pins : BT_BUTTON_Pin BT_RESET_Pin */
-  GPIO_InitStruct.Pin = BT_BUTTON_Pin;
+  GPIO_InitStruct.Pin = BT_BUTTON_Pin | BT_RESET_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(BT_BUTTON_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 68 → 70