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

 /* 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.
   * @retval int
   /* Configure the system clock */
   SystemClock_Config();
   /* USER CODE BEGIN SysInit */
+  /* Peripheral clock enable */
   /* USER CODE END SysInit */
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_SPI1_Init();
   MX_I2C1_Init();
   /* USER CODE BEGIN 2 */
   cc_init();
+  HAL_I2C_ClearBusyFlagErrata_2_14_7(&hi2c1);
+  MX_I2C1_Init();
   init_bmp(&hi2c1);
   uint32_t lastTick = HAL_GetTick();
   /* USER CODE END 2 */
   /* Infinite loop */
   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_MUL9;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL4;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
     Error_Handler();
+  }
   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_1) != HAL_OK)
+  {
     Error_Handler();
+  }
+}

Subversion Repositories testOled

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