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

+{
   uint8_t dev_addr;
 } interface_t;
 static int8_t
-user_i2c_write (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data, uint32_t len)
+user_i2c_write (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data,
+                uint32_t len)
+{
-    HAL_StatusTypeDef st = HAL_I2C_Mem_Write(&hi2c2, i2c_addr<<1, reg_addr, 1, reg_data, len, 10000);
+  HAL_StatusTypeDef st = HAL_I2C_Mem_Write (&hi2c2, i2c_addr << 1, reg_addr, 1,
+                                            reg_data, len, 10000);
-  return st != HAL_OK ?  BMP280_E_COMM_FAIL: BMP280_OK;
+  return st != HAL_OK ? BMP280_E_COMM_FAIL : BMP280_OK;
+}
 static int8_t
-user_i2c_read (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data, uint32_t len)
+user_i2c_read (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data,
+               uint32_t len)
+{
-  HAL_StatusTypeDef st = HAL_I2C_Mem_Read(&hi2c2, i2c_addr<<1, reg_addr, 1, reg_data, len, 10000);
+  HAL_StatusTypeDef st = HAL_I2C_Mem_Read (&hi2c2, i2c_addr << 1, reg_addr, 1,
+                                           reg_data, len, 10000);
-  return st != HAL_OK ?  BMP280_E_COMM_FAIL: BMP280_OK;
+  return st != HAL_OK ? BMP280_E_COMM_FAIL : BMP280_OK;
+}
 static void
 user_delay_ms (uint32_t ms, void *handle)
+{
   HAL_Delay (ms);
+}
 struct bmp280_dev bmp =
+  {
   .intf = BMP280_I2C_INTF, .read = user_i2c_read, .write = user_i2c_write,
       .delay_ms = user_delay_ms,
       /* Update interface pointer with the structure that contains both device address and file descriptor */
-     .dev_id =  BMP280_I2C_ADDR_PRIM };
+      .dev_id = BMP280_I2C_ADDR_PRIM };
 int8_t rslt;
 struct bmp280_config conf;
 /* 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_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);
+static void
-static void MX_TIM3_Init(void);
+MX_TIM3_Init (void);
+static void
-static void MX_I2C2_Init(void);
+MX_I2C2_Init (void);
+static void
-static void MX_RTC_Init(void);
+MX_RTC_Init (void);
 /* USER CODE BEGIN PFP */
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
+uint32_t const TICKS_LOOP = 50; // 100mS per loop.
 /* 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_SPI1_Init();
+  MX_SPI1_Init ();
-  MX_TIM4_Init();
+  MX_TIM4_Init ();
-  MX_USART1_UART_Init();
+  MX_USART1_UART_Init ();
-  MX_TIM3_Init();
+  MX_TIM3_Init ();
-  MX_I2C2_Init();
+  MX_I2C2_Init ();
-  MX_RTC_Init();
+  MX_RTC_Init ();
-  MX_USB_DEVICE_Init();
+  MX_USB_DEVICE_Init ();
   /* USER CODE BEGIN 2 */
   HAL_GPIO_WritePin ( USB_PULLUP_GPIO_Port, USB_PULLUP_Pin, GPIO_PIN_RESET);
   HAL_Delay (1000);
   HAL_GPIO_WritePin ( USB_PULLUP_GPIO_Port, USB_PULLUP_Pin, GPIO_PIN_SET);
-  /* setup the USART control blocks */#
+  /* setup the USART control blocks */
+#
 #if defined SERIAL_UART1
   init_usart_ctl (&uc1, huart1.Instance);
   EnableSerialRxInterrupt (&uc1);
 #endif
   /* Initialize the bmp280 */
-  rslt = bmp280_init(&bmp);
+  rslt = bmp280_init (&bmp);
 //  print_rslt(" bmp280_init status", rslt);
   /* Always read the current settings before writing, especially when
    * all the configuration is not modified
    */
-  rslt = bmp280_get_config(&conf, &bmp);
+  rslt = bmp280_get_config (&conf, &bmp);
- // print_rslt(" bmp280_get_config status", rslt);
+  // print_rslt(" bmp280_get_config status", rslt);
   /* configuring the temperature oversampling, filter coefficient and output data rate */
   /* Overwrite the desired settings */
   conf.filter = BMP280_FILTER_COEFF_2;
   /* Pressure over sampling none (disabling pressure measurement) */
   conf.os_pres = BMP280_OS_4X;
   /* Setting the output data rate as 2HZ(500ms) */
   conf.odr = BMP280_ODR_500_MS;
-  rslt = bmp280_set_config(&conf, &bmp);
+  rslt = bmp280_set_config (&conf, &bmp);
   //print_rslt(" bmp280_set_config status", rslt);
   /* Always set the power mode after setting the configuration */
-  rslt = bmp280_set_power_mode(BMP280_NORMAL_MODE, &bmp);
+  rslt = bmp280_set_power_mode (BMP280_NORMAL_MODE, &bmp);
   //print_rslt(" bmp280_set_power_mode status", rslt);
+  cc_init ();
+  uint32_t timeNext = HAL_GetTick () + TICKS_LOOP;
-  cc_init ();
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
+    {
+      uint32_t timeNow = HAL_GetTick ();
+      if (timeNow < timeNext)
+        HAL_Delay (timeNext - timeNow);
+      timeNext += TICKS_LOOP;
       cc_run (&bmp);
+      /* USER CODE END WHILE */
-      HAL_Delay (250);
-    /* 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 };
-  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit =
+    { 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_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE
+      | RCC_OSCILLATORTYPE_LSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
   RCC_OscInitStruct.LSEState = RCC_LSE_ON;
   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_MUL9;
-  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 ();
-  }
+    }
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USB;
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_USB;
   PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
   PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  if (HAL_RCCEx_PeriphCLKConfig (&PeriphClkInit) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
+}
 /**
-  * @brief I2C2 Initialization Function
+ * @brief I2C2 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_I2C2_Init(void)
+MX_I2C2_Init (void)
+{
   /* USER CODE BEGIN I2C2_Init 0 */
   /* USER CODE END I2C2_Init 0 */
   hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
   hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
   hi2c2.Init.OwnAddress2 = 0;
   hi2c2.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
   hi2c2.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
-  if (HAL_I2C_Init(&hi2c2) != HAL_OK)
+  if (HAL_I2C_Init (&hi2c2) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN I2C2_Init 2 */
   /* USER CODE END I2C2_Init 2 */
+}
 /**
-  * @brief RTC Initialization Function
+ * @brief RTC Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_RTC_Init(void)
+MX_RTC_Init (void)
+{
   /* USER CODE BEGIN RTC_Init 0 */
   /* USER CODE END RTC_Init 0 */
-  RTC_TimeTypeDef sTime = {0};
+  RTC_TimeTypeDef sTime =
+    { 0 };
-  RTC_DateTypeDef DateToUpdate = {0};
+  RTC_DateTypeDef DateToUpdate =
+    { 0 };
   /* USER CODE BEGIN RTC_Init 1 */
   /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
-  */
+   */
   hrtc.Instance = RTC;
   hrtc.Init.AsynchPrediv = RTC_AUTO_1_SECOND;
   hrtc.Init.OutPut = RTC_OUTPUTSOURCE_ALARM;
-  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  if (HAL_RTC_Init (&hrtc) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN Check_RTC_BKUP */
   /* USER CODE END Check_RTC_BKUP */
   /** Initialize RTC and set the Time and Date
-  */
+   */
   sTime.Hours = 0x0;
   sTime.Minutes = 0x0;
   sTime.Seconds = 0x0;
-  if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetTime (&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
   DateToUpdate.Month = RTC_MONTH_JANUARY;
   DateToUpdate.Date = 0x1;
   DateToUpdate.Year = 0x0;
-  if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetDate (&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN RTC_Init 2 */
   /* USER CODE END RTC_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 TIM3 Initialization Function
+ * @brief TIM3 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
+static void
-static void MX_TIM3_Init(void)
+MX_TIM3_Init (void)
+{
   /* USER CODE BEGIN TIM3_Init 0 */
   /* USER CODE END TIM3_Init 0 */
-  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig =
+    { 0 };
-  TIM_OC_InitTypeDef sConfigOC = {0};
+  TIM_OC_InitTypeDef sConfigOC =
+    { 0 };
   /* USER CODE BEGIN TIM3_Init 1 */
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
   htim3.Init.Prescaler = 719;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim3.Init.Period = 10000;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_OC_Init(&htim3) != HAL_OK)
+  if (HAL_TIM_OC_Init (&htim3) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
-  if (HAL_TIM_OnePulse_Init(&htim3, TIM_OPMODE_SINGLE) != HAL_OK)
+  if (HAL_TIM_OnePulse_Init (&htim3, TIM_OPMODE_SINGLE) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_ENABLE;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
+  if (HAL_TIMEx_MasterConfigSynchronization (&htim3, &sMasterConfig) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   sConfigOC.OCMode = TIM_OCMODE_TIMING;
   sConfigOC.Pulse = 9999;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
-  if (HAL_TIM_OC_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  if (HAL_TIM_OC_ConfigChannel (&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
-  {
+    {
-    Error_Handler();
+      Error_Handler ();
-  }
+    }
   /* USER CODE BEGIN TIM3_Init 2 */
   /* USER CODE END TIM3_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 = 15;
   sConfig.IC2Polarity = TIM_ICPOLARITY_RISING;
   sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
   sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
   sConfig.IC2Filter = 15;
-  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(GPIOA, SPI_CD_Pin|SPI_RESET_Pin|SPI_NSS1_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin (GPIOA, SPI_CD_Pin | SPI_RESET_Pin | SPI_NSS1_Pin,
+                     GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(USB_PULLUP_GPIO_Port, USB_PULLUP_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin (USB_PULLUP_GPIO_Port, USB_PULLUP_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pins : SPI_CD_Pin SPI_RESET_Pin SPI_NSS1_Pin */
-  GPIO_InitStruct.Pin = SPI_CD_Pin|SPI_RESET_Pin|SPI_NSS1_Pin;
+  GPIO_InitStruct.Pin = SPI_CD_Pin | SPI_RESET_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(GPIOA, &GPIO_InitStruct);
+  HAL_GPIO_Init (GPIOA, &GPIO_InitStruct);
   /*Configure GPIO pin : USB_PULLUP_Pin */
   GPIO_InitStruct.Pin = USB_PULLUP_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(USB_PULLUP_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init (USB_PULLUP_GPIO_Port, &GPIO_InitStruct);
   /*Configure GPIO pin : encoder_push_Pin */
   GPIO_InitStruct.Pin = encoder_push_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(encoder_push_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init (encoder_push_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 23 → 24