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

 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
-SPI_HandleTypeDef hspi1;
+ SPI_HandleTypeDef hspi1;
 TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim3;
 TIM_HandleTypeDef htim9;
   if (contexts[dial].knobPos < 0)
     return -1;
   return cc_display(dial, suppress);
+}
-void sendString(usart_ctl *ctl, char *string, int length)
-{
-  int i;
-  for (i = 0; i < length; i++)
-    PutCharSerial(ctl, string[i]);
-}
 /// \note this code doesnt work so it leaves speed as 9600.
 /// \brief Setup Bluetooth module
 void initModule(usart_ctl *ctl, uint32_t baudRate)
+{
   char initBuf[30];
 uint8_t rmc_buff[80];
 uint16_t rmc_length;
 uint8_t rmc_callback(uint8_t *data, uint16_t length)
+{
-  rmc_length = length;
+  rmc_length = length<sizeof(rmc_buff)?length : sizeof(rmc_buff);
   memcpy(rmc_buff, data, length);
+  return 0;
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 /* USER CODE END 0 */
 /**
- * @brief  The application entry point.
+  * @brief  The application entry point.
- * @retval int
+  * @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
-  __HAL_RCC_UART4_CLK_ENABLE(); // NMEA0183 port
+  __HAL_RCC_UART4_CLK_ENABLE();  // NMEA0183 port
   __HAL_RCC_TIM3_CLK_ENABLE();
   __HAL_RCC_TIM9_CLK_ENABLE();
     while (1)
+    {
       // poll GPS Position/time on UART4
-      bool stat = updateLocation(&loc, &uc4);
+      (void) updateLocation(&loc, &uc4);
       if (loc.good)
+      {
         loc.good = false;
+      }
               if (Info[i].data < Info[i].Min)
+              {
                 Info[i].Min = Info[i].data;
+              }
-              // Send item to BT
+              // Send items  to BT if it is in connected state
-              if (rmc_length)
+              if (HAL_GPIO_ReadPin(BT_STATE_GPIO_Port, BT_STATE_Pin) == GPIO_PIN_SET)
+              {
+                if (rmc_length)
+                {
-                sendString(&uc3, rmc_buff, rmc_length);
+                  sendString(&uc3, rmc_buff, rmc_length);
-                rmc_length = 0;
+                  rmc_length = 0;
-              }
+                }
-              if (log)
+                if (log)
-              {
+                {
-                char outbuff[100];
+                  char outbuff[100];
-                int cnt = small_sprintf(outbuff,
+                  int cnt = small_sprintf(outbuff,
-                                        "$PLLOG,%d,%d,%d",
+                                          "$PLLOG,%d,%d,%d",
-                                        Info[i].observation,
+                                          Info[i].observation,
-                                        Info[i].instance,
+                                          Info[i].instance,
-                                        Info[i].data);
+                                          Info[i].data);
-                // NMEA style checksum
+                  // NMEA style checksum
-                int ck;
+                  int ck;
-                int sum = 0;
+                  int sum = 0;
-                for (ck = 1; ck < cnt; ck++)
+                  for (ck = 1; ck < cnt; ck++)
-                  sum += outbuff[ck];
+                    sum += outbuff[ck];
-                cnt += small_sprintf(outbuff + cnt, "*%02X\n",
+                  cnt += small_sprintf(outbuff + cnt, "*%02X\n",
-                                     sum & 0xFF);
+                                       sum & 0xFF);
-                sendString(&uc3, outbuff, cnt);
+                  sendString(&uc3, outbuff, cnt);
+                }
+              }
+            }
             // now to display the information
             int suppress = DisplayCurrent(0, -1);
+  }
   /* USER CODE END 3 */
+}
 /**
- * @brief System Clock Configuration
+  * @brief System Clock Configuration
- * @retval None
+  * @retval None
- */
+  */
 void SystemClock_Config(void)
+{
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
   /** Configure the main internal regulator output voltage
-   */
+  */
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
   /** Initializes the RCC Oscillators according to the specified parameters
-   * in the RCC_OscInitTypeDef structure.
+  * in the RCC_OscInitTypeDef structure.
-   */
+  */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL12;
   RCC_OscInitStruct.PLL.PLLDIV = RCC_PLL_DIV3;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Initializes the CPU, AHB and APB buses clocks
-   */
+  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
     Error_Handler();
+  }
+}
 /**
- * @brief SPI1 Initialization Function
+  * @brief SPI1 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_SPI1_Init(void)
+{
   /* USER CODE BEGIN SPI1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN SPI1_Init 2 */
   /* USER CODE END SPI1_Init 2 */
+}
 /**
- * @brief TIM2 Initialization Function
+  * @brief TIM2 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_TIM2_Init(void)
+{
   /* USER CODE BEGIN TIM2_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM2_Init 2 */
   /* USER CODE END TIM2_Init 2 */
+}
 /**
- * @brief TIM3 Initialization Function
+  * @brief TIM3 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_TIM3_Init(void)
+{
   /* USER CODE BEGIN TIM3_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM3_Init 2 */
   /* USER CODE END TIM3_Init 2 */
+}
 /**
- * @brief TIM9 Initialization Function
+  * @brief TIM9 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_TIM9_Init(void)
+{
   /* USER CODE BEGIN TIM9_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM9_Init 2 */
   /* USER CODE END TIM9_Init 2 */
+}
 /**
- * @brief UART4 Initialization Function
+  * @brief UART4 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_UART4_Init(void)
+{
   /* USER CODE BEGIN UART4_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN UART4_Init 2 */
   /* USER CODE END UART4_Init 2 */
+}
 /**
- * @brief USART1 Initialization Function
+  * @brief USART1 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_USART1_UART_Init(void)
+{
   /* USER CODE BEGIN USART1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN USART1_Init 2 */
   /* USER CODE END USART1_Init 2 */
+}
 /**
- * @brief USART2 Initialization Function
+  * @brief USART2 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_USART2_UART_Init(void)
+{
   /* USER CODE BEGIN USART2_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN USART2_Init 2 */
   /* USER CODE END USART2_Init 2 */
+}
 /**
- * @brief USART3 Initialization Function
+  * @brief USART3 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_USART3_UART_Init(void)
+{
   /* USER CODE BEGIN USART3_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN USART3_Init 2 */
   /* USER CODE END USART3_Init 2 */
+}
 /**
- * @brief GPIO Initialization Function
+  * @brief GPIO Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_GPIO_Init(void)
+{
   GPIO_InitTypeDef GPIO_InitStruct = {0};
   /* GPIO Ports Clock Enable */
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(SPI_NSS1_GPIO_Port, SPI_NSS1_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(GPIOA, SPI_CD_Pin|BT_BUTTON_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);
+  HAL_GPIO_WritePin(GPIOC, SPI_RESET_Pin|POWER_LATCH_Pin|USB_PWR_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(SPI_NSS2_GPIO_Port, SPI_NSS2_Pin, GPIO_PIN_SET);
   /*Configure GPIO pins : SPI_NSS1_Pin SPI_CD_Pin */
-  GPIO_InitStruct.Pin = SPI_NSS1_Pin | SPI_CD_Pin;
+  GPIO_InitStruct.Pin = SPI_NSS1_Pin|SPI_CD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*Configure GPIO pins : SPI_RESET_Pin SPI_NSS2_Pin POWER_LATCH_Pin USB_PWR_Pin */
-  GPIO_InitStruct.Pin = SPI_RESET_Pin | SPI_NSS2_Pin | POWER_LATCH_Pin | USB_PWR_Pin;
+  GPIO_InitStruct.Pin = SPI_RESET_Pin|SPI_NSS2_Pin|POWER_LATCH_Pin|USB_PWR_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  /*Configure GPIO pins : SW1_PUSH_Pin SW2_PUSH_Pin */
+  /*Configure GPIO pins : BT_STATE_Pin SW1_PUSH_Pin SW2_PUSH_Pin */
-  GPIO_InitStruct.Pin = SW1_PUSH_Pin | SW2_PUSH_Pin;
+  GPIO_InitStruct.Pin = BT_STATE_Pin|SW1_PUSH_Pin|SW2_PUSH_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pin : IGNITION_Pin */
   GPIO_InitStruct.Pin = BT_BUTTON_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);
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */
 /**
- * @brief  This function is executed in case of error occurrence.
+  * @brief  This function is executed in case of error occurrence.
- * @retval None
+  * @retval None
- */
+  */
 void Error_Handler(void)
+{
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
   /* USER CODE END Error_Handler_Debug */
+}
-#ifdef USE_FULL_ASSERT
+#ifdef  USE_FULL_ASSERT
 /**
- * @brief  Reports the name of the source file and the source line number
+  * @brief  Reports the name of the source file and the source line number
- *         where the assert_param error has occurred.
+  *         where the assert_param error has occurred.
- * @param  file: pointer to the source file name
+  * @param  file: pointer to the source file name
- * @param  line: assert_param error line source number
+  * @param  line: assert_param error line source number
- * @retval None
+  * @retval None
- */
+  */
 void assert_failed(uint8_t *file, uint32_t line)
+{
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
      tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
   /* USER CODE END 6 */
+}
 #endif /* USE_FULL_ASSERT */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Subversion Repositories DashDisplay

(root)/branches/Dashboard_L152_v2/Src/main.c – Rev 60 → 61