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

 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
- I2C_HandleTypeDef hi2c1;
+I2C_HandleTypeDef hi2c1;
 SPI_HandleTypeDef hspi1;
 /* USER CODE BEGIN PV */
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
-void HAL_GPIO_WRITE_ODR(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
+void HAL_GPIO_WRITE_ODR(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin)
+{
   /* Check the parameters */
   assert_param(IS_GPIO_PIN(GPIO_Pin));
   GPIOx->ODR |= GPIO_Pin;
+}
 /** Errata code from Stack Overflow
 . Disable the I2C peripheral by clearing the PE bit in I2Cx_CR1 register.
 . Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level
 (Write 1 to GPIOx_ODR).
 . Check SCL and SDA High level in GPIOx_IDR.
 . Configure the SDA I/O as General Purpose Output Open-Drain, Low level (Write 0 to
   static uint8_t resetTried = 0;
   if (resetTried == 1)
+  {
     return;
+  }
-  uint32_t const SDA_PIN =  GPIO_PIN_7;
+  uint32_t const SDA_PIN = GPIO_PIN_7;
   uint32_t const SCL_PIN = GPIO_PIN_6;
   GPIO_InitTypeDef GPIO_InitStruct;
   // 1
   __HAL_I2C_DISABLE(hi2c);
+  }
   // 12
   GPIO_InitStruct.Pin = SDA_PIN | SCL_PIN;
   GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull =   GPIO_PULLUP;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   // 13
   hi2c->Instance->CR1 |= I2C_CR1_SWRST;
+}
 /* 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 */
   /* USER CODE END 1 */
       if (rslt == 0)
+      {
         uint8_t rslt2 = bmp280_get_comp_pres_32bit(&comp_pres, ucomp_data.uncomp_press, &bmp);
         uint8_t rslt3 = bmp280_get_comp_temp_32bit(&comp_temp, ucomp_data.uncomp_temp, &bmp);
+        cc_feed(comp_pres, comp_temp);
+      }
+    }
     /* USER CODE END WHILE */
     /* USER CODE BEGIN 3 */
+  }
   /* 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};
   /** 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;
+  {
     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;
     Error_Handler();
+  }
+}
 /**
-  * @brief I2C1 Initialization Function
+ * @brief I2C1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_I2C1_Init(void)
+{
   /* USER CODE BEGIN I2C1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN I2C1_Init 2 */
   /* USER CODE END I2C1_Init 2 */
+}
 /**
-  * @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 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 */
   __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_NSS1_Pin|SPI_RESET_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOA, SPI_NSS1_Pin | SPI_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(SPI_CD_GPIO_Port, SPI_CD_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pins : SPI_NSS1_Pin SPI_RESET_Pin */
-  GPIO_InitStruct.Pin = SPI_NSS1_Pin|SPI_RESET_Pin;
+  GPIO_InitStruct.Pin = SPI_NSS1_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(GPIOA, &GPIO_InitStruct);
   GPIO_InitStruct.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(SPI_CD_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 */
   __disable_irq();
+  {
+  }
   /* 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,
      ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */

Subversion Repositories testOled

(root)/trunk/Core/Src/main.c – Rev 9 → 10