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

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "libPLX/plx.h"
 #include "libPLX/displayinfo.h"
+#include "libPLX/commsLib.h"
 #include "libSerial/serialUtils.H"
 #include "libSmallPrintf/small_printf.h"
 #include "libNMEA/nmea.h"
 #include "switches.h"
 context_t contexts[MAX_DISPLAYS];
 /// @brief Data storage for readings
 info_t Info[MAXRDG];
-/// \brief storage for incoming data
-data_t Data;
 uint32_t Latch_Timer;
 // location for GPS data
 Location loc;
 /// @brief Time when the logged data will be sent
 uint32_t nextTickReload;
+// data timeout
+uint32_t dataTimeout = 0; //
+// USART buffers
+uint8_t uc1_tx_buffer[TX_USART_BUFF_SIZ];
+uint8_t uc1_rx_buffer[RX_USART_BUFF_SIZ];
+uint8_t uc2_tx_buffer[TX_USART_BUFF_SIZ];
+uint8_t uc2_rx_buffer[RX_USART_BUFF_SIZ];
+uint8_t uc3_tx_buffer[TX_USART_BUFF_SIZ];
+uint8_t uc3_rx_buffer[RX_USART_BUFF_SIZ];
+uint8_t uc4_tx_buffer[TX_USART_BUFF_SIZ];
+uint8_t uc4_rx_buffer[RX_USART_BUFF_SIZ];
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
   return cc_display(dial, suppress);
+}
 /// \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)
+void initModule(struct usart_ctl *ctl, uint32_t baudRate)
+{
   char initBuf[60];
   // switch to command mode
   HAL_GPIO_WritePin(BT_RESET_GPIO_Port, BT_RESET_Pin, GPIO_PIN_SET);
   HAL_Delay(500);
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
+void libPLXcallbackSendUserData(struct usart_ctl * instance)
+{
+  (void)instance;
+}
+void libPLXcallbackRecievedData(PLX_SensorInfo *info)
+{
+  // received some data , timeout is reset
+  dataTimeout = 0;
+  // search to see if the item already has a slot in the Info[] array
+  // match the observation and instance: if found, update entry
+  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))
+    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
+          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
+  if (currentSlot >= MAXRDG)
+    return;
+  Info[currentSlot].observation.Obs = observation;
+  Info[currentSlot].observation.Instance = instance;
+  Info[currentSlot].data = data;
+  if (data > Info[currentSlot].Max)
+  {
+    Info[currentSlot].Max = data;
+  }
+  if (data < Info[currentSlot].Min)
+  {
+    Info[currentSlot].Min = data;
+  }
+  // take an average
+  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
   /* turn on UART4 IRQ */
   HAL_NVIC_SetPriority(UART4_IRQn, 4, 0);
   HAL_NVIC_EnableIRQ(UART4_IRQn);
   /* setup the USART control blocks */
-  init_usart_ctl(&uc1, &huart1);
+  init_usart_ctl(&uc1, &huart1, uc1_tx_buffer,
+                 uc1_rx_buffer,
+                 TX_USART_BUFF_SIZ,
+                 TX_USART_BUFF_SIZ);
-  init_usart_ctl(&uc2, &huart2);
+  init_usart_ctl(&uc2, &huart2, uc2_tx_buffer,
+                 uc2_rx_buffer,
+                 TX_USART_BUFF_SIZ,
+                 TX_USART_BUFF_SIZ);
-  init_usart_ctl(&uc3, &huart3);
+  init_usart_ctl(&uc3, &huart3, uc3_tx_buffer,
+                 uc3_rx_buffer,
+                 TX_USART_BUFF_SIZ,
+                 TX_USART_BUFF_SIZ);
-  init_usart_ctl(&uc4, &huart4);
+  init_usart_ctl(&uc4, &huart4, uc4_tx_buffer,
+                 uc4_rx_buffer,
+                 TX_USART_BUFF_SIZ,
+                 TX_USART_BUFF_SIZ);
   EnableSerialRxInterrupt(&uc1);
   EnableSerialRxInterrupt(&uc2);
   EnableSerialRxInterrupt(&uc3);
   EnableSerialRxInterrupt(&uc4);
   /// @brief Time when the logged data will be sent
   setRmcCallback(&rmc_callback);
-  // data timeout
-  uint32_t timeout = 0; //
   // 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
-  // PLX decoder protocols
-  char PLXPacket = 0;
-  int PLXPtr = 0;
   for (int i = 0; i < MAXRDG; ++i)
+  {
     Info[i] = nullInfo;
+  }
   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)
           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,
           sendString(&uc3, outbuff, cnt);
+        }
+      }
+    }
-    // determine if we are getting any data from the interface
-    uint16_t cc = SerialCharsReceived(&uc1);
-    int chr;
-    if (cc == 0)
+    // poll data into libPLX
-    {
-      timeout++;
+    libPLXpollData(&uc1);
-      if (btConnected() && (timeout % 1000 == 0))
-      {
-        const char msg[] = "Timeout\r\n";
-        sendString(&uc3, msg, sizeof(msg));
-      }
-      if (timeout > 60000)
+    // determine if we are getting any data from the interface
-      {
-        // do turn off screen
+    dataTimeout++;
+    if (btConnected() && (dataTimeout % 1000 == 0))
-      }
+    {
-      // wait for a bit if nothing came in.
+      const char msg[] = "Timeout\r\n";
-      HAL_Delay(1);
+      sendString(&uc3, msg, sizeof(msg));
+    }
-    /// process the observation list
-    for (chr = 0; chr < cc; chr++)
+    if (dataTimeout > 60000)
+    {
-      char c = GetCharSerial(&uc1);
-      if (c == PLX_Start) // at any time if the start byte appears, reset the pointers
-      {
-        PLXPtr = 0; // reset the pointer
-        PLXPacket = 1;
-        timeout = 0; // Reset the timer
-        continue;
-      }
-      if (c == PLX_Stop)
-      {
-        if (PLXPacket)
-        {
-          // we can now decode the selected parameter
-          int PLXNewItems = PLXPtr / sizeof(PLX_SensorInfo); // total items in last reading batch
-          // process items
-          for (int dataItem = 0; dataItem < PLXNewItems; ++dataItem)
-          {
-            // search to see if the item already has a slot in the Info[] array
-            // match the observation and instance: if found, update entry
-            enum PLX_Observations observation = ConvPLX(Data.Sensor[dataItem].AddrH,
-                                                        Data.Sensor[dataItem].AddrL);
-            char instance = Data.Sensor[dataItem].Instance;
-            int16_t data = ConvPLX(Data.Sensor[dataItem].ReadingH,
-                                   Data.Sensor[dataItem].ReadingL);
-            // validate the current item, discard out of range
-            if ((instance > PLX_MAX_INST) || (observation > PLX_MAX_OBS))
-              continue;
-            // 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
-                    break;
+      // do turn off screen
-                  }
-              }
-              if (k == MAXRDG)
-                continue; // abandon this iteration
-            }
-            // give up if we are going to fall off the end of the array
-            if (currentSlot >= MAXRDG)
-              break;
-            Info[currentSlot].observation.Obs = observation;
-            Info[currentSlot].observation.Instance = instance;
-            Info[currentSlot].data = data;
-            if (data > Info[currentSlot].Max)
-            {
-              Info[currentSlot].Max = data;
-            }
-            if (data < Info[currentSlot].Min)
-            {
-              Info[currentSlot].Min = data;
-            }
-            // take an average
-            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
-          }
-          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;
-        PLXPtr = 0;
-        continue;
-      }
-      if (PLXPacket && PLXPtr < sizeof(Data.Bytes))
-      {
-        Data.Bytes[PLXPtr++] = c;
-      }
+    }
+    // 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)
+    {
-      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
+      // skip invalid items, dont count
-        if (pos < MAXRDG - 1)
+      if (pos < MAXRDG - 1)
-          pos++;
+        pos++;
-        else
+      else
-          pos = 0;
+        pos = 0;
-        if (isValid(pos))
+      if (isValid(pos))
-          delta--; // count a valid item
+        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 = MAXRDG - 1;
-        if (isValid(pos))
-          delta++; // count a valid item
-        // wrap
+      // wrap
-        if (pos == start)
+      if (pos == start)
-          break;
+        break;
-      }
+    }
+    // move in negative direction
+    while (delta < 0)
+    {
-      contexts[i].knobPos = pos;
+      // skip invalid items, dont count
-      if (pos != start)
+      if (pos > 0)
+        pos--;
+      else
+        pos = MAXRDG - 1;
+      if (isValid(pos))
-        contexts[i].dial_timer = DialTimeout;
+        delta++; // count a valid item
+      // wrap
+      if (pos == start)
+        break;
+    }
-    int suppress = -1;
+    contexts[i].knobPos = pos;
-    for (int i = 0; i < MAX_DISPLAYS; ++i)
-    { // now to display the information
+    if (pos != start)
-      suppress = DisplayCurrent(i, suppress);
+      contexts[i].dial_timer = DialTimeout;
+  }
-      cc_check_nvram(i);
+  int suppress = -1;
+  for (int i = 0; i < MAX_DISPLAYS; ++i)
+  { // now to display the information
+    suppress = DisplayCurrent(i, suppress);
-    }
-    /* USER CODE END WHILE */
+    cc_check_nvram(i);
+  }
+  /* USER CODE END WHILE */
   /* USER CODE BEGIN 3 */
   /* USER CODE END 3 */
+}

Subversion Repositories DashDisplay

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