wxsmart
/
controller-hd
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPS3000暂存

This commit is contained in:
gaoyuhang 2024-06-06 08:59:12 +08:00
parent e0b6462ab6
commit 7d7af4febb
6 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Src/main.c
View File

@ -165,6 +165,7 @@ void SystemClock_Config(void)
/* Wait till HSE is ready */ /* Wait till HSE is ready */
while(LL_RCC_HSE_IsReady() != 1) while(LL_RCC_HSE_IsReady() != 1)
{ {
} }
LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_HSE, LL_RCC_PLLM_DIV_1, 8, LL_RCC_PLLR_DIV_2); LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_HSE, LL_RCC_PLLM_DIV_1, 8, LL_RCC_PLLR_DIV_2);
LL_RCC_PLL_EnableDomain_SYS(); LL_RCC_PLL_EnableDomain_SYS();
@ -173,12 +174,14 @@ void SystemClock_Config(void)
/* Wait till PLL is ready */ /* Wait till PLL is ready */
while(LL_RCC_PLL_IsReady() != 1) while(LL_RCC_PLL_IsReady() != 1)
{ {
} }
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
/* Wait till System clock is ready */ /* Wait till System clock is ready */
while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL) while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
{ {
} }
LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_8); LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_8);
LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1); LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
@ -202,6 +205,7 @@ void PeriphCommonClock_Config(void)
/* Wait till PLLSAI1 is ready */ /* Wait till PLLSAI1 is ready */
while(LL_RCC_PLLSAI1_IsReady() != 1) while(LL_RCC_PLLSAI1_IsReady() != 1)
{ {
} }
} }

2
Core/Src/tim.c
View File

@ -186,7 +186,7 @@ void MX_TIM7_Init(void)
/* USER CODE END TIM7_Init 1 */ /* USER CODE END TIM7_Init 1 */
TIM_InitStruct.Prescaler = 399; TIM_InitStruct.Prescaler = 399;
TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP; TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
TIM_InitStruct.Autoreload = 99; TIM_InitStruct.Autoreload = 499;
LL_TIM_Init(TIM7, &TIM_InitStruct); LL_TIM_Init(TIM7, &TIM_InitStruct);
LL_TIM_EnableARRPreload(TIM7); LL_TIM_EnableARRPreload(TIM7);
LL_TIM_SetTriggerOutput(TIM7, LL_TIM_TRGO_RESET); LL_TIM_SetTriggerOutput(TIM7, LL_TIM_TRGO_RESET);

18
MDK-ARM/controller-v2.uvoptx
View File

@ -1500,6 +1500,14 @@
</File> </File>
</Group> </Group>
<Group>
<GroupName>::CMSIS</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>1</RteFlg>
</Group>
<Group> <Group>
<GroupName>Middlewares/Library/DSP Library/DSP Library</GroupName> <GroupName>Middlewares/Library/DSP Library/DSP Library</GroupName>
<tvExp>0</tvExp> <tvExp>0</tvExp>
@ -1507,7 +1515,7 @@
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>16</GroupNumber> <GroupNumber>17</GroupNumber>
<FileNumber>91</FileNumber> <FileNumber>91</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
@ -1520,12 +1528,4 @@
</File> </File>
</Group> </Group>
<Group>
<GroupName>::CMSIS</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>1</RteFlg>
</Group>
</ProjectOpt> </ProjectOpt>

8
MDK-ARM/controller-v2.uvprojx
View File

@ -83,7 +83,7 @@
<RunUserProg1>1</RunUserProg1> <RunUserProg1>1</RunUserProg1>
<RunUserProg2>1</RunUserProg2> <RunUserProg2>1</RunUserProg2>
<UserProg1Name>fromelf --bin --output=@L.bin !L</UserProg1Name> <UserProg1Name>fromelf --bin --output=@L.bin !L</UserProg1Name>
<UserProg2Name>output-controller-v24.bat</UserProg2Name> <UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopA1X>0</nStopA1X> <nStopA1X>0</nStopA1X>
@ -1278,6 +1278,9 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>::CMSIS</GroupName>
</Group>
<Group> <Group>
<GroupName>Middlewares/Library/DSP Library/DSP Library</GroupName> <GroupName>Middlewares/Library/DSP Library/DSP Library</GroupName>
<GroupOption> <GroupOption>
@ -1376,9 +1379,6 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>::CMSIS</GroupName>
</Group>
</Groups> </Groups>
</Target> </Target>
</Targets> </Targets>

1
User/application/mode/mode.c
View File

@ -295,6 +295,7 @@ void mode_init(void)
break; break;
case MODE_FREQUENCY_DOMAIN_CONTROL_ALGORITHM: case MODE_FREQUENCY_DOMAIN_CONTROL_ALGORITHM:
pdctrl_init(PDCTRL_PWMP); pdctrl_init(PDCTRL_PWMP);
//pdctrl_init(PDCTRL_DAC);
mode_pwmp_hd_init(&mode_get()->interface_req, mode_get()->positioner_model, &mode_params.mode_pwmp_hd_params, mode_pwmp_hd_init(&mode_get()->interface_req, mode_get()->positioner_model, &mode_params.mode_pwmp_hd_params,
mode_params_save_cb); mode_params_save_cb);
break; break;

6
controller-v2.ioc
View File

@ -267,8 +267,8 @@ Mcu.ThirdParty0=STMicroelectronics.X-CUBE-ALGOBUILD.1.3.0
Mcu.ThirdPartyNb=1 Mcu.ThirdPartyNb=1
Mcu.UserConstants= Mcu.UserConstants=
Mcu.UserName=STM32L476VGTx Mcu.UserName=STM32L476VGTx
MxCube.Version=6.9.2 MxCube.Version=6.10.0
MxDb.Version=DB.6.0.92 MxDb.Version=DB.6.0.100
NVIC.ADC1_2_IRQn=true\:14\:0\:true\:false\:true\:true\:true\:true NVIC.ADC1_2_IRQn=true\:14\:0\:true\:false\:true\:true\:true\:true
NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.DMA1_Channel1_IRQn=true\:14\:0\:true\:false\:true\:false\:true\:true NVIC.DMA1_Channel1_IRQn=true\:14\:0\:true\:false\:true\:false\:true\:true
@ -710,7 +710,7 @@ TIM6.Period=99
TIM6.Prescaler=399 TIM6.Prescaler=399
TIM7.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE TIM7.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
TIM7.IPParameters=Prescaler,Period,AutoReloadPreload TIM7.IPParameters=Prescaler,Period,AutoReloadPreload
TIM7.Period=99 TIM7.Period=499
TIM7.Prescaler=399 TIM7.Prescaler=399
UART5.BaudRate=9600 UART5.BaudRate=9600
UART5.IPParameters=BaudRate UART5.IPParameters=BaudRate