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

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "display.h"
 #include "bmp280driver.h"
+#include "libMisc/fixI2C.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 /* 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)
-{
-  /* 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
-GPIOx_ODR).
-. Check SDA Low level in GPIOx_IDR.
-. Configure the SCL I/O as General Purpose Output Open-Drain, Low level (Write 0 to
-GPIOx_ODR).
-. Check SCL Low level in GPIOx_IDR.
-. Configure the SCL I/O as General Purpose Output Open-Drain, High level (Write 1 to
-GPIOx_ODR).
-. Check SCL High level in GPIOx_IDR.
-. Configure the SDA I/O as General Purpose Output Open-Drain , High level (Write 1 to
-GPIOx_ODR).
-. Check SDA High level in GPIOx_IDR.
-. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
-. Set SWRST bit in I2Cx_CR1 register.
-. Clear SWRST bit in I2Cx_CR1 register.
-. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register.
-**/
-void HAL_I2C_ClearBusyFlagErrata_2_14_7(I2C_HandleTypeDef *hi2c)
-{
-  static uint8_t resetTried = 0;
-  if (resetTried == 1)
-  {
-    return;
-  }
-  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);
-  // 2
-  GPIO_InitStruct.Pin = SDA_PIN | SCL_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_WRITE_ODR(GPIOB, SDA_PIN);
-  HAL_GPIO_WRITE_ODR(GPIOB, SCL_PIN);
-  // 3
-  GPIO_PinState pinState;
-  if (HAL_GPIO_ReadPin(GPIOB, SDA_PIN) == GPIO_PIN_RESET)
-  {
-    for (;;)
-    {
-    }
-  }
-  if (HAL_GPIO_ReadPin(GPIOB, SCL_PIN) == GPIO_PIN_RESET)
-  {
-    for (;;)
-    {
-    }
-  }
-  // 4
-  GPIO_InitStruct.Pin = SDA_PIN;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_TogglePin(GPIOB, SDA_PIN);
-  // 5
-  if (HAL_GPIO_ReadPin(GPIOB, SDA_PIN) == GPIO_PIN_SET)
-  {
-    for (;;)
-    {
-    }
-  }
-  // 6
-  GPIO_InitStruct.Pin = SCL_PIN;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_TogglePin(GPIOB, SCL_PIN);
-  // 7
-  if (HAL_GPIO_ReadPin(GPIOB, SCL_PIN) == GPIO_PIN_SET)
-  {
-    for (;;)
-    {
-    }
-  }
-  // 8
-  GPIO_InitStruct.Pin = SDA_PIN;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_WRITE_ODR(GPIOB, SDA_PIN);
-  // 9
-  if (HAL_GPIO_ReadPin(GPIOB, SDA_PIN) == GPIO_PIN_RESET)
-  {
-    for (;;)
-    {
-    }
-  }
-  // 10
-  GPIO_InitStruct.Pin = SCL_PIN;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_WRITE_ODR(GPIOB, SCL_PIN);
-  // 11
-  if (HAL_GPIO_ReadPin(GPIOB, SCL_PIN) == GPIO_PIN_RESET)
-  {
-    for (;;)
-    {
-    }
-  }
-  // 12
-  GPIO_InitStruct.Pin = SDA_PIN | SCL_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  // 13
-  hi2c->Instance->CR1 |= I2C_CR1_SWRST;
-  // 14
-  hi2c->Instance->CR1 ^= I2C_CR1_SWRST;
-  // 15
-  __HAL_I2C_ENABLE(hi2c);
-  resetTried = 1;
-}
 /* 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 */
   /* USER CODE BEGIN WHILE */
   while (1)
+  {
     cc_display(0);
+    cc_feed_pushbutton(HAL_GPIO_ReadPin(PUSHBUTTON_GPIO_Port, PUSHBUTTON_Pin )==GPIO_PIN_SET);
     if (HAL_GetTick() - lastTick > 200)
+    {
       lastTick = HAL_GetTick();
       /* Reading the raw data from sensor */
       struct bmp280_uncomp_data ucomp_data;
+  }
   /* 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_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_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);
+  /*Configure GPIO pin : PUSHBUTTON_Pin */
+  GPIO_InitStruct.Pin = PUSHBUTTON_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  HAL_GPIO_Init(PUSHBUTTON_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 10 → 11