diff --git a/ADCftPWM.ioc b/ADCftPWM.ioc index 2637490..035f5df 100644 --- a/ADCftPWM.ioc +++ b/ADCftPWM.ioc @@ -9,6 +9,7 @@ CAD.formats= CAD.pinconfig= CAD.provider= File.Version=6 +GPIO.groupedBy=Group By Peripherals KeepUserPlacement=false Mcu.CPN=STM32F429ZIT6 Mcu.Family=STM32F4 @@ -92,7 +93,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_TIM1_Init-TIM1-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_TIM1_Init-TIM1-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true RCC.48MHZClocksFreq_Value=22857142.85714286 RCC.AHBFreq_Value=80000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 @@ -139,7 +140,7 @@ SH.S_TIM1_CH4.0=TIM1_CH4,PWM Generation4 CH4 SH.S_TIM1_CH4.ConfNb=1 TIM1.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4 TIM1.IPParameters=Channel-PWM Generation4 CH4,Period -TIM1.Period=7999 +TIM1.Period=65534 USART1.IPParameters=VirtualMode USART1.VirtualMode=VM_ASYNC VP_SYS_VS_Systick.Mode=SysTick diff --git a/Core/Src/main.c b/Core/Src/main.c index 1bd9ada..1b106b8 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -18,7 +18,6 @@ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" -#include "stm32f4xx_hal_uart.h" /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -51,7 +50,7 @@ UART_HandleTypeDef huart1; /* USER CODE BEGIN PV */ uint16_t duty; -int ctr = 7999; // or 65534? +int ctr = 65534; // or 65534? /* USER CODE END PV */ @@ -131,6 +130,7 @@ int main(void) proc *= ctr; duty = (uint16_t)proc; + printf("\x1B[2J\x1B[H"); /* ANSI: clear tty */ printf("duty:%u proc:%u raw:%u\r\n", duty, (uint16_t)proc, val_raw); //printf("duty:%u raw:%u\r\n", duty, val_raw); @@ -297,7 +297,7 @@ static void MX_TIM1_Init(void) htim1.Instance = TIM1; htim1.Init.Prescaler = 0; htim1.Init.CounterMode = TIM_COUNTERMODE_UP; - htim1.Init.Period = 7999; + htim1.Init.Period = 65534; htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; htim1.Init.RepetitionCounter = 0; htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; diff --git a/Makefile b/Makefile index bcd6281..2a28bfd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [4.7.0-B52] date: [Thu Dec 18 20:23:08 CST 2025] +# File automatically-generated by tool: [projectgenerator] version: [4.7.0-B52] date: [Thu Dec 18 21:09:08 CST 2025] ########################################################################################################################## # ------------------------------------------------