Update main.c
This commit is contained in:
@@ -89,8 +89,7 @@ static void MX_QUADSPI_Init(void);
|
|||||||
* @brief The application entry point.
|
* @brief The application entry point.
|
||||||
* @retval int
|
* @retval int
|
||||||
*/
|
*/
|
||||||
int main(void)
|
int main(void) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN 1 */
|
/* USER CODE BEGIN 1 */
|
||||||
|
|
||||||
/* USER CODE END 1 */
|
/* USER CODE END 1 */
|
||||||
@@ -149,11 +148,12 @@ int main(void)
|
|||||||
|
|
||||||
// Initialize the UDP broadcast service
|
// Initialize the UDP broadcast service
|
||||||
|
|
||||||
if (udp_broadcast_init(10,255) != ERR_OK){
|
if (udp_broadcast_init(10, 255) != ERR_OK) {
|
||||||
LOG_WARN(TAG,"error initializing udp connection, check warnings from udp_broadcast_init() or udp_broadcast_connection_init()");
|
LOG_WARN(TAG,
|
||||||
|
"error initializing udp connection, check warnings from udp_broadcast_init() or udp_broadcast_connection_init()");
|
||||||
}
|
}
|
||||||
if (udp_broadcast_set_owner_details("Joran", "Van Nieuwenhoven") != ERR_OK){
|
if (udp_broadcast_set_owner_details("Joran", "Van Nieuwenhoven") != ERR_OK) {
|
||||||
LOG_WARN(TAG,"error setting owner's details");
|
LOG_WARN(TAG, "error setting owner's details");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize website backend */
|
/* Initialize website backend */
|
||||||
@@ -163,8 +163,7 @@ int main(void)
|
|||||||
|
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
/* USER CODE BEGIN WHILE */
|
/* USER CODE BEGIN WHILE */
|
||||||
while (1)
|
while (1) {
|
||||||
{
|
|
||||||
/* USER CODE END WHILE */
|
/* USER CODE END WHILE */
|
||||||
|
|
||||||
/* USER CODE BEGIN 3 */
|
/* USER CODE BEGIN 3 */
|
||||||
@@ -178,8 +177,7 @@ int main(void)
|
|||||||
* @brief System Clock Configuration
|
* @brief System Clock Configuration
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
void SystemClock_Config(void)
|
void SystemClock_Config(void) {
|
||||||
{
|
|
||||||
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
|
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
|
||||||
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
|
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
|
||||||
|
|
||||||
@@ -203,29 +201,25 @@ void SystemClock_Config(void)
|
|||||||
RCC_OscInitStruct.PLL.PLLN = 400;
|
RCC_OscInitStruct.PLL.PLLN = 400;
|
||||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
||||||
RCC_OscInitStruct.PLL.PLLQ = 2;
|
RCC_OscInitStruct.PLL.PLLQ = 2;
|
||||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
|
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Activate the Over-Drive mode
|
/** Activate the Over-Drive mode
|
||||||
*/
|
*/
|
||||||
if (HAL_PWREx_EnableOverDrive() != HAL_OK)
|
if (HAL_PWREx_EnableOverDrive() != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Initializes the CPU, AHB and APB buses clocks
|
/** 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.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
|
||||||
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
||||||
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
|
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
|
||||||
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
|
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
|
||||||
|
|
||||||
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_6) != HAL_OK)
|
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_6) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -235,8 +229,7 @@ void SystemClock_Config(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_DMA2D_Init(void)
|
static void MX_DMA2D_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN DMA2D_Init 0 */
|
/* USER CODE BEGIN DMA2D_Init 0 */
|
||||||
|
|
||||||
@@ -253,12 +246,10 @@ static void MX_DMA2D_Init(void)
|
|||||||
hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_ARGB8888;
|
hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_ARGB8888;
|
||||||
hdma2d.LayerCfg[1].AlphaMode = DMA2D_NO_MODIF_ALPHA;
|
hdma2d.LayerCfg[1].AlphaMode = DMA2D_NO_MODIF_ALPHA;
|
||||||
hdma2d.LayerCfg[1].InputAlpha = 0;
|
hdma2d.LayerCfg[1].InputAlpha = 0;
|
||||||
if (HAL_DMA2D_Init(&hdma2d) != HAL_OK)
|
if (HAL_DMA2D_Init(&hdma2d) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
if (HAL_DMA2D_ConfigLayer(&hdma2d, 1) != HAL_OK)
|
if (HAL_DMA2D_ConfigLayer(&hdma2d, 1) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN DMA2D_Init 2 */
|
/* USER CODE BEGIN DMA2D_Init 2 */
|
||||||
@@ -272,8 +263,7 @@ static void MX_DMA2D_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_LTDC_Init(void)
|
static void MX_LTDC_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN LTDC_Init 0 */
|
/* USER CODE BEGIN LTDC_Init 0 */
|
||||||
|
|
||||||
@@ -301,8 +291,7 @@ static void MX_LTDC_Init(void)
|
|||||||
hltdc.Init.Backcolor.Blue = 0;
|
hltdc.Init.Backcolor.Blue = 0;
|
||||||
hltdc.Init.Backcolor.Green = 255;
|
hltdc.Init.Backcolor.Green = 255;
|
||||||
hltdc.Init.Backcolor.Red = 0;
|
hltdc.Init.Backcolor.Red = 0;
|
||||||
if (HAL_LTDC_Init(&hltdc) != HAL_OK)
|
if (HAL_LTDC_Init(&hltdc) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
pLayerCfg.WindowX0 = 0;
|
pLayerCfg.WindowX0 = 0;
|
||||||
@@ -320,8 +309,7 @@ static void MX_LTDC_Init(void)
|
|||||||
pLayerCfg.Backcolor.Blue = 0;
|
pLayerCfg.Backcolor.Blue = 0;
|
||||||
pLayerCfg.Backcolor.Green = 0;
|
pLayerCfg.Backcolor.Green = 0;
|
||||||
pLayerCfg.Backcolor.Red = 0;
|
pLayerCfg.Backcolor.Red = 0;
|
||||||
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg, 0) != HAL_OK)
|
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg, 0) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
pLayerCfg1.WindowX0 = 0;
|
pLayerCfg1.WindowX0 = 0;
|
||||||
@@ -339,8 +327,7 @@ static void MX_LTDC_Init(void)
|
|||||||
pLayerCfg1.Backcolor.Blue = 0;
|
pLayerCfg1.Backcolor.Blue = 0;
|
||||||
pLayerCfg1.Backcolor.Green = 0;
|
pLayerCfg1.Backcolor.Green = 0;
|
||||||
pLayerCfg1.Backcolor.Red = 0;
|
pLayerCfg1.Backcolor.Red = 0;
|
||||||
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg1, 1) != HAL_OK)
|
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg1, 1) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN LTDC_Init 2 */
|
/* USER CODE BEGIN LTDC_Init 2 */
|
||||||
@@ -354,8 +341,7 @@ static void MX_LTDC_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_QUADSPI_Init(void)
|
static void MX_QUADSPI_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN QUADSPI_Init 0 */
|
/* USER CODE BEGIN QUADSPI_Init 0 */
|
||||||
|
|
||||||
@@ -374,8 +360,7 @@ static void MX_QUADSPI_Init(void)
|
|||||||
hqspi.Init.ClockMode = QSPI_CLOCK_MODE_0;
|
hqspi.Init.ClockMode = QSPI_CLOCK_MODE_0;
|
||||||
hqspi.Init.FlashID = QSPI_FLASH_ID_1;
|
hqspi.Init.FlashID = QSPI_FLASH_ID_1;
|
||||||
hqspi.Init.DualFlash = QSPI_DUALFLASH_DISABLE;
|
hqspi.Init.DualFlash = QSPI_DUALFLASH_DISABLE;
|
||||||
if (HAL_QSPI_Init(&hqspi) != HAL_OK)
|
if (HAL_QSPI_Init(&hqspi) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN QUADSPI_Init 2 */
|
/* USER CODE BEGIN QUADSPI_Init 2 */
|
||||||
@@ -389,8 +374,7 @@ static void MX_QUADSPI_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_USART1_UART_Init(void)
|
static void MX_USART1_UART_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN USART1_Init 0 */
|
/* USER CODE BEGIN USART1_Init 0 */
|
||||||
|
|
||||||
@@ -409,8 +393,7 @@ static void MX_USART1_UART_Init(void)
|
|||||||
huart1.Init.OverSampling = UART_OVERSAMPLING_16;
|
huart1.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||||
huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
|
huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
|
||||||
huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
|
huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
|
||||||
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 BEGIN USART1_Init 2 */
|
||||||
@@ -420,8 +403,7 @@ static void MX_USART1_UART_Init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* FMC initialization function */
|
/* FMC initialization function */
|
||||||
static void MX_FMC_Init(void)
|
static void MX_FMC_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN FMC_Init 0 */
|
/* USER CODE BEGIN FMC_Init 0 */
|
||||||
|
|
||||||
@@ -456,9 +438,8 @@ static void MX_FMC_Init(void)
|
|||||||
SdramTiming.RPDelay = 16;
|
SdramTiming.RPDelay = 16;
|
||||||
SdramTiming.RCDDelay = 16;
|
SdramTiming.RCDDelay = 16;
|
||||||
|
|
||||||
if (HAL_SDRAM_Init(&hsdram1, &SdramTiming) != HAL_OK)
|
if (HAL_SDRAM_Init(&hsdram1, &SdramTiming) != HAL_OK) {
|
||||||
{
|
Error_Handler();
|
||||||
Error_Handler( );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN FMC_Init 2 */
|
/* USER CODE BEGIN FMC_Init 2 */
|
||||||
@@ -471,11 +452,10 @@ static void MX_FMC_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_GPIO_Init(void)
|
static void MX_GPIO_Init(void) {
|
||||||
{
|
|
||||||
GPIO_InitTypeDef GPIO_InitStruct = {0};
|
GPIO_InitTypeDef GPIO_InitStruct = {0};
|
||||||
/* USER CODE BEGIN MX_GPIO_Init_1 */
|
/* USER CODE BEGIN MX_GPIO_Init_1 */
|
||||||
/* USER CODE END MX_GPIO_Init_1 */
|
/* USER CODE END MX_GPIO_Init_1 */
|
||||||
|
|
||||||
/* GPIO Ports Clock Enable */
|
/* GPIO Ports Clock Enable */
|
||||||
__HAL_RCC_GPIOE_CLK_ENABLE();
|
__HAL_RCC_GPIOE_CLK_ENABLE();
|
||||||
@@ -494,7 +474,7 @@ static void MX_GPIO_Init(void)
|
|||||||
HAL_GPIO_WritePin(LCD_BL_CTRL_GPIO_Port, LCD_BL_CTRL_Pin, GPIO_PIN_RESET);
|
HAL_GPIO_WritePin(LCD_BL_CTRL_GPIO_Port, LCD_BL_CTRL_Pin, GPIO_PIN_RESET);
|
||||||
|
|
||||||
/*Configure GPIO pin Output Level */
|
/*Configure GPIO pin Output Level */
|
||||||
HAL_GPIO_WritePin(GPIOI, LED_Pin|LCD_DISP_Pin, GPIO_PIN_RESET);
|
HAL_GPIO_WritePin(GPIOI, LED_Pin | LCD_DISP_Pin, GPIO_PIN_RESET);
|
||||||
|
|
||||||
/*Configure GPIO pin : LCD_BL_CTRL_Pin */
|
/*Configure GPIO pin : LCD_BL_CTRL_Pin */
|
||||||
GPIO_InitStruct.Pin = LCD_BL_CTRL_Pin;
|
GPIO_InitStruct.Pin = LCD_BL_CTRL_Pin;
|
||||||
@@ -504,7 +484,7 @@ static void MX_GPIO_Init(void)
|
|||||||
HAL_GPIO_Init(LCD_BL_CTRL_GPIO_Port, &GPIO_InitStruct);
|
HAL_GPIO_Init(LCD_BL_CTRL_GPIO_Port, &GPIO_InitStruct);
|
||||||
|
|
||||||
/*Configure GPIO pins : LED_Pin LCD_DISP_Pin */
|
/*Configure GPIO pins : LED_Pin LCD_DISP_Pin */
|
||||||
GPIO_InitStruct.Pin = LED_Pin|LCD_DISP_Pin;
|
GPIO_InitStruct.Pin = LED_Pin | LCD_DISP_Pin;
|
||||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||||
@@ -516,8 +496,8 @@ static void MX_GPIO_Init(void)
|
|||||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||||
HAL_GPIO_Init(BUTTON_GPIO_Port, &GPIO_InitStruct);
|
HAL_GPIO_Init(BUTTON_GPIO_Port, &GPIO_InitStruct);
|
||||||
|
|
||||||
/* USER CODE BEGIN MX_GPIO_Init_2 */
|
/* USER CODE BEGIN MX_GPIO_Init_2 */
|
||||||
/* USER CODE END MX_GPIO_Init_2 */
|
/* USER CODE END MX_GPIO_Init_2 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN 4 */
|
/* USER CODE BEGIN 4 */
|
||||||
@@ -527,13 +507,11 @@ static void MX_GPIO_Init(void)
|
|||||||
* @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)
|
void Error_Handler(void) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN Error_Handler_Debug */
|
/* USER CODE BEGIN Error_Handler_Debug */
|
||||||
/* User can add his own implementation to report the HAL error return state */
|
/* User can add his own implementation to report the HAL error return state */
|
||||||
__disable_irq();
|
__disable_irq();
|
||||||
while (1)
|
while (1) {
|
||||||
{
|
|
||||||
}
|
}
|
||||||
/* USER CODE END Error_Handler_Debug */
|
/* USER CODE END Error_Handler_Debug */
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user