diff --git a/.mxproject b/.mxproject
index 51c8d38..3586575 100644
--- a/.mxproject
+++ b/.mxproject
@@ -9,23 +9,23 @@ CDefines=USE_HAL_DRIVER;STM32F103xB;USE_HAL_DRIVER;USE_HAL_DRIVER;
[PreviousGenFiles]
AdvancedFolderStructure=true
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
-HeaderPath#0=E:/stm32_keil_workstation/FilterBox/Core/Inc
+HeaderPath#0=C:/Users/zel/Desktop/filterBox/Core/Inc
HeaderFiles=;
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
-SourcePath#0=E:/stm32_keil_workstation/FilterBox/Core/Src
+SourcePath#0=C:/Users/zel/Desktop/filterBox/Core/Src
SourceFiles=;
diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index 13d1cee..1fbeeee 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -10,6 +10,7 @@
* © Copyright (c) 2021 STMicroelectronics.
* All rights reserved.
*
+
* 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
* License. You may obtain a copy of the License at:
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index 7549652..2e946a9 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -51,6 +51,9 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOB_CLK_ENABLE();
/*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);
/*Configure GPIO pins : PC13 PC14 PC15 */
@@ -58,15 +61,20 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
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;
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 */
GPIO_InitStruct.Pin = GPIO_PIN_4;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 1857408..5611c7d 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -89,7 +89,7 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_USART1_UART_Init();
- // MX_IWDG_Init();
+ //MX_IWDG_Init();
/* USER CODE BEGIN 2 */
extern int app_main(void);
app_main();
diff --git a/FilterBox.ioc b/FilterBox.ioc
index 1fcd049..47bb3c0 100644
--- a/FilterBox.ioc
+++ b/FilterBox.ioc
@@ -13,18 +13,21 @@ Mcu.Name=STM32F103C(8-B)Tx
Mcu.Package=LQFP48
Mcu.Pin0=PD0-OSC_IN
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.UserConstants=
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.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true
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.Signal=USART1_RX
PA13.Mode=Serial_Wire
PA13.Signal=SYS_JTMS-SWDIO
PA14.Mode=Serial_Wire
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.Signal=GPIO_Input
PA9.Mode=Asynchronous
@@ -79,7 +94,7 @@ ProjectManager.FreePins=true
ProjectManager.HalAssertFull=true
ProjectManager.HeapSize=0x200
ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
ProjectManager.LibraryCopy=0
ProjectManager.MainLocation=Core/Src
ProjectManager.NoMain=false
diff --git a/MDK-ARM/FilterBox.uvguix.zel b/MDK-ARM/FilterBox.uvguix.zel
index c85892d..3a7c98f 100644
--- a/MDK-ARM/FilterBox.uvguix.zel
+++ b/MDK-ARM/FilterBox.uvguix.zel
@@ -16,12 +16,12 @@
346
Code Coverage
- 850 656
+ 850 160
204
Performance Analyzer
- 1010 151 151 194
+ 1010
@@ -42,13 +42,13 @@
1937
Watch 2
- 133 249 133
+ 133 133 133
1935
Call Stack + Locals
- 219 133 133
+ 133 133 133
2506
@@ -72,28 +72,28 @@
44
- 2
- 3
+ 0
+ 1
- -32000
- -32000
+ -1
+ -1
-1
-1
- 98
- 117
- 2049
- 1142
+ 18
+ 207
+ 1642
+ 911
0
- 1275
- 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B000000040000000100000040453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C436F72655C5372635C73746D3332663178785F68616C5F6D73702E63000000001373746D3332663178785F68616C5F6D73702E6300000000F6FA7D00FFFFFFFF32453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C7372635C6D61696E5F6170702E63000000000A6D61696E5F6170702E6300000000EAD6A300FFFFFFFF4A453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C6465705C7A7773645F636F6D706F6E656E745C71756575655C7A6C6F6F705F71756575652E68000000000D7A6C6F6F705F71756575652E6800000000B3A6BE00FFFFFFFF41453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000A5C2D700FFFFFFFF33453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF33453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C436F72655C496E635C6D61696E2E6800000000066D61696E2E6800000000F7B88600FFFFFFFF3B453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E63000000009CC1B600FFFFFFFF50453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C6465705C73746D33325F636F6D706F6E656E745F76325C666C6173685C666C6173685F6F7065726174652E63000000000F666C6173685F6F7065726174652E6300000000BCA8E100FFFFFFFF59453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F6770696F2E63000000001473746D3332663178785F68616C5F6770696F2E6300000000F0A0A100FFFFFFFF4A453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C6465705C7A7773645F636F6D706F6E656E745C71756575655C7A6C6F6F705F71756575652E63000000000D7A6C6F6F705F71756575652E6300000000BECEA100FFFFFFFF5A453A5C73746D33325F6B65696C5F776F726B73746174696F6E5C46696C746572426F785C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F666C6173682E63000000001573746D3332663178785F68616C5F666C6173682E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000940100006600000080070000FC020000
+ 912
+ 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000800000001000000010000003B433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C436F72655C5372635C73746D3332663178785F68616C5F6D73702E63000000001373746D3332663178785F68616C5F6D73702E6300000000C5D4F200FFFFFFFF2D433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C7372635C6D61696E5F6170702E63000000000A6D61696E5F6170702E6300000000D9ADC200FFFFFFFF3C433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000F7B88600FFFFFFFF2E433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF2E433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C436F72655C496E635C6D61696E2E6800000000066D61696E2E6800000000BCA8E100FFFFFFFF36433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000F0A0A100FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F6770696F2E63000000001473746D3332663178785F68616C5F6770696F2E6300000000BECEA100FFFFFFFF55433A5C55736572735C7A656C5C4465736B746F705C66696C746572426F785C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F666C6173682E63000000001573746D3332663178785F68616C5F666C6173682E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000006B020000800000006206000073020000
@@ -116,7 +116,7 @@
16
- 940100006600000090050000F4000000
+ 6B02000080000000670600000E010000
@@ -132,7 +132,7 @@
0
16
- 03000000660000008D010000CC020000
+ 03000000660000008D01000029020000
16
@@ -152,7 +152,7 @@
0
16
- 03000000660000008D010000CC020000
+ 03000000660000008D01000029020000
16
@@ -432,7 +432,7 @@
0
16
- 03000000660000008D010000CC020000
+ 03000000660000008D01000029020000
16
@@ -452,7 +452,7 @@
0
16
- 03000000660000008D010000CC020000
+ 03000000660000008D01000029020000
16
@@ -472,7 +472,7 @@
0
16
- 00000000FD02000080070000E6030000
+ 000000005A0200008B05000043030000
16
@@ -512,7 +512,7 @@
0
16
- 03000000000300007D070000CD030000
+ 030000005D020000880500002A030000
16
@@ -1112,7 +1112,7 @@
0
16
- 03000000660000008D010000CC020000
+ 03000000660000008D01000029020000
16
@@ -1132,7 +1132,7 @@
0
16
- 03000000000300007D070000CD030000
+ 030000005D020000880500002A030000
16
@@ -1152,7 +1152,7 @@
0
16
- 03000000000300007D070000CD030000
+ 030000005D020000880500002A030000
16
@@ -1232,7 +1232,7 @@
0
16
- 00000000E603000080070000F9030000
+ 00000000430300008B05000056030000
16
@@ -1281,14 +1281,14 @@
2619
- 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000940100006600000090050000F4000000940100004F00000090050000DD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000023020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000000004000066000000900500003A020000000400004F00000090050000230200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF900100004F00000094010000E5020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000000006600000090010000FC020000000000004F00000090010000E50200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002A02000090050000CC020000000000001302000090050000B502000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000E502000080070000E902000001000000010000100400000001000000E3FCFFFF6F000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000000003000080070000FD03000000000000E902000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
+ 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000006B02000080000000670600000E010000940100004F00000090050000DD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC0300004F0000000004000023020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000D7040000800000006706000054020000000400004F00000090050000230200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF900100004F0000009401000042020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000D7000000800000006702000073020000000000004F00000090010000420200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000D70000004402000067060000E6020000000000001302000090050000B502000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000420200008B0500004602000001000000010000100400000001000000E3FCFFFF6F000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000D700000077020000620600007403000000000000460200008B050000430300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
59392
File
- 2381
- 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000018696E697469616C5F706F736974696F6E5F70726F636573739600000000000000130018696E697469616C5F706F736974696F6E5F70726F636573730C52533438355F52585F4255461252533438355F526563656976655F4461746108686E645F696E6974176170705F73656E645F6D73675F746F5F6170707461736B0F6D6573685F737461636B5F696E69740A70726F647563745F696412676170207374617465206F757464617465640B6472697665725F696E697403626173156D6573685F696E6E65725F6D73675F68616E646C650C6C70735F6D6F64655F73657403636C6B0A6C6F675F6469726563740D55415254305F454E41424C4544124E5246585F55415254305F454E41424C454406554152544531124E5246585F55415254455F454E41424C4544114E5246585F554152545F454E41424C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000
+ 2348
+ 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004646F776E9600000000000000130004646F776E18696E697469616C5F706F736974696F6E5F70726F636573730C52533438355F52585F4255461252533438355F526563656976655F4461746108686E645F696E6974176170705F73656E645F6D73675F746F5F6170707461736B0F6D6573685F737461636B5F696E69740A70726F647563745F696412676170207374617465206F757464617465640B6472697665725F696E697403626173156D6573685F696E6E65725F6D73675F68616E646C650C6C70735F6D6F64655F73657403636C6B0A6C6F675F6469726563740D55415254305F454E41424C4544124E5246585F55415254305F454E41424C454406554152544531124E5246585F55415254455F454E41424C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000
1423
@@ -2585,7 +2585,7 @@
0
100
- 4
+ 1
../Core/Src/stm32f1xx_hal_msp.c
0
@@ -2597,18 +2597,9 @@
..\src\main_app.c
- 0
- 236
- 266
- 1
-
- 0
-
-
- ..\dep\zwsd_component\queue\zloop_queue.h
- 0
- 3
- 13
+ 1
+ 264
+ 295
1
0
@@ -2616,7 +2607,7 @@
startup_stm32f103xb.s
0
- 118
+ 120
133
1
@@ -2625,7 +2616,7 @@
../Core/Src/main.c
0
- 68
+ 70
76
1
@@ -2633,9 +2624,9 @@
../Core/Inc/main.h
- 3
- 3
- 12
+ 2
+ 5
+ 13
1
0
@@ -2643,43 +2634,25 @@
../Core/Src/stm32f1xx_it.c
0
- 79
+ 81
88
1
0
- ..\dep\stm32_component_v2\flash\flash_operate.c
- 0
- 1
- 48
- 1
-
- 0
-
-
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
0
- 423
+ 425
432
1
0
- ..\dep\zwsd_component\queue\zloop_queue.c
- 0
- 250
- 289
- 1
-
- 0
-
-
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
0
- 676
+ 678
689
1
diff --git a/MDK-ARM/FilterBox.uvprojx b/MDK-ARM/FilterBox.uvprojx
index 2257957..20bdea8 100644
--- a/MDK-ARM/FilterBox.uvprojx
+++ b/MDK-ARM/FilterBox.uvprojx
@@ -365,7 +365,7 @@
USE_HAL_DRIVER,STM32F103xB
- ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\dep
+ ../Core/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F1xx/Include; ../Drivers/CMSIS/Include; ..\dep
diff --git a/MDK-ARM/doc/timingctrller20191220.pdf b/MDK-ARM/doc/timingctrller20191220.pdf
new file mode 100644
index 0000000..d51bce3
Binary files /dev/null and b/MDK-ARM/doc/timingctrller20191220.pdf differ
diff --git a/MDK-ARM/startup_stm32f103xb.lst b/MDK-ARM/startup_stm32f103xb.lst
index 63a9755..154c4de 100644
--- a/MDK-ARM/startup_stm32f103xb.lst
+++ b/MDK-ARM/startup_stm32f103xb.lst
@@ -463,11 +463,11 @@ ARM Macro Assembler Page 8
00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
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
diff --git a/README.md b/README.md
index 7d6fae6..833cffb 100644
--- a/README.md
+++ b/README.md
@@ -3,23 +3,36 @@ AT指令说明
[toc]
+## RELEASE
+
+```
+ //版本号在fucntion:app_main修改
+ v1.1
+ 开机点亮蓝色指示灯
+
+```
+
## 调整消抖延时
### 设置指令
+
AT+FILTER_TIME_MS=10
### 查询指令
+
AT+FILTER_TIME_MS?
## 调整输入输出是否镜像
### 设置指令
+
AT+IO_MIRROR=0
AT+IO_MIRROR=1
### 查询指令
+
AT+IO_MIRROR?
## 保存配置到FLASH中
-AT+SAVE
+AT+SAVE
diff --git a/src/main_app.c b/src/main_app.c
index e68b113..264e2b7 100644
--- a/src/main_app.c
+++ b/src/main_app.c
@@ -287,10 +287,15 @@ static const flashdata_t s_flashdata;
// #pragma pack() /*取消指定对齐，恢复缺省对齐*/
#endif
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;
// 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());
// while (true)
// ;