From 3f024510aea1cff090a7bb4b39e36420ff64b1ab Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 27 Feb 2021 12:50:17 +0100 Subject: [PATCH] disable modem stuff in master branch --- cube/Core/Inc/main.h | 7 ---- cube/Core/Inc/stm32f1xx_it.h | 1 - cube/Core/Inc/usart.h | 2 - cube/Core/Src/gpio.c | 8 ++-- cube/Core/Src/main.c | 1 - cube/Core/Src/main.c-bak | 1 - cube/Core/Src/stm32f1xx_it.c | 15 ------- cube/Core/Src/stm32f1xx_it.c-bak | 15 ------- cube/Core/Src/usart.c | 70 -------------------------------- cube/cube.ioc | 65 +++++++++++------------------ 10 files changed, 27 insertions(+), 158 deletions(-) diff --git a/cube/Core/Inc/main.h b/cube/Core/Inc/main.h index f29559b..7c5c4b0 100644 --- a/cube/Core/Inc/main.h +++ b/cube/Core/Inc/main.h @@ -62,19 +62,12 @@ void Error_Handler(void); #define etherSpi hspi2 #define debugUart huart1 #define mainsCnt htim1 -#define modemUart huart2 #define LED_Red_Pin GPIO_PIN_13 #define LED_Red_GPIO_Port GPIOC #define LED_Green_Pin GPIO_PIN_14 #define LED_Green_GPIO_Port GPIOC #define LED_Blue_Pin GPIO_PIN_15 #define LED_Blue_GPIO_Port GPIOC -#define MODEM_RES_Pin GPIO_PIN_1 -#define MODEM_RES_GPIO_Port GPIOA -#define MODEM_TX_Pin GPIO_PIN_2 -#define MODEM_TX_GPIO_Port GPIOA -#define MODEM_RX_Pin GPIO_PIN_3 -#define MODEM_RX_GPIO_Port GPIOA #define EEPROM_CS_Pin GPIO_PIN_4 #define EEPROM_CS_GPIO_Port GPIOA #define EEPROM_SCK_Pin GPIO_PIN_5 diff --git a/cube/Core/Inc/stm32f1xx_it.h b/cube/Core/Inc/stm32f1xx_it.h index a998416..cbb37a7 100644 --- a/cube/Core/Inc/stm32f1xx_it.h +++ b/cube/Core/Inc/stm32f1xx_it.h @@ -59,7 +59,6 @@ void SysTick_Handler(void); void TIM1_CC_IRQHandler(void); void SPI1_IRQHandler(void); void USART1_IRQHandler(void); -void USART2_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ diff --git a/cube/Core/Inc/usart.h b/cube/Core/Inc/usart.h index 19a6c70..17b2285 100644 --- a/cube/Core/Inc/usart.h +++ b/cube/Core/Inc/usart.h @@ -31,14 +31,12 @@ /* USER CODE END Includes */ extern UART_HandleTypeDef huart1; -extern UART_HandleTypeDef huart2; /* USER CODE BEGIN Private defines */ /* USER CODE END Private defines */ void MX_USART1_UART_Init(void); -void MX_USART2_UART_Init(void); /* USER CODE BEGIN Prototypes */ diff --git a/cube/Core/Src/gpio.c b/cube/Core/Src/gpio.c index a437be0..5df682e 100644 --- a/cube/Core/Src/gpio.c +++ b/cube/Core/Src/gpio.c @@ -52,7 +52,7 @@ void MX_GPIO_Init(void) HAL_GPIO_WritePin(GPIOC, LED_Red_Pin|LED_Green_Pin|LED_Blue_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOA, MODEM_RES_Pin|EEPROM_CS_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(EEPROM_CS_GPIO_Port, EEPROM_CS_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOB, ETHER_RES_Pin|ETHER_CS_Pin|Debug_Signal_2_Pin|Debug_Signal_1_Pin, GPIO_PIN_RESET); @@ -64,12 +64,12 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); - /*Configure GPIO pins : PAPin PAPin */ - GPIO_InitStruct.Pin = MODEM_RES_Pin|EEPROM_CS_Pin; + /*Configure GPIO pin : PtPin */ + GPIO_InitStruct.Pin = EEPROM_CS_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); + HAL_GPIO_Init(EEPROM_CS_GPIO_Port, &GPIO_InitStruct); /*Configure GPIO pin : PtPin */ GPIO_InitStruct.Pin = ADMIN_MODE_Pin; diff --git a/cube/Core/Src/main.c b/cube/Core/Src/main.c index a7b097b..702bdc5 100644 --- a/cube/Core/Src/main.c +++ b/cube/Core/Src/main.c @@ -99,7 +99,6 @@ int main(void) MX_TIM1_Init(); MX_USART1_UART_Init(); MX_IWDG_Init(); - MX_USART2_UART_Init(); /* USER CODE BEGIN 2 */ my_setup_2(); diff --git a/cube/Core/Src/main.c-bak b/cube/Core/Src/main.c-bak index 6046be8..4774833 100644 --- a/cube/Core/Src/main.c-bak +++ b/cube/Core/Src/main.c-bak @@ -94,7 +94,6 @@ int main(void) MX_TIM1_Init(); MX_USART1_UART_Init(); MX_IWDG_Init(); - MX_USART2_UART_Init(); /* USER CODE BEGIN 2 */ /* USER CODE END 2 */ diff --git a/cube/Core/Src/stm32f1xx_it.c b/cube/Core/Src/stm32f1xx_it.c index 0ec773a..23f5010 100644 --- a/cube/Core/Src/stm32f1xx_it.c +++ b/cube/Core/Src/stm32f1xx_it.c @@ -62,7 +62,6 @@ extern SPI_HandleTypeDef hspi1; extern TIM_HandleTypeDef htim1; extern UART_HandleTypeDef huart1; -extern UART_HandleTypeDef huart2; /* USER CODE BEGIN EV */ /* USER CODE END EV */ @@ -247,20 +246,6 @@ void USART1_IRQHandler(void) /* USER CODE END USART1_IRQn 1 */ } -/** - * @brief This function handles USART2 global interrupt. - */ -void USART2_IRQHandler(void) -{ - /* USER CODE BEGIN USART2_IRQn 0 */ - - /* USER CODE END USART2_IRQn 0 */ - HAL_UART_IRQHandler(&huart2); - /* USER CODE BEGIN USART2_IRQn 1 */ - - /* USER CODE END USART2_IRQn 1 */ -} - /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/cube/Core/Src/stm32f1xx_it.c-bak b/cube/Core/Src/stm32f1xx_it.c-bak index e4675a1..a383998 100644 --- a/cube/Core/Src/stm32f1xx_it.c-bak +++ b/cube/Core/Src/stm32f1xx_it.c-bak @@ -59,7 +59,6 @@ extern SPI_HandleTypeDef hspi1; extern TIM_HandleTypeDef htim1; extern UART_HandleTypeDef huart1; -extern UART_HandleTypeDef huart2; /* USER CODE BEGIN EV */ /* USER CODE END EV */ @@ -242,20 +241,6 @@ void USART1_IRQHandler(void) /* USER CODE END USART1_IRQn 1 */ } -/** - * @brief This function handles USART2 global interrupt. - */ -void USART2_IRQHandler(void) -{ - /* USER CODE BEGIN USART2_IRQn 0 */ - - /* USER CODE END USART2_IRQn 0 */ - HAL_UART_IRQHandler(&huart2); - /* USER CODE BEGIN USART2_IRQn 1 */ - - /* USER CODE END USART2_IRQn 1 */ -} - /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/cube/Core/Src/usart.c b/cube/Core/Src/usart.c index 7d6881f..b5ef0b4 100644 --- a/cube/Core/Src/usart.c +++ b/cube/Core/Src/usart.c @@ -25,7 +25,6 @@ /* USER CODE END 0 */ UART_HandleTypeDef huart1; -UART_HandleTypeDef huart2; /* USART1 init function */ @@ -45,25 +44,6 @@ void MX_USART1_UART_Init(void) Error_Handler(); } -} -/* USART2 init function */ - -void MX_USART2_UART_Init(void) -{ - - huart2.Instance = USART2; - huart2.Init.BaudRate = 115200; - huart2.Init.WordLength = UART_WORDLENGTH_8B; - huart2.Init.StopBits = UART_STOPBITS_1; - huart2.Init.Parity = UART_PARITY_NONE; - huart2.Init.Mode = UART_MODE_TX_RX; - huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE; - huart2.Init.OverSampling = UART_OVERSAMPLING_16; - if (HAL_UART_Init(&huart2) != HAL_OK) - { - Error_Handler(); - } - } void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) @@ -100,36 +80,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) /* USER CODE END USART1_MspInit 1 */ } - else if(uartHandle->Instance==USART2) - { - /* USER CODE BEGIN USART2_MspInit 0 */ - - /* USER CODE END USART2_MspInit 0 */ - /* USART2 clock enable */ - __HAL_RCC_USART2_CLK_ENABLE(); - - __HAL_RCC_GPIOA_CLK_ENABLE(); - /**USART2 GPIO Configuration - PA2 ------> USART2_TX - PA3 ------> USART2_RX - */ - GPIO_InitStruct.Pin = MODEM_TX_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; - HAL_GPIO_Init(MODEM_TX_GPIO_Port, &GPIO_InitStruct); - - GPIO_InitStruct.Pin = MODEM_RX_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_NOPULL; - HAL_GPIO_Init(MODEM_RX_GPIO_Port, &GPIO_InitStruct); - - /* USART2 interrupt Init */ - HAL_NVIC_SetPriority(USART2_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(USART2_IRQn); - /* USER CODE BEGIN USART2_MspInit 1 */ - - /* USER CODE END USART2_MspInit 1 */ - } } void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) @@ -155,26 +105,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) /* USER CODE END USART1_MspDeInit 1 */ } - else if(uartHandle->Instance==USART2) - { - /* USER CODE BEGIN USART2_MspDeInit 0 */ - - /* USER CODE END USART2_MspDeInit 0 */ - /* Peripheral clock disable */ - __HAL_RCC_USART2_CLK_DISABLE(); - - /**USART2 GPIO Configuration - PA2 ------> USART2_TX - PA3 ------> USART2_RX - */ - HAL_GPIO_DeInit(GPIOA, MODEM_TX_Pin|MODEM_RX_Pin); - - /* USART2 interrupt Deinit */ - HAL_NVIC_DisableIRQ(USART2_IRQn); - /* USER CODE BEGIN USART2_MspDeInit 1 */ - - /* USER CODE END USART2_MspDeInit 1 */ - } } /* USER CODE BEGIN 1 */ diff --git a/cube/cube.ioc b/cube/cube.ioc index ffc38e6..96be6e3 100644 --- a/cube/cube.ioc +++ b/cube/cube.ioc @@ -13,41 +13,37 @@ Mcu.IP4=SPI2 Mcu.IP5=SYS Mcu.IP6=TIM1 Mcu.IP7=USART1 -Mcu.IP8=USART2 -Mcu.IPNb=9 +Mcu.IPNb=8 Mcu.Name=STM32F103C(8-B)Tx Mcu.Package=LQFP48 Mcu.Pin0=PC13-TAMPER-RTC Mcu.Pin1=PC14-OSC32_IN -Mcu.Pin10=PA6 -Mcu.Pin11=PA7 -Mcu.Pin12=PB10 -Mcu.Pin13=PB11 -Mcu.Pin14=PB12 -Mcu.Pin15=PB13 -Mcu.Pin16=PB14 -Mcu.Pin17=PB15 -Mcu.Pin18=PA8 -Mcu.Pin19=PA9 +Mcu.Pin10=PB11 +Mcu.Pin11=PB12 +Mcu.Pin12=PB13 +Mcu.Pin13=PB14 +Mcu.Pin14=PB15 +Mcu.Pin15=PA8 +Mcu.Pin16=PA9 +Mcu.Pin17=PA10 +Mcu.Pin18=PA12 +Mcu.Pin19=PA13 Mcu.Pin2=PC15-OSC32_OUT -Mcu.Pin20=PA10 -Mcu.Pin21=PA12 -Mcu.Pin22=PA13 -Mcu.Pin23=PA14 -Mcu.Pin24=PB5 -Mcu.Pin25=PB6 -Mcu.Pin26=VP_IWDG_VS_IWDG -Mcu.Pin27=VP_SYS_VS_Systick +Mcu.Pin20=PA14 +Mcu.Pin21=PB5 +Mcu.Pin22=PB6 +Mcu.Pin23=VP_IWDG_VS_IWDG +Mcu.Pin24=VP_SYS_VS_Systick Mcu.Pin3=PD0-OSC_IN Mcu.Pin4=PD1-OSC_OUT -Mcu.Pin5=PA1 -Mcu.Pin6=PA2 -Mcu.Pin7=PA3 -Mcu.Pin8=PA4 -Mcu.Pin9=PA5 -Mcu.PinsNb=28 +Mcu.Pin5=PA4 +Mcu.Pin6=PA5 +Mcu.Pin7=PA6 +Mcu.Pin8=PA7 +Mcu.Pin9=PB10 +Mcu.PinsNb=25 Mcu.ThirdPartyNb=0 -Mcu.UserConstants=eepromSpi,hspi1;etherSpi,hspi2;debugUart,huart1;mainsCnt,htim1;modemUart,huart2 +Mcu.UserConstants=eepromSpi,hspi1;etherSpi,hspi2;debugUart,huart1;mainsCnt,htim1 Mcu.UserName=STM32F103C8Tx MxCube.Version=6.0.0 MxDb.Version=DB.6.0.0 @@ -64,12 +60,7 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.TIM1_CC_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true -NVIC.USART2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false -PA1.GPIOParameters=GPIO_Label -PA1.GPIO_Label=MODEM_RES -PA1.Locked=true -PA1.Signal=GPIO_Output PA10.GPIOParameters=GPIO_Label PA10.GPIO_Label=Debug_RX PA10.Mode=Asynchronous @@ -81,14 +72,6 @@ PA13.Mode=Serial_Wire PA13.Signal=SYS_JTMS-SWDIO PA14.Mode=Serial_Wire PA14.Signal=SYS_JTCK-SWCLK -PA2.GPIOParameters=GPIO_Label -PA2.GPIO_Label=MODEM_TX -PA2.Mode=Asynchronous -PA2.Signal=USART2_TX -PA3.GPIOParameters=GPIO_Label -PA3.GPIO_Label=MODEM_RX -PA3.Mode=Asynchronous -PA3.Signal=USART2_RX PA4.GPIOParameters=GPIO_Label PA4.GPIO_Label=EEPROM_CS PA4.Locked=true @@ -231,8 +214,6 @@ TIM1.IPParameters=Channel-Input_Capture1_from_TI1,Prescaler,ClockDivision TIM1.Prescaler=13 USART1.IPParameters=VirtualMode USART1.VirtualMode=VM_ASYNC -USART2.IPParameters=VirtualMode -USART2.VirtualMode=VM_ASYNC VP_IWDG_VS_IWDG.Mode=IWDG_Activate VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG VP_SYS_VS_Systick.Mode=SysTick