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

v1.1

master
zhaohe 4 years ago
parent
ad5f50db21
commit
4a79452e51
5 changed files with 1202 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      MDK-ARM/WaveBox.uvguix.zel
  2. 2
      README.md
  3. 2
      usec/board.h
  4. 19
      usec/user_main.c
  5. 1176
      wave_box_v1.1.hex

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

@ -75,8 +75,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
@ -93,7 +93,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>1412</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000002000000010000004D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C2E63000000000F73746D3332663478785F68616C2E6300000000C5D4F200FFFFFFFF28433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C706F72742E630000000006706F72742E6300000000B5E99D00FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F756172742E63000000001473746D3332663478785F68616C5F756172742E6300000000F6FA7D00FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F7077725F65782E63000000001673746D3332663478785F68616C5F7077725F65782E6300000000EAD6A300FFFFFFFF2D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C757365725F6D61696E2E63000000000B757365725F6D61696E2E6300000000B3A6BE00FFFFFFFF3A433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C4D444B2D41524D5C737461727475705F73746D33326634323978782E730000000015737461727475705F73746D33326634323978782E7300000000A5C2D700FFFFFFFF2C433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C434D5349535C4465766963655C53545C53544D3332463478785C496E636C7564655C73746D33326634323978782E68000000000D73746D33326634323978782E6800000000F7B88600FFFFFFFF29433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C626F6172642E680000000007626F6172642E68000000009CC1B600FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F6770696F2E63000000001473746D3332663478785F68616C5F6770696F2E6300000000BCA8E100FFFFFFFF39433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C73746D3332663478785F68616C5F6D73702E63000000001373746D3332663478785F68616C5F6D73702E6300000000F0A0A100FFFFFFFF2B433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C496E635C74696D2E68000000000574696D2E6800000000BECEA100FFFFFFFF53433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C496E635C73746D3332663478785F68616C5F75736172742E68000000001573746D3332663478785F68616C5F75736172742E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000091010000660000008007000032030000</Data>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000004000000010000004D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C2E63000000000F73746D3332663478785F68616C2E6300000000C5D4F200FFFFFFFF28433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C706F72742E630000000006706F72742E6300000000FFDC7800FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F756172742E63000000001473746D3332663478785F68616C5F756172742E6300000000BECEA100FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F7077725F65782E63000000001673746D3332663478785F68616C5F7077725F65782E6300000000F0A0A100FFFFFFFF2D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C757365725F6D61696E2E63000000000B757365725F6D61696E2E6300000000BCA8E100FFFFFFFF3A433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C4D444B2D41524D5C737461727475705F73746D33326634323978782E730000000015737461727475705F73746D33326634323978782E73000000009CC1B600FFFFFFFF2C433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F7B88600FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C434D5349535C4465766963655C53545C53544D3332463478785C496E636C7564655C73746D33326634323978782E68000000000D73746D33326634323978782E6800000000D9ADC200FFFFFFFF29433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C626F6172642E680000000007626F6172642E6800000000A5C2D700FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F6770696F2E63000000001473746D3332663478785F68616C5F6770696F2E6300000000B3A6BE00FFFFFFFF39433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C73746D3332663478785F68616C5F6D73702E63000000001373746D3332663478785F68616C5F6D73702E6300000000EAD6A300FFFFFFFF2B433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C496E635C74696D2E68000000000574696D2E6800000000BECEA100FFFFFFFF53433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C496E635C73746D3332663478785F68616C5F75736172742E68000000001573746D3332663478785F68616C5F75736172742E6800000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000091010000660000008007000032030000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@ -2585,11 +2585,11 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
<ActiveTab>2</ActiveTab>
<ActiveTab>4</ActiveTab>
<Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>313</TopLine>
<TopLine>315</TopLine>
<CurrentLine>325</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2607,7 +2607,7 @@
<Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>2679</TopLine>
<TopLine>2681</TopLine>
<CurrentLine>2707</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2616,7 +2616,7 @@
<Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>445</TopLine>
<TopLine>447</TopLine>
<CurrentLine>449</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2625,7 +2625,7 @@
<Doc>
<Name>..\usec\user_main.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>212</TopLine>
<TopLine>192</TopLine>
<CurrentLine>239</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2634,7 +2634,7 @@
<Doc>
<Name>startup_stm32f429xx.s</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>171</TopLine>
<TopLine>173</TopLine>
<CurrentLine>183</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2643,7 +2643,7 @@
<Doc>
<Name>../Core/Src/main.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>76</TopLine>
<TopLine>77</TopLine>
<CurrentLine>78</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2652,7 +2652,7 @@
<Doc>
<Name>../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h</Name>
<ColumnNumber>18</ColumnNumber>
<TopLine>1115</TopLine>
<TopLine>1117</TopLine>
<CurrentLine>1120</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2670,7 +2670,7 @@
<Doc>
<Name>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>408</TopLine>
<TopLine>410</TopLine>
<CurrentLine>412</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2679,7 +2679,7 @@
<Doc>
<Name>../Core/Src/stm32f4xx_hal_msp.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>34</TopLine>
<TopLine>35</TopLine>
<CurrentLine>71</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@ -2688,7 +2688,7 @@
<Doc>
<Name>../Core/Inc/tim.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>4</TopLine>
<TopLine>6</TopLine>
<CurrentLine>33</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>

2
README.md
View File

@ -8,6 +8,8 @@
## Release
```
v1.1
1. 修改日志
v1.0
1. 实现同步盒使用说明2015.docx要求的全部功能

2
usec/board.h
View File

@ -1,6 +1,6 @@
#pragma once
#define VERSION "v1.0"
#define VERSION "v1.1"
#define ORDER_UART huart1
#define DEBUG_UART huart1 //直接使用指令串口作为调试串口

19
usec/user_main.c
View File

@ -33,9 +33,9 @@
#define LOGD(fmt, ...) printf("D:" fmt, ##__VA_ARGS__);
#define LOGE(fmt, ...) printf("E:" fmt, ##__VA_ARGS__);
#else
#define LOGI(fmt, ...)
#define LOGD(fmt, ...)
#define LOGE(fmt, ...)
#define LOGI(fmt, ...) printf("" fmt, ##__VA_ARGS__);
#define LOGD(fmt, ...)
#define LOGE(fmt, ...)
#endif
static uint8_t s_order_rxbuf;
static uint8_t s_rxbuf[50];
@ -203,7 +203,7 @@ void process_rxbuf() {
*
*/
// clang-format on
LOGI("rx:%s\r\n", s_rxbuf);
LOGD("rx:%s\r\n", s_rxbuf);
char freq_c[6] = {0};
char pluse_width_c[8] = {0};
@ -227,16 +227,15 @@ void process_rxbuf() {
// pluse_width, pluse_num);
float duty = pluse_width / 10.0 / (1 * 1000 * 1000.0 / freq);
LOGD("trigger pwm\r\n");
LOGD(" f[%d]hz\r\n", freq);
LOGD(" w[%d]0.1us(%2.2f%%)\r\n", pluse_width, duty * 100);
LOGD(" n[%d]\r\n", pluse_num);
LOGI("f[%d]hz \r\n", freq);
LOGI("w[%d]us \r\n", pluse_width/10);
trigger_pwm(freq, duty, pluse_num);
}
void user_main() {
LOG_RELEASE("wavebox %s\r\n", VERSION);
LOG_RELEASE("%s\r\n", "www.zwtime.com");
// LOG_RELEASE("wavebox %s\r\n", VERSION);
// LOG_RELEASE("%s\r\n", "www.zwtime.com");
HAL_UART_Receive_IT(&ORDER_UART, &s_order_rxbuf, 1);
set_mode_in_external_pwm_mode();

1176
wave_box_v1.1.hex
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save