WebSVN – dashGPS – Diff – /trunk/Core/Src/main.c

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "libSerial/serial.h"
 #include "libSSD1306/SSD1306.h"
 #include "nmea.h"
+#include "display.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 /* USER CODE BEGIN PV */
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
+void
-void SystemClock_Config(void);
+SystemClock_Config (void);
+static void
-static void MX_GPIO_Init(void);
+MX_GPIO_Init (void);
+static void
-static void MX_CAN_Init(void);
+MX_CAN_Init (void);
+static void
-static void MX_SPI1_Init(void);
+MX_SPI1_Init (void);
+static void
-static void MX_TIM4_Init(void);
+MX_TIM4_Init (void);
+static void
-static void MX_USART1_UART_Init(void);
+MX_USART1_UART_Init (void);
 /* USER CODE BEGIN PFP */
 /* 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
-int main(void)
+main (void)
+{
   /* USER CODE BEGIN 1 */
   /* USER CODE END 1 */
   /* MCU Configuration--------------------------------------------------------*/
   /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
+  HAL_Init ();
   /* USER CODE BEGIN Init */
   /* USER CODE END Init */
   /* Configure the system clock */
-  SystemClock_Config();
+  SystemClock_Config ();
   /* USER CODE BEGIN SysInit */
   /* USER CODE END SysInit */
   /* Initialize all configured peripherals */
-  MX_GPIO_Init();
+  MX_GPIO_Init ();
-  MX_CAN_Init();
+  MX_CAN_Init ();
-  MX_SPI1_Init();
+  MX_SPI1_Init ();
-  MX_TIM4_Init();
+  MX_TIM4_Init ();
-  MX_USART1_UART_Init();
+  MX_USART1_UART_Init ();
   /* USER CODE BEGIN 2 */
   __HAL_RCC_USART1_CLK_ENABLE();
   /* setup the USART control blocks */
-  init_usart_ctl(&uc1, huart1.Instance);
+  init_usart_ctl (&uc1, huart1.Instance);
   EnableSerialRxInterrupt (&uc1);
-  ssd1306_begin(0,0);
-  clearDisplay();
-  drawLine(0,0,127,64,1);
-  display();
+  cc_init ();
-  HAL_Delay(1000);
+  HAL_Delay (1000);
-  int cnt = 0;
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
+    {
-         if(cnt==0)
-           clearDisplay();
-         drawLine(0,cnt,127,cnt,1);
-         display();
-         cnt++;
-         cnt%=64;
-         Location loc;
+      cc_run ();
-         uint8_t stat = updateLocation(&loc);
-          HAL_Delay(10);
+      Location loc;
+      uint8_t stat = updateLocation (&loc);
+      HAL_Delay (10);
+      /* USER CODE END WHILE */
-    /* USER CODE END WHILE */
-    /* USER CODE BEGIN 3 */
+      /* USER CODE BEGIN 3 */
+    }
   /* USER CODE END 3 */
+}
 /**
-  * @brief System Clock Configuration
+ * @brief System Clock Configuration
-  * @retval None
+ * @retval None
-  */
+ */
+void
-void SystemClock_Config(void)
+SystemClock_Config (void)
+{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_OscInitTypeDef RCC_OscInitStruct =
+    { 0 };
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct =
+    { 0 };
   /** 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.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL8;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  if (HAL_RCC_OscConfig (&RCC_OscInitStruct) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /** Initializes the CPU, AHB and APB buses clocks
-  */
+   */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+      | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  if (HAL_RCC_ClockConfig (&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
+}
 /**
-  * @brief CAN Initialization Function
+ * @brief CAN Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_CAN_Init(void)
+MX_CAN_Init (void)
+{
   /* USER CODE BEGIN CAN_Init 0 */
   /* USER CODE END CAN_Init 0 */
   hcan.Init.AutoBusOff = DISABLE;
   hcan.Init.AutoWakeUp = DISABLE;
   hcan.Init.AutoRetransmission = DISABLE;
   hcan.Init.ReceiveFifoLocked = DISABLE;
   hcan.Init.TransmitFifoPriority = DISABLE;
-  if (HAL_CAN_Init(&hcan) != HAL_OK)
+  if (HAL_CAN_Init (&hcan) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN CAN_Init 2 */
   /* USER CODE END CAN_Init 2 */
+}
 /**
-  * @brief SPI1 Initialization Function
+ * @brief SPI1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_SPI1_Init(void)
+MX_SPI1_Init (void)
+{
   /* USER CODE BEGIN SPI1_Init 0 */
   /* USER CODE END SPI1_Init 0 */
   hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
   hspi1.Init.CRCPolynomial = 10;
-  if (HAL_SPI_Init(&hspi1) != HAL_OK)
+  if (HAL_SPI_Init (&hspi1) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN SPI1_Init 2 */
   /* USER CODE END SPI1_Init 2 */
+}
 /**
-  * @brief TIM4 Initialization Function
+ * @brief TIM4 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_TIM4_Init(void)
+MX_TIM4_Init (void)
+{
   /* USER CODE BEGIN TIM4_Init 0 */
   /* USER CODE END TIM4_Init 0 */
-  TIM_Encoder_InitTypeDef sConfig = {0};
+  TIM_Encoder_InitTypeDef sConfig =
+    { 0 };
-  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig =
+    { 0 };
   /* USER CODE BEGIN TIM4_Init 1 */
   /* USER CODE END TIM4_Init 1 */
   htim4.Instance = TIM4;
   sConfig.IC1Filter = 8;
   sConfig.IC2Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
   sConfig.IC2Filter = 8;
-  if (HAL_TIM_Encoder_Init(&htim4, &sConfig) != HAL_OK)
+  if (HAL_TIM_Encoder_Init (&htim4, &sConfig) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig) != HAL_OK)
+  if (HAL_TIMEx_MasterConfigSynchronization (&htim4, &sMasterConfig) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN TIM4_Init 2 */
   /* USER CODE END TIM4_Init 2 */
+}
 /**
-  * @brief USART1 Initialization Function
+ * @brief USART1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_USART1_UART_Init(void)
+MX_USART1_UART_Init (void)
+{
   /* USER CODE BEGIN USART1_Init 0 */
   /* USER CODE END USART1_Init 0 */
   huart1.Init.StopBits = UART_STOPBITS_1;
   huart1.Init.Parity = UART_PARITY_NONE;
   huart1.Init.Mode = UART_MODE_TX_RX;
   huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
   huart1.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init(&huart1) != HAL_OK)
+  if (HAL_UART_Init (&huart1) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN USART1_Init 2 */
   /* USER CODE END USART1_Init 2 */
+}
 /**
-  * @brief GPIO Initialization Function
+ * @brief GPIO Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_GPIO_Init(void)
+MX_GPIO_Init (void)
+{
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitTypeDef GPIO_InitStruct =
+    { 0 };
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOD_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOC, SPI_CD_Pin|SPI_RESET_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin (GPIOC, SPI_CD_Pin | SPI_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin (SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pins : SPI_CD_Pin SPI_RESET_Pin */
-  GPIO_InitStruct.Pin = SPI_CD_Pin|SPI_RESET_Pin;
+  GPIO_InitStruct.Pin = SPI_CD_Pin | SPI_RESET_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);
+  HAL_GPIO_Init (GPIOC, &GPIO_InitStruct);
   /*Configure GPIO pin : SPI_NSS1_Pin */
   GPIO_InitStruct.Pin = SPI_NSS1_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(SPI_NSS1_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init (SPI_NSS1_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
-void Error_Handler(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 */

Subversion Repositories dashGPS

(root)/trunk/Core/Src/main.c – Rev 5 → 6