project_wave_box
/
sync_wave_box
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

v1.2

master
zhaohe 4 years ago
parent
bc4b6cd82d
commit
cb0216ee3a
10 changed files with 53 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      .mxproject
  2. 4
      Core/Src/iwdg.c
  3. 2
      Core/Src/main.c
  4. 28
      MDK-ARM/WaveBox.uvguix.zel
  5. 2
      MDK-ARM/WaveBox.uvprojx
  6. 10
      MDK-ARM/startup_stm32f429xx.lst
  7. 4
      README.md
  8. 3
      WaveBox.ioc
  9. BIN
      release/wavebox_v1.2.zip
  10. 3
      usec/user_main.c

39
.mxproject
View File

@ -6,30 +6,33 @@ SourceFiles=..\Core\Src\main.c;..\Core\Src\gpio.c;..\Core\Src\dma.c;..\Core\Src\
HeaderPath=..\Drivers\STM32F4xx_HAL_Driver\Inc;..\Drivers\STM32F4xx_HAL_Driver\Inc\Legacy;..\Drivers\CMSIS\Device\ST\STM32F4xx\Include;..\Drivers\CMSIS\Include;..\Core\Inc; HeaderPath=..\Drivers\STM32F4xx_HAL_Driver\Inc;..\Drivers\STM32F4xx_HAL_Driver\Inc\Legacy;..\Drivers\CMSIS\Device\ST\STM32F4xx\Include;..\Drivers\CMSIS\Include;..\Core\Inc;
CDefines=USE_HAL_DRIVER;STM32F429xx;USE_HAL_DRIVER;USE_HAL_DRIVER; CDefines=USE_HAL_DRIVER;STM32F429xx;USE_HAL_DRIVER;USE_HAL_DRIVER;
[]
SourceFiles=;;
[PreviousGenFiles] [PreviousGenFiles]
AdvancedFolderStructure=true AdvancedFolderStructure=true
HeaderFileListSize=8 HeaderFileListSize=8
HeaderFiles#0=C:/Users/zel/Desktop/WaveBox/Core/Inc/gpio.h
HeaderFiles#1=C:/Users/zel/Desktop/WaveBox/Core/Inc/dma.h
HeaderFiles#2=C:/Users/zel/Desktop/WaveBox/Core/Inc/iwdg.h
HeaderFiles#3=C:/Users/zel/Desktop/WaveBox/Core/Inc/tim.h
HeaderFiles#4=C:/Users/zel/Desktop/WaveBox/Core/Inc/usart.h
HeaderFiles#5=C:/Users/zel/Desktop/WaveBox/Core/Inc/stm32f4xx_it.h
HeaderFiles#6=C:/Users/zel/Desktop/WaveBox/Core/Inc/stm32f4xx_hal_conf.h
HeaderFiles#7=C:/Users/zel/Desktop/WaveBox/Core/Inc/main.h
HeaderFiles#0=F:/workspace/sync_wave_box/Core/Inc/gpio.h
HeaderFiles#1=F:/workspace/sync_wave_box/Core/Inc/dma.h
HeaderFiles#2=F:/workspace/sync_wave_box/Core/Inc/iwdg.h
HeaderFiles#3=F:/workspace/sync_wave_box/Core/Inc/tim.h
HeaderFiles#4=F:/workspace/sync_wave_box/Core/Inc/usart.h
HeaderFiles#5=F:/workspace/sync_wave_box/Core/Inc/stm32f4xx_it.h
HeaderFiles#6=F:/workspace/sync_wave_box/Core/Inc/stm32f4xx_hal_conf.h
HeaderFiles#7=F:/workspace/sync_wave_box/Core/Inc/main.h
HeaderFolderListSize=1 HeaderFolderListSize=1
HeaderPath#0=C:/Users/zel/Desktop/WaveBox/Core/Inc
HeaderPath#0=F:/workspace/sync_wave_box/Core/Inc
HeaderFiles=; HeaderFiles=;
SourceFileListSize=8 SourceFileListSize=8
SourceFiles#0=C:/Users/zel/Desktop/WaveBox/Core/Src/gpio.c
SourceFiles#1=C:/Users/zel/Desktop/WaveBox/Core/Src/dma.c
SourceFiles#2=C:/Users/zel/Desktop/WaveBox/Core/Src/iwdg.c
SourceFiles#3=C:/Users/zel/Desktop/WaveBox/Core/Src/tim.c
SourceFiles#4=C:/Users/zel/Desktop/WaveBox/Core/Src/usart.c
SourceFiles#5=C:/Users/zel/Desktop/WaveBox/Core/Src/stm32f4xx_it.c
SourceFiles#6=C:/Users/zel/Desktop/WaveBox/Core/Src/stm32f4xx_hal_msp.c
SourceFiles#7=C:/Users/zel/Desktop/WaveBox/Core/Src/main.c
SourceFiles#0=F:/workspace/sync_wave_box/Core/Src/gpio.c
SourceFiles#1=F:/workspace/sync_wave_box/Core/Src/dma.c
SourceFiles#2=F:/workspace/sync_wave_box/Core/Src/iwdg.c
SourceFiles#3=F:/workspace/sync_wave_box/Core/Src/tim.c
SourceFiles#4=F:/workspace/sync_wave_box/Core/Src/usart.c
SourceFiles#5=F:/workspace/sync_wave_box/Core/Src/stm32f4xx_it.c
SourceFiles#6=F:/workspace/sync_wave_box/Core/Src/stm32f4xx_hal_msp.c
SourceFiles#7=F:/workspace/sync_wave_box/Core/Src/main.c
SourceFolderListSize=1 SourceFolderListSize=1
SourcePath#0=C:/Users/zel/Desktop/WaveBox/Core/Src
SourcePath#0=F:/workspace/sync_wave_box/Core/Src
SourceFiles=; SourceFiles=;

4
Core/Src/iwdg.c
View File

@ -31,8 +31,8 @@ void MX_IWDG_Init(void)
{ {
hiwdg.Instance = IWDG; hiwdg.Instance = IWDG;
hiwdg.Init.Prescaler = IWDG_PRESCALER_4;
hiwdg.Init.Reload = 4095;
hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
hiwdg.Init.Reload = 1000;
if (HAL_IWDG_Init(&hiwdg) != HAL_OK) if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
{ {
Error_Handler(); Error_Handler();

2
Core/Src/main.c
View File

@ -91,7 +91,7 @@ int main(void)
/* Initialize all configured peripherals */ /* Initialize all configured peripherals */
MX_GPIO_Init(); MX_GPIO_Init();
MX_DMA_Init(); MX_DMA_Init();
// MX_IWDG_Init();
MX_IWDG_Init();
MX_TIM3_Init(); MX_TIM3_Init();
MX_TIM8_Init(); MX_TIM8_Init();
MX_USART1_UART_Init(); MX_USART1_UART_Init();

28
MDK-ARM/WaveBox.uvguix.zel
View File

@ -83,17 +83,17 @@
<yPos>-1</yPos> <yPos>-1</yPos>
</MaxPosition> </MaxPosition>
<NormalPosition> <NormalPosition>
<Top>105</Top>
<Left>295</Left>
<Right>1730</Right>
<Bottom>774</Bottom>
<Top>129</Top>
<Left>388</Left>
<Right>1823</Right>
<Bottom>991</Bottom>
</NormalPosition> </NormalPosition>
</WindowPosition> </WindowPosition>
<MDIClientArea> <MDIClientArea>
<RegID>0</RegID> <RegID>0</RegID>
<MDITabState> <MDITabState>
<Len>1412</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000004000000010000004D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C2E63000000000F73746D3332663478785F68616C2E6300000000C5D4F200FFFFFFFF28433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C706F72742E630000000006706F72742E6300000000FFDC7800FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F756172742E63000000001473746D3332663478785F68616C5F756172742E6300000000BECEA100FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F7077725F65782E63000000001673746D3332663478785F68616C5F7077725F65782E6300000000F0A0A100FFFFFFFF2D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C757365725F6D61696E2E63000000000B757365725F6D61696E2E63000000009CC1B600FFFFFFFF3A433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C4D444B2D41524D5C737461727475705F73746D33326634323978782E730000000015737461727475705F73746D33326634323978782E7300000000F7B88600FFFFFFFF2C433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F7B88600FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C434D5349535C4465766963655C53545C53544D3332463478785C496E636C7564655C73746D33326634323978782E68000000000D73746D33326634323978782E6800000000D9ADC200FFFFFFFF29433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C626F6172642E680000000007626F6172642E6800000000A5C2D700FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F6770696F2E63000000001473746D3332663478785F68616C5F6770696F2E6300000000BCA8E100FFFFFFFF39433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C73746D3332663478785F68616C5F6D73702E63000000001373746D3332663478785F68616C5F6D73702E6300000000F0A0A100FFFFFFFF2B433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C496E635C74696D2E68000000000574696D2E6800000000BECEA100FFFFFFFF53433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C496E635C73746D3332663478785F68616C5F75736172742E68000000001573746D3332663478785F68616C5F75736172742E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000091010000660000008007000032030000</Data>
<Len>1386</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000004000000010000004B463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C2E63000000000F73746D3332663478785F68616C2E6300000000C5D4F200FFFFFFFF26463A5C776F726B73706163655C73796E635F776176655F626F785C757365635C706F72742E630000000006706F72742E6300000000B5E99D00FFFFFFFF50463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F756172742E63000000001473746D3332663478785F68616C5F756172742E6300000000F6FA7D00FFFFFFFF52463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F7077725F65782E63000000001673746D3332663478785F68616C5F7077725F65782E6300000000EAD6A300FFFFFFFF2B463A5C776F726B73706163655C73796E635F776176655F626F785C757365635C757365725F6D61696E2E63000000000B757365725F6D61696E2E6300000000B3A6BE00FFFFFFFF38463A5C776F726B73706163655C73796E635F776176655F626F785C4D444B2D41524D5C737461727475705F73746D33326634323978782E730000000015737461727475705F73746D33326634323978782E7300000000A5C2D700FFFFFFFF2A463A5C776F726B73706163655C73796E635F776176655F626F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF52463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C434D5349535C4465766963655C53545C53544D3332463478785C496E636C7564655C73746D33326634323978782E68000000000D73746D33326634323978782E6800000000F7B88600FFFFFFFF27463A5C776F726B73706163655C73796E635F776176655F626F785C757365635C626F6172642E680000000007626F6172642E68000000009CC1B600FFFFFFFF50463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F6770696F2E63000000001473746D3332663478785F68616C5F6770696F2E6300000000BCA8E100FFFFFFFF37463A5C776F726B73706163655C73796E635F776176655F626F785C436F72655C5372635C73746D3332663478785F68616C5F6D73702E63000000001373746D3332663478785F68616C5F6D73702E6300000000F0A0A100FFFFFFFF29463A5C776F726B73706163655C73796E635F776176655F626F785C436F72655C496E635C74696D2E68000000000574696D2E6800000000BECEA100FFFFFFFF51463A5C776F726B73706163655C73796E635F776176655F626F785C447269766572735C53544D3332463478785F48414C5F4472697665725C496E635C73746D3332663478785F68616C5F75736172742E68000000001573746D3332663478785F68616C5F75736172742E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000091010000660000008007000032030000</Data>
</MDITabState> </MDITabState>
</MDIClientArea> </MDIClientArea>
<ViewEx> <ViewEx>
@ -2589,7 +2589,7 @@
<Doc> <Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c</Name> <Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>316</TopLine>
<TopLine>319</TopLine>
<CurrentLine>325</CurrentLine> <CurrentLine>325</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
@ -2607,7 +2607,7 @@
<Doc> <Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c</Name> <Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>2682</TopLine>
<TopLine>2685</TopLine>
<CurrentLine>2707</CurrentLine> <CurrentLine>2707</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
@ -2624,9 +2624,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>..\usec\user_main.c</Name> <Name>..\usec\user_main.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>193</TopLine>
<CurrentLine>239</CurrentLine>
<ColumnNumber>19</ColumnNumber>
<TopLine>39</TopLine>
<CurrentLine>73</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>
@ -2634,7 +2634,7 @@
<Doc> <Doc>
<Name>startup_stm32f429xx.s</Name> <Name>startup_stm32f429xx.s</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>174</TopLine>
<TopLine>176</TopLine>
<CurrentLine>183</CurrentLine> <CurrentLine>183</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
@ -2652,7 +2652,7 @@
<Doc> <Doc>
<Name>../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h</Name> <Name>../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h</Name>
<ColumnNumber>18</ColumnNumber> <ColumnNumber>18</ColumnNumber>
<TopLine>1118</TopLine>
<TopLine>1119</TopLine>
<CurrentLine>1120</CurrentLine> <CurrentLine>1120</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
@ -2688,7 +2688,7 @@
<Doc> <Doc>
<Name>../Core/Inc/tim.h</Name> <Name>../Core/Inc/tim.h</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<TopLine>7</TopLine>
<TopLine>10</TopLine>
<CurrentLine>33</CurrentLine> <CurrentLine>33</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>

2
MDK-ARM/WaveBox.uvprojx
View File

@ -365,7 +365,7 @@
<MiscControls>--diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295</MiscControls> <MiscControls>--diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295</MiscControls>
<Define>USE_HAL_DRIVER,STM32F429xx</Define> <Define>USE_HAL_DRIVER,STM32F429xx</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include</IncludePath>
<IncludePath>../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>

10
MDK-ARM/startup_stm32f429xx.lst
View File

@ -875,11 +875,11 @@ ARM Macro Assembler Page 14
00000000 00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int
erwork --depend=wavebox\startup_stm32f429xx.d -owavebox\startup_stm32f429xx.o - erwork --depend=wavebox\startup_stm32f429xx.d -owavebox\startup_stm32f429xx.o -
IC:\Users\zel\Desktop\WaveBox\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0
\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.13.0 --predefine
="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 514" --predefine="_RTE
_ SETA 1" --predefine="STM32F429xx SETA 1" --list=startup_stm32f429xx.lst start
up_stm32f429xx.s
IF:\workspace\sync_wave_box\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\C
MSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F4xx_DFP\2.13.0 --predefine="
__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 514" --predefine="_RTE_
SETA 1" --predefine="STM32F429xx SETA 1" --list=startup_stm32f429xx.lst startup
_stm32f429xx.s

4
README.md
View File

@ -18,7 +18,9 @@
TODO: TODO:
如果低电平时间小于3us，会出现多触发一个脉冲的问题。 如果低电平时间小于3us，会出现多触发一个脉冲的问题。
v1.2
1.添加看门狗
2.修复串口发送错误字符后，串口不好使的BUG
``` ```

3
WaveBox.ioc
View File

@ -46,6 +46,9 @@ Dma.TIM8_UP.1.Priority=DMA_PRIORITY_LOW
Dma.TIM8_UP.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode Dma.TIM8_UP.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode
File.Version=6 File.Version=6
GPIO.groupedBy= GPIO.groupedBy=
IWDG.IPParameters=Prescaler,Reload
IWDG.Prescaler=IWDG_PRESCALER_256
IWDG.Reload=1000
KeepUserPlacement=false KeepUserPlacement=false
Mcu.Family=STM32F4 Mcu.Family=STM32F4
Mcu.IP0=DMA Mcu.IP0=DMA

BIN
release/wavebox_v1.2.zip
View File

3
usec/user_main.c
View File

@ -15,6 +15,7 @@
#include "stm32f429xx.h" #include "stm32f429xx.h"
#include "stm32f4xx_hal_tim.h" #include "stm32f4xx_hal_tim.h"
#include "stm32f4xx_hal_usart.h" #include "stm32f4xx_hal_usart.h"
#include "iwdg.h"
/** /**
* @brief 初始化所有IO状态 * @brief 初始化所有IO状态
@ -71,6 +72,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) {
*/ */
if (!s_rxbuf_is_ready) { if (!s_rxbuf_is_ready) {
if (s_order_rxbuf == 'S') { if (s_order_rxbuf == 'S') {
s_rxbuf_has_received = 0;
s_rxbuf[s_rxbuf_has_received] = s_order_rxbuf; s_rxbuf[s_rxbuf_has_received] = s_order_rxbuf;
s_rxbuf_has_received++; s_rxbuf_has_received++;
} else if (s_rxbuf_has_received != 0) { } else if (s_rxbuf_has_received != 0) {
@ -243,6 +245,7 @@ void user_main() {
/** /**
* @brief 处理接收到的数据 * @brief 处理接收到的数据
*/ */
HAL_IWDG_Refresh(&hiwdg);
#if 1 #if 1
if (s_rxbuf_is_ready) { if (s_rxbuf_is_ready) {
process_rxbuf(); process_rxbuf();

Write Preview
Loading…
Cancel
Save