wxsmart-test
/
sggt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新： 

TIM1分频系数2->2000，当前频率输出0~1KHz基本正常，2k开始波形形状异常
This commit is contained in:
吴俊潮 2025-04-07 10:25:50 +08:00
parent 49feec1a9e
commit 2cd09e4902
7 changed files with 12986 additions and 12992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App/APP_WU/Src/app_screen_setting.c
View File

@ -449,7 +449,7 @@ void key_functions_setting(void)
case ITEMS_0: case ITEMS_0:
{ {
tabdata.item_page_prv = tabdata.item_page; tabdata.item_page_prv = tabdata.item_page;
tabdata.item_page = ( (tabdata.item_page + 1) >= 4)?(0):(tabdata.item_page + 1); tabdata.item_page = ( (tabdata.item_page + 1) >= 4)?(1):(tabdata.item_page + 1);
setting_items_page(ITEMS_0, tabdata.item_page); setting_items_page(ITEMS_0, tabdata.item_page);

8
App/APP_WU/Src/apps_gather.c
View File

@ -1,11 +1,3 @@
/*
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-27 11:50:56
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-04-01 11:40:27
* @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
#include "apps_gather.h" //用于头文件打包汇总，函数声明和变量定义 #include "apps_gather.h" //用于头文件打包汇总，函数声明和变量定义
// lv_conf.h { line:282->CPU&FPS; line:289->MEM used } // lv_conf.h { line:282->CPU&FPS; line:289->MEM used }
//lv_obj_scroll.c, SCROLL_ANIM_TIME_MIN & SCROLL_ANIM_TIME_MAX //lv_obj_scroll.c, SCROLL_ANIM_TIME_MIN & SCROLL_ANIM_TIME_MAX

4
Core/Inc/tim.h
View File

@ -29,7 +29,7 @@ extern "C" {
#include "main.h" #include "main.h"
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
#define FREQ_SYS 41472000 #define FREQ_SYS 41472
#define freq_operation(FREQ, PULSE) \ #define freq_operation(FREQ, PULSE) \
do \ do \
{ \ { \
@ -38,7 +38,7 @@ extern "C" {
HAL_TIMEx_PWMN_Stop(&htim1, TIM_CHANNEL_2); \ HAL_TIMEx_PWMN_Stop(&htim1, TIM_CHANNEL_2); \
return; \ return; \
} \ } \
uint16_t duty = FREQ_SYS / FREQ; \ int32_t duty = FREQ_SYS / FREQ; \
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_2, duty *PULSE / 100 - 1); \ __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_2, duty *PULSE / 100 - 1); \
__HAL_TIM_SET_AUTORELOAD(&htim1, duty -1); \ __HAL_TIM_SET_AUTORELOAD(&htim1, duty -1); \
HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_2); \ HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_2); \

2
Core/Src/spi.c
View File

@ -46,7 +46,7 @@ void MX_SPI1_Init(void)
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW; hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
hspi1.Init.CLKPhase = SPI_PHASE_2EDGE; hspi1.Init.CLKPhase = SPI_PHASE_2EDGE;
hspi1.Init.NSS = SPI_NSS_SOFT; hspi1.Init.NSS = SPI_NSS_SOFT;
hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64; hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32;
hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
hspi1.Init.TIMode = SPI_TIMODE_DISABLE; hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;

4
Core/Src/tim.c
View File

@ -45,9 +45,9 @@ void MX_TIM1_Init(void)
/* USER CODE END TIM1_Init 1 */ /* USER CODE END TIM1_Init 1 */
htim1.Instance = TIM1; htim1.Instance = TIM1;
htim1.Init.Prescaler = 2-1; htim1.Init.Prescaler = 2000-1;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP; htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
htim1.Init.Period = 41472-1; htim1.Init.Period = 41-1;
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
htim1.Init.RepetitionCounter = 0; htim1.Init.RepetitionCounter = 0;
htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE; htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;

25950
MDK-ARM/signal_generator/signal_generator.hex
View File

File diff suppressed because it is too large Load Diff

8
signal_generator.ioc
View File

@ -563,9 +563,9 @@ SH.GPXTI1.0=GPIO_EXTI1
SH.GPXTI1.ConfNb=1 SH.GPXTI1.ConfNb=1
SH.S_TIM3_CH4.0=TIM3_CH4,Input_Capture4_from_TI4 SH.S_TIM3_CH4.0=TIM3_CH4,Input_Capture4_from_TI4
SH.S_TIM3_CH4.ConfNb=1 SH.S_TIM3_CH4.ConfNb=1
SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_64 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_32
SPI1.CLKPhase=SPI_PHASE_2EDGE SPI1.CLKPhase=SPI_PHASE_2EDGE
SPI1.CalculateBaudRate=648.0 KBits/s SPI1.CalculateBaudRate=1.296 MBits/s
SPI1.Direction=SPI_DIRECTION_2LINES SPI1.Direction=SPI_DIRECTION_2LINES
SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,CLKPhase,BaudRatePrescaler SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,CLKPhase,BaudRatePrescaler
SPI1.Mode=SPI_MODE_MASTER SPI1.Mode=SPI_MODE_MASTER
@ -591,8 +591,8 @@ TIM1.Channel-PWM\ Generation2\ CH2N=TIM_CHANNEL_2
TIM1.IPParameters=Prescaler,AutoReloadPreload,Period,OC2Preload_PWM,Channel-PWM Generation2 CH2N,Pulse-PWM Generation2 CH2N,OCFastMode_PWM-PWM Generation2 CH2N TIM1.IPParameters=Prescaler,AutoReloadPreload,Period,OC2Preload_PWM,Channel-PWM Generation2 CH2N,Pulse-PWM Generation2 CH2N,OCFastMode_PWM-PWM Generation2 CH2N
TIM1.OC2Preload_PWM=ENABLE TIM1.OC2Preload_PWM=ENABLE
TIM1.OCFastMode_PWM-PWM\ Generation2\ CH2N=TIM_OCFAST_ENABLE TIM1.OCFastMode_PWM-PWM\ Generation2\ CH2N=TIM_OCFAST_ENABLE
TIM1.Period=41472-1 TIM1.Period=41-1
TIM1.Prescaler=2-1 TIM1.Prescaler=2000-1
TIM1.Pulse-PWM\ Generation2\ CH2N=20736-1 TIM1.Pulse-PWM\ Generation2\ CH2N=20736-1
TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
TIM3.Channel-Input_Capture4_from_TI4=TIM_CHANNEL_4 TIM3.Channel-Input_Capture4_from_TI4=TIM_CHANNEL_4