From 21c5c82f29cb8d8914a433ed3d7c065aca0f4256 Mon Sep 17 00:00:00 2001 From: Wojciech Kaczmarski <44336093+sp5wwp@users.noreply.github.com> Date: Sun, 25 Aug 2019 20:14:23 +0200 Subject: [PATCH] Add files via upload --- cubemx/Inc/main.h | 14 ++++++++ cubemx/Src/main.c | 59 +++++++++++++++++++++------------- cubemx/Src/stm32f7xx_hal_msp.c | 8 +++-- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/cubemx/Inc/main.h b/cubemx/Inc/main.h index 7d017fd..d390834 100644 --- a/cubemx/Inc/main.h +++ b/cubemx/Inc/main.h @@ -49,6 +49,16 @@ /* Private define ------------------------------------------------------------*/ +#define TP7_Pin GPIO_PIN_2 +#define TP7_GPIO_Port GPIOE +#define TP8_Pin GPIO_PIN_3 +#define TP8_GPIO_Port GPIOE +#define LCD_CS1_Pin GPIO_PIN_0 +#define LCD_CS1_GPIO_Port GPIOC +#define LCD_CS2_Pin GPIO_PIN_1 +#define LCD_CS2_GPIO_Port GPIOC +#define LCD_CS3_Pin GPIO_PIN_2 +#define LCD_CS3_GPIO_Port GPIOC #define RX_SCK_Pin GPIO_PIN_5 #define RX_SCK_GPIO_Port GPIOA #define RX_MISO_Pin GPIO_PIN_6 @@ -99,6 +109,10 @@ #define TX_NIRQ_GPIO_Port GPIOD #define LCD_PWM_Pin GPIO_PIN_12 #define LCD_PWM_GPIO_Port GPIOD +#define PWM_FAN_L_Pin GPIO_PIN_13 +#define PWM_FAN_L_GPIO_Port GPIOD +#define PWM_FAN_R_Pin GPIO_PIN_14 +#define PWM_FAN_R_GPIO_Port GPIOD #define LED_0_Pin GPIO_PIN_15 #define LED_0_GPIO_Port GPIOA #define LED_1_Pin GPIO_PIN_10 diff --git a/cubemx/Src/main.c b/cubemx/Src/main.c index 2840f8c..1466b81 100644 --- a/cubemx/Src/main.c +++ b/cubemx/Src/main.c @@ -407,6 +407,16 @@ static void MX_TIM4_Init(void) _Error_Handler(__FILE__, __LINE__); } + if (HAL_TIM_PWM_ConfigChannel(&htim4, &sConfigOC, TIM_CHANNEL_2) != HAL_OK) + { + _Error_Handler(__FILE__, __LINE__); + } + + if (HAL_TIM_PWM_ConfigChannel(&htim4, &sConfigOC, TIM_CHANNEL_3) != HAL_OK) + { + _Error_Handler(__FILE__, __LINE__); + } + HAL_TIM_MspPostInit(&htim4); } @@ -445,33 +455,47 @@ static void MX_GPIO_Init(void) GPIO_InitTypeDef GPIO_InitStruct; /* GPIO Ports Clock Enable */ - __HAL_RCC_GPIOH_CLK_ENABLE(); - __HAL_RCC_GPIOA_CLK_ENABLE(); - __HAL_RCC_GPIOC_CLK_ENABLE(); - __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOE_CLK_ENABLE(); + __HAL_RCC_GPIOH_CLK_ENABLE(); + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOD_CLK_ENABLE(); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOC, RX_CS_Pin|LED_1_Pin|LED_2_Pin|LED_3_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOE, TP7_Pin|TP8_Pin|LCD_E_Pin|LCD_DB0_Pin + |LCD_DB1_Pin|LCD_DB2_Pin|LCD_DB3_Pin|LCD_DB4_Pin + |LCD_DB5_Pin|LCD_DB6_Pin|LCD_DB7_Pin, GPIO_PIN_RESET); + + /*Configure GPIO pin Output Level */ + HAL_GPIO_WritePin(GPIOC, LCD_CS1_Pin|LCD_CS2_Pin|LCD_CS3_Pin|RX_CS_Pin + |LED_1_Pin|LED_2_Pin|LED_3_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOB, RX_SDN_Pin|LCD_RS_Pin|LCD_RW_Pin|LCD_RES_Pin |TX_SDN_Pin, GPIO_PIN_RESET); - /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOE, LCD_E_Pin|LCD_DB0_Pin|LCD_DB1_Pin|LCD_DB2_Pin - |LCD_DB3_Pin|LCD_DB4_Pin|LCD_DB5_Pin|LCD_DB6_Pin - |LCD_DB7_Pin, GPIO_PIN_RESET); - /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOD, TX_CS_Pin|LED_4_Pin|LED_5_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(LED_0_GPIO_Port, LED_0_Pin, GPIO_PIN_RESET); - /*Configure GPIO pins : RX_CS_Pin LED_1_Pin LED_2_Pin LED_3_Pin */ - GPIO_InitStruct.Pin = RX_CS_Pin|LED_1_Pin|LED_2_Pin|LED_3_Pin; + /*Configure GPIO pins : TP7_Pin TP8_Pin LCD_E_Pin LCD_DB0_Pin + LCD_DB1_Pin LCD_DB2_Pin LCD_DB3_Pin LCD_DB4_Pin + LCD_DB5_Pin LCD_DB6_Pin LCD_DB7_Pin */ + GPIO_InitStruct.Pin = TP7_Pin|TP8_Pin|LCD_E_Pin|LCD_DB0_Pin + |LCD_DB1_Pin|LCD_DB2_Pin|LCD_DB3_Pin|LCD_DB4_Pin + |LCD_DB5_Pin|LCD_DB6_Pin|LCD_DB7_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); + + /*Configure GPIO pins : LCD_CS1_Pin LCD_CS2_Pin LCD_CS3_Pin RX_CS_Pin + LED_1_Pin LED_2_Pin LED_3_Pin */ + GPIO_InitStruct.Pin = LCD_CS1_Pin|LCD_CS2_Pin|LCD_CS3_Pin|RX_CS_Pin + |LED_1_Pin|LED_2_Pin|LED_3_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; @@ -492,17 +516,6 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - /*Configure GPIO pins : LCD_E_Pin LCD_DB0_Pin LCD_DB1_Pin LCD_DB2_Pin - LCD_DB3_Pin LCD_DB4_Pin LCD_DB5_Pin LCD_DB6_Pin - LCD_DB7_Pin */ - GPIO_InitStruct.Pin = LCD_E_Pin|LCD_DB0_Pin|LCD_DB1_Pin|LCD_DB2_Pin - |LCD_DB3_Pin|LCD_DB4_Pin|LCD_DB5_Pin|LCD_DB6_Pin - |LCD_DB7_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); - /*Configure GPIO pins : TX_CS_Pin LED_4_Pin LED_5_Pin */ GPIO_InitStruct.Pin = TX_CS_Pin|LED_4_Pin|LED_5_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; diff --git a/cubemx/Src/stm32f7xx_hal_msp.c b/cubemx/Src/stm32f7xx_hal_msp.c index d482ce8..8b1c2a0 100644 --- a/cubemx/Src/stm32f7xx_hal_msp.c +++ b/cubemx/Src/stm32f7xx_hal_msp.c @@ -342,14 +342,16 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) /* USER CODE END TIM4_MspPostInit 0 */ /**TIM4 GPIO Configuration - PD12 ------> TIM4_CH1 + PD12 ------> TIM4_CH1 + PD13 ------> TIM4_CH2 + PD14 ------> TIM4_CH3 */ - GPIO_InitStruct.Pin = LCD_PWM_Pin; + GPIO_InitStruct.Pin = LCD_PWM_Pin|PWM_FAN_L_Pin|PWM_FAN_R_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; - HAL_GPIO_Init(LCD_PWM_GPIO_Port, &GPIO_InitStruct); + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); /* USER CODE BEGIN TIM4_MspPostInit 1 */