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

 ///@brief  timeout when the ignition is switched off
 #define IGNITION_OFF_TIMEOUT 30000UL
 /// @brief 1000mS per logger period, print average per period
-#define LOGGER_INTERVAL 1000UL
+#define LOGGER_INTERVAL 500UL
 /// @brief  about 10 seconds after twiddle, save the dial position.
 const int DialTimeout = 100;
 /// @brief Data storage for readings
 /// \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];
+  char initBuf[60];
   // switch to command mode
+  HAL_GPIO_WritePin(BT_RESET_GPIO_Port, BT_RESET_Pin, GPIO_PIN_SET);
+  HAL_Delay(500);
+  // clear the button press
   HAL_GPIO_WritePin(BT_RESET_GPIO_Port, BT_RESET_Pin, GPIO_PIN_RESET);
   HAL_Delay(500);
   setBaud(ctl, 38400);
-  int initLen = small_sprintf(initBuf, "AT+UART=%lu,0,0\n", baudRate);
+  int initLen = small_sprintf(initBuf, "AT\nAT+UART?\nAT+UART=%ld,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);
-  // clear the button press
-  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);
+}
   cc_init();
   int i;
   for (i = 0; i < 2; i++)
+  {
-    contexts[i].knobPos = -1;   // set the knob position
+    contexts[i].knobPos = -1; // set the knob position
+  }
   /* 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);
   setRmcCallback(&rmc_callback);
   // data timeout
   uint32_t timeout = 0; //
+  // used in NMEA style logging
-  uint32_t nextTick = 0;
+  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++)
+  {
     Info[i] = nullInfo;
+  }
   int PLXPtr = 0;
-  int logCount = 0;
-  uint32_t resetCounter = 0 ; // record time at which both reset buttons were first pressed.
+  uint32_t resetCounter = 0; // record time at which both reset buttons were first pressed.
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
       // 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;      // send out associated data over Bluetooth because triggered by recieving RMC
-        logCount = 0; // first sample set this second numbered 0
+        log = 1;
+      }
       // Timeout for data logging regularly
       if (HAL_GetTick() > nextTick)
+      {
+        offsetTicks += LOGGER_INTERVAL;
         nextTick = HAL_GetTick() + LOGGER_INTERVAL;
-        logCount++;
-        if (logCount > (1000 / LOGGER_INTERVAL))
-          logCount = 0;
+        if (offsetTicks < (1000))
-        log = 1;
+          log = 1;
+      }
       if (log)
+      {
         log = 0;
         // Send items  to BT if it is in connected state
+        char linebuff[20];
+        strftime(linebuff, sizeof(linebuff), "%H%M%S", &loc.tv);
         for (int i = 0; i < MAXRDG; ++i)
+        {
           if (!isValid(i))
             continue;
           char outbuff[100];
           int cnt = small_sprintf(outbuff,
-                                  "$PLLOG,%d,%d,%d,%ld",
+                                  "$PLLOG,%s.%03lu,%d,%d,%ld",
-                                  logCount,
+                                  linebuff,
+                                  offsetTicks,
                                   Info[i].observation,
                                   Info[i].instance,
                                   Info[i].count == 0 ? 0 : Info[i].sum / Info[i].count);
           // NMEA style checksum
     // handle switch rotation
     for (i = 0; i < MAX_DIALS; ++i)
+    {
       int delta = get_dial_diff(i);
       int pos = contexts[i].knobPos;
-      if(pos < 0)
+      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
-        if(pos<MAXRDG-1)
+        if (pos < MAXRDG - 1)
           pos++;
         else
-          pos=0;
+          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)
+        if (pos > 0)
           pos--;
         else
-          pos=MAXRDG-1;
+          pos = MAXRDG - 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;
+    }
     { // now to display the information
       suppress = DisplayCurrent(i, suppress);
       cc_check_nvram(i);
+    }
+    /* USER CODE END WHILE */
+  }
-}
-/* USER CODE END WHILE */
+  /* USER CODE BEGIN 3 */
-/* USER CODE BEGIN 3 */
+  /* USER CODE END 3 */
+}
-/* USER CODE END 3 */
 /**
  * @brief System Clock Configuration
  * @retval None
  */
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, SPI_NSS1_Pin | BT_RESET_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOA, SPI_NSS1_Pin | BT_BUTTON_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);
+  HAL_GPIO_WritePin(SPI_CD_GPIO_Port, SPI_CD_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOC, SPI_RESET_Pin | POWER_LATCH_Pin | USB_PWR_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 pins : BT_BUTTON_Pin BT_RESET_Pin */
+  /*Configure GPIO pin : BT_BUTTON_Pin */
-  GPIO_InitStruct.Pin = BT_BUTTON_Pin | BT_RESET_Pin;
+  GPIO_InitStruct.Pin = BT_BUTTON_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(BT_BUTTON_GPIO_Port, &GPIO_InitStruct);
+  /*Configure GPIO pin : BT_RESET_Pin */
+  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(GPIOA, &GPIO_InitStruct);
+  HAL_GPIO_Init(BT_RESET_GPIO_Port, &GPIO_InitStruct);
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */

Subversion Repositories DashDisplay

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