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

v1.1开机点亮指示灯

master
zhaohe 4 years ago
parent
2cbbac5022
commit
7210c26629
11 changed files with 125 additions and 110 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. 28
      .mxproject
  2. 1
      Core/Inc/main.h
  3. 20
      Core/Src/gpio.c
  4. 2
      Core/Src/main.c
  5. 41
      FilterBox.ioc
  6. 107
      MDK-ARM/FilterBox.uvguix.zel
  7. 2
      MDK-ARM/FilterBox.uvprojx
  8. BIN
      MDK-ARM/doc/timingctrller20191220.pdf
  9. 10
      MDK-ARM/startup_stm32f103xb.lst
  10. 15
      README.md
  11. 9
      src/main_app.c

28
.mxproject
View File

@ -9,23 +9,23 @@ CDefines=USE_HAL_DRIVER;STM32F103xB;USE_HAL_DRIVER;USE_HAL_DRIVER;
[PreviousGenFiles] [PreviousGenFiles]
AdvancedFolderStructure=true AdvancedFolderStructure=true
HeaderFileListSize=6 HeaderFileListSize=6
HeaderFiles#0=E:/stm32_keil_workstation/FilterBox/Core/Inc/gpio.h
HeaderFiles#1=E:/stm32_keil_workstation/FilterBox/Core/Inc/iwdg.h
HeaderFiles#2=E:/stm32_keil_workstation/FilterBox/Core/Inc/usart.h
HeaderFiles#3=E:/stm32_keil_workstation/FilterBox/Core/Inc/stm32f1xx_it.h
HeaderFiles#4=E:/stm32_keil_workstation/FilterBox/Core/Inc/stm32f1xx_hal_conf.h
HeaderFiles#5=E:/stm32_keil_workstation/FilterBox/Core/Inc/main.h
HeaderFiles#0=C:/Users/zel/Desktop/filterBox/Core/Inc/gpio.h
HeaderFiles#1=C:/Users/zel/Desktop/filterBox/Core/Inc/iwdg.h
HeaderFiles#2=C:/Users/zel/Desktop/filterBox/Core/Inc/usart.h
HeaderFiles#3=C:/Users/zel/Desktop/filterBox/Core/Inc/stm32f1xx_it.h
HeaderFiles#4=C:/Users/zel/Desktop/filterBox/Core/Inc/stm32f1xx_hal_conf.h
HeaderFiles#5=C:/Users/zel/Desktop/filterBox/Core/Inc/main.h
HeaderFolderListSize=1 HeaderFolderListSize=1
HeaderPath#0=E:/stm32_keil_workstation/FilterBox/Core/Inc
HeaderPath#0=C:/Users/zel/Desktop/filterBox/Core/Inc
HeaderFiles=; HeaderFiles=;
SourceFileListSize=6 SourceFileListSize=6
SourceFiles#0=E:/stm32_keil_workstation/FilterBox/Core/Src/gpio.c
SourceFiles#1=E:/stm32_keil_workstation/FilterBox/Core/Src/iwdg.c
SourceFiles#2=E:/stm32_keil_workstation/FilterBox/Core/Src/usart.c
SourceFiles#3=E:/stm32_keil_workstation/FilterBox/Core/Src/stm32f1xx_it.c
SourceFiles#4=E:/stm32_keil_workstation/FilterBox/Core/Src/stm32f1xx_hal_msp.c
SourceFiles#5=E:/stm32_keil_workstation/FilterBox/Core/Src/main.c
SourceFiles#0=C:/Users/zel/Desktop/filterBox/Core/Src/gpio.c
SourceFiles#1=C:/Users/zel/Desktop/filterBox/Core/Src/iwdg.c
SourceFiles#2=C:/Users/zel/Desktop/filterBox/Core/Src/usart.c
SourceFiles#3=C:/Users/zel/Desktop/filterBox/Core/Src/stm32f1xx_it.c
SourceFiles#4=C:/Users/zel/Desktop/filterBox/Core/Src/stm32f1xx_hal_msp.c
SourceFiles#5=C:/Users/zel/Desktop/filterBox/Core/Src/main.c
SourceFolderListSize=1 SourceFolderListSize=1
SourcePath#0=E:/stm32_keil_workstation/FilterBox/Core/Src
SourcePath#0=C:/Users/zel/Desktop/filterBox/Core/Src
SourceFiles=; SourceFiles=;

1
Core/Inc/main.h
View File

@ -10,6 +10,7 @@
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics. * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* All rights reserved.</center></h2> * All rights reserved.</center></h2>
* *
* This software component is licensed by ST under BSD 3-Clause license, * This software component is licensed by ST under BSD 3-Clause license,
* the "License"; You may not use this file except in compliance with the * the "License"; You may not use this file except in compliance with the
* License. You may obtain a copy of the License at: * License. You may obtain a copy of the License at:

20
Core/Src/gpio.c
View File

@ -51,6 +51,9 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */ /*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOB, GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9, GPIO_PIN_RESET);
/*Configure GPIO pins : PC13 PC14 PC15 */ /*Configure GPIO pins : PC13 PC14 PC15 */
@ -58,15 +61,20 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
/*Configure GPIO pins : PA0 PA1 PA2 PA3
PA5 PA6 PA7 PA8
PA11 PA12 PA15 */
GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3
|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_15;
/*Configure GPIO pins : PA0 PA5 PA6 PA7
PA8 PA11 PA12 PA15 */
GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7
|GPIO_PIN_8|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_15;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/*Configure GPIO pins : PA1 PA2 PA3 */
GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/*Configure GPIO pin : PA4 */ /*Configure GPIO pin : PA4 */
GPIO_InitStruct.Pin = GPIO_PIN_4; GPIO_InitStruct.Pin = GPIO_PIN_4;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;

2
Core/Src/main.c
View File

@ -89,7 +89,7 @@ int main(void)
/* Initialize all configured peripherals */ /* Initialize all configured peripherals */
MX_GPIO_Init(); MX_GPIO_Init();
MX_USART1_UART_Init(); MX_USART1_UART_Init();
// MX_IWDG_Init();
//MX_IWDG_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
extern int app_main(void); extern int app_main(void);
app_main(); app_main();

41
FilterBox.ioc
View File

@ -13,18 +13,21 @@ Mcu.Name=STM32F103C(8-B)Tx
Mcu.Package=LQFP48 Mcu.Package=LQFP48
Mcu.Pin0=PD0-OSC_IN Mcu.Pin0=PD0-OSC_IN
Mcu.Pin1=PD1-OSC_OUT Mcu.Pin1=PD1-OSC_OUT
Mcu.Pin10=PB9
Mcu.Pin11=VP_IWDG_VS_IWDG
Mcu.Pin12=VP_SYS_VS_Systick
Mcu.Pin2=PA4
Mcu.Pin3=PA9
Mcu.Pin4=PA10
Mcu.Pin5=PA13
Mcu.Pin6=PA14
Mcu.Pin7=PB6
Mcu.Pin8=PB7
Mcu.Pin9=PB8
Mcu.PinsNb=13
Mcu.Pin10=PB6
Mcu.Pin11=PB7
Mcu.Pin12=PB8
Mcu.Pin13=PB9
Mcu.Pin14=VP_IWDG_VS_IWDG
Mcu.Pin15=VP_SYS_VS_Systick
Mcu.Pin2=PA1
Mcu.Pin3=PA2
Mcu.Pin4=PA3
Mcu.Pin5=PA4
Mcu.Pin6=PA9
Mcu.Pin7=PA10
Mcu.Pin8=PA13
Mcu.Pin9=PA14
Mcu.PinsNb=16
Mcu.ThirdPartyNb=0 Mcu.ThirdPartyNb=0
Mcu.UserConstants= Mcu.UserConstants=
Mcu.UserName=STM32F103C8Tx Mcu.UserName=STM32F103C8Tx
@ -42,12 +45,24 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true
NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
PA1.GPIOParameters=GPIO_PuPd
PA1.GPIO_PuPd=GPIO_PULLUP
PA1.Locked=true
PA1.Signal=GPIO_Output
PA10.Mode=Asynchronous PA10.Mode=Asynchronous
PA10.Signal=USART1_RX PA10.Signal=USART1_RX
PA13.Mode=Serial_Wire PA13.Mode=Serial_Wire
PA13.Signal=SYS_JTMS-SWDIO PA13.Signal=SYS_JTMS-SWDIO
PA14.Mode=Serial_Wire PA14.Mode=Serial_Wire
PA14.Signal=SYS_JTCK-SWCLK PA14.Signal=SYS_JTCK-SWCLK
PA2.GPIOParameters=GPIO_PuPd
PA2.GPIO_PuPd=GPIO_PULLUP
PA2.Locked=true
PA2.Signal=GPIO_Output
PA3.GPIOParameters=GPIO_PuPd
PA3.GPIO_PuPd=GPIO_PULLUP
PA3.Locked=true
PA3.Signal=GPIO_Output
PA4.Locked=true PA4.Locked=true
PA4.Signal=GPIO_Input PA4.Signal=GPIO_Input
PA9.Mode=Asynchronous PA9.Mode=Asynchronous
@ -79,7 +94,7 @@ ProjectManager.FreePins=true
ProjectManager.HalAssertFull=true ProjectManager.HalAssertFull=true
ProjectManager.HeapSize=0x200 ProjectManager.HeapSize=0x200
ProjectManager.KeepUserCode=true ProjectManager.KeepUserCode=true
ProjectManager.LastFirmware=true
ProjectManager.LastFirmware=false
ProjectManager.LibraryCopy=0 ProjectManager.LibraryCopy=0
ProjectManager.MainLocation=Core/Src ProjectManager.MainLocation=Core/Src
ProjectManager.NoMain=false ProjectManager.NoMain=false

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

2
MDK-ARM/FilterBox.uvprojx
View File

@ -365,7 +365,7 @@
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>USE_HAL_DRIVER,STM32F103xB</Define> <Define>USE_HAL_DRIVER,STM32F103xB</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\dep</IncludePath>
<IncludePath>../Core/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F1xx/Include; ../Drivers/CMSIS/Include; ..\dep</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>

BIN
MDK-ARM/doc/timingctrller20191220.pdf
View File

10
MDK-ARM/startup_stm32f103xb.lst
View File

@ -463,11 +463,11 @@ ARM Macro Assembler Page 8
00000000 00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
ork --depend=filterbox\startup_stm32f103xb.d -ofilterbox\startup_stm32f103xb.o ork --depend=filterbox\startup_stm32f103xb.d -ofilterbox\startup_stm32f103xb.o
-IE:\stm32_keil_workstation\FilterBox\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMS
IS\5.4.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0 --pr
edefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 514" --predefin
e="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.l
st startup_stm32f103xb.s
-IC:\Users\zel\Desktop\filterBox\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.
4.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0 --predefi
ne="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 514" --predefine="_R
TE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.lst st
artup_stm32f103xb.s

15
README.md
View File

@ -3,23 +3,36 @@ AT指令说明
[toc] [toc]
## RELEASE
```
//版本号在fucntion:app_main修改
v1.1
开机点亮蓝色指示灯
```
## 调整消抖延时 ## 调整消抖延时
### 设置指令 ### 设置指令
AT+FILTER_TIME_MS=10 AT+FILTER_TIME_MS=10
### 查询指令 ### 查询指令
AT+FILTER_TIME_MS? AT+FILTER_TIME_MS?
## 调整输入输出是否镜像 ## 调整输入输出是否镜像
### 设置指令 ### 设置指令
AT+IO_MIRROR=0 AT+IO_MIRROR=0
AT+IO_MIRROR=1 AT+IO_MIRROR=1
### 查询指令 ### 查询指令
AT+IO_MIRROR? AT+IO_MIRROR?
## 保存配置到FLASH中 ## 保存配置到FLASH中
AT+SAVE
AT+SAVE

9
src/main_app.c
View File

@ -287,10 +287,15 @@ static const flashdata_t s_flashdata;
// #pragma pack() /*取消指定对齐，恢复缺省对齐*/ // #pragma pack() /*取消指定对齐，恢复缺省对齐*/
#endif #endif
int app_main(void) { int app_main(void) {
LOG("software version:%s", "v1.0");
LOG("flash add:%x", &s_flashdata);
printf("software version:%s\n", "v1.1");
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
prv_set_out_state(prv_get_in_state()); prv_set_out_state(prv_get_in_state());
// while (true) // while (true)
// ; // ;

Write Preview
Loading…
Cancel
Save