project_filterBox
/
filterBox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

v1.2

master
zhaohe 4 years ago
parent
59fe5ed46a
commit
38eb2cdf3e
5 changed files with 88 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. 64
      MDK-ARM/FilterBox.uvguix.zel
  2. 37
      MDK-ARM/FilterBox.uvoptx
  3. 4
      MDK-ARM/FilterBox.uvprojx
  4. 2
      README.md
  5. 23
      src/main_app.c

64
MDK-ARM/FilterBox.uvguix.zel
File diff suppressed because it is too large
View File

37
MDK-ARM/FilterBox.uvoptx
View File

@ -164,7 +164,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>CMSIS_AGDI</Key> <Key>CMSIS_AGDI</Key>
<Name>-X"fireDAP CMSIS-DAP" -U2e5231d77b0d10a8 -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash/STM32F10x_128.FLM)</Name>
<Name>-X"ATK CMSIS-DAP-Debugger" -UATK 05022018 -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash/STM32F10x_128.FLM)</Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -177,7 +177,40 @@
<Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128 -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name> <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128 -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>95</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134227672</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Core/Src/main.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\FilterBox\../Core/Src/main.c\95</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>291</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134227094</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\src\main_app.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\FilterBox\../src/main_app.c\291</Expression>
</Bp>
</Breakpoint>
<WatchWindow1> <WatchWindow1>
<Ww> <Ww>
<count>0</count> <count>0</count>

4
MDK-ARM/FilterBox.uvprojx
View File

@ -171,11 +171,11 @@
<RunIndependent>0</RunIndependent> <RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging> <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
<Capability>1</Capability> <Capability>1</Capability>
<DriverSelection>4107</DriverSelection>
<DriverSelection>4103</DriverSelection>
</Flash1> </Flash1>
<bUseTDR>1</bUseTDR> <bUseTDR>1</bUseTDR>
<Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2> <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
<Flash3></Flash3>
<Flash3>"" ()</Flash3>
<Flash4></Flash4> <Flash4></Flash4>
<pFcarmOut></pFcarmOut> <pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp> <pFcarmGrp></pFcarmGrp>

2
README.md
View File

@ -9,6 +9,8 @@ AT指令说明
//版本号在fucntion:app_main修改 //版本号在fucntion:app_main修改
v1.1 v1.1
开机点亮绿色指示灯 开机点亮绿色指示灯
v1.2
修复串口无法偶尔无效的bug
``` ```

23
src/main_app.c
View File

@ -100,7 +100,6 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef* husart) {
if (husart == &huart1) { if (husart == &huart1) {
zloop_queue_push_one_u8(&s_rxbufq, rxbuf); zloop_queue_push_one_u8(&s_rxbufq, rxbuf);
lastrxticket = HAL_GetTick(); lastrxticket = HAL_GetTick();
HAL_UART_Receive_IT(&huart1, &rxbuf, 1);
} }
} }
@ -287,14 +286,22 @@ static const flashdata_t s_flashdata;
// #pragma pack() /*取消指定对齐，恢复缺省对齐*/ // #pragma pack() /*取消指定对齐，恢复缺省对齐*/
#endif #endif
int app_main(void) { int app_main(void) {
printf("software version:%s\n", "v1.1");
printf("flash add:%x\n", &s_flashdata);
printf("software version:v1.2\n");
// printf("flash add:%x\n", &s_flashdata);
// s_flashdata.configflashBufSize[1] = 0; // s_flashdata.configflashBufSize[1] = 0;
// prv_set_out_state(prv_get_in_state()); // prv_set_out_state(prv_get_in_state());
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1, GPIO_PIN_RESET);//r
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_2, GPIO_PIN_SET);//g
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_3, GPIO_PIN_RESET);//b
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1, GPIO_PIN_RESET); // r
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_2, GPIO_PIN_RESET); // g
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_3, GPIO_PIN_RESET); // b
for (size_t i = 0; i < 3; i++) {
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_3, GPIO_PIN_SET); // b
HAL_Delay(300);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_3, GPIO_PIN_RESET); // b
HAL_Delay(300);
}
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_3, GPIO_PIN_SET); // b
prv_set_out_state(prv_get_in_state()); prv_set_out_state(prv_get_in_state());
// while (true) // while (true)
@ -315,6 +322,10 @@ int app_main(void) {
// HAL_IWDG_Refresh(&hiwdg); // HAL_IWDG_Refresh(&hiwdg);
filterProcess(); filterProcess();
atProcess(); atProcess();
if (huart1.RxState == HAL_UART_STATE_READY) {
HAL_UART_Receive_IT(&huart1, &rxbuf, 1);
}
} }
// //
} }
Write Preview
Loading…
Cancel
Save