diff --git a/MDK-ARM/DebugConfig/semi-finished_product_testing_STM32F407VGTx.dbgconf b/MDK-ARM/DebugConfig/semi-finished_product_testing_STM32F407VGTx.dbgconf deleted file mode 100644 index 1df0a1b..0000000 --- a/MDK-ARM/DebugConfig/semi-finished_product_testing_STM32F407VGTx.dbgconf +++ /dev/null @@ -1,48 +0,0 @@ -// File: STM32F405_415_407_417_427_437_429_439.dbgconf -// Version: 1.0.0 -// Note: refer to STM32F405/415 STM32F407/417 STM32F427/437 STM32F429/439 reference manual (RM0090) -// refer to STM32F40x STM32F41x datasheets -// refer to STM32F42x STM32F43x datasheets - -// <<< Use Configuration Wizard in Context Menu >>> - -// Debug MCU configuration register (DBGMCU_CR) -// DBG_STANDBY Debug Standby Mode -// DBG_STOP Debug Stop Mode -// DBG_SLEEP Debug Sleep Mode -// -DbgMCU_CR = 0x00000007; - -// Debug MCU APB1 freeze register (DBGMCU_APB1_FZ) -// Reserved bits must be kept at reset value -// DBG_CAN2_STOP CAN2 stopped when core is halted -// DBG_CAN1_STOP CAN2 stopped when core is halted -// DBG_I2C3_SMBUS_TIMEOUT I2C3 SMBUS timeout mode stopped when core is halted -// DBG_I2C2_SMBUS_TIMEOUT I2C2 SMBUS timeout mode stopped when core is halted -// DBG_I2C1_SMBUS_TIMEOUT I2C1 SMBUS timeout mode stopped when core is halted -// DBG_IWDG_STOP Independent watchdog stopped when core is halted -// DBG_WWDG_STOP Window watchdog stopped when core is halted -// DBG_RTC_STOP RTC stopped when core is halted -// DBG_TIM14_STOP TIM14 counter stopped when core is halted -// DBG_TIM13_STOP TIM13 counter stopped when core is halted -// DBG_TIM12_STOP TIM12 counter stopped when core is halted -// DBG_TIM7_STOP TIM7 counter stopped when core is halted -// DBG_TIM6_STOP TIM6 counter stopped when core is halted -// DBG_TIM5_STOP TIM5 counter stopped when core is halted -// DBG_TIM4_STOP TIM4 counter stopped when core is halted -// DBG_TIM3_STOP TIM3 counter stopped when core is halted -// DBG_TIM2_STOP TIM2 counter stopped when core is halted -// -DbgMCU_APB1_Fz = 0x00000000; - -// Debug MCU APB2 freeze register (DBGMCU_APB2_FZ) -// Reserved bits must be kept at reset value -// DBG_TIM11_STOP TIM11 counter stopped when core is halted -// DBG_TIM10_STOP TIM10 counter stopped when core is halted -// DBG_TIM9_STOP TIM9 counter stopped when core is halted -// DBG_TIM8_STOP TIM8 counter stopped when core is halted -// DBG_TIM1_STOP TIM1 counter stopped when core is halted -// -DbgMCU_APB2_Fz = 0x00000000; - -// <<< end of configuration section >>> \ No newline at end of file diff --git a/MDK-ARM/RTE/_semi-finished_product_testing/RTE_Components.h b/MDK-ARM/RTE/_signal_generator/RTE_Components.h similarity index 75% rename from MDK-ARM/RTE/_semi-finished_product_testing/RTE_Components.h rename to MDK-ARM/RTE/_signal_generator/RTE_Components.h index 3ea7478..427fac9 100644 --- a/MDK-ARM/RTE/_semi-finished_product_testing/RTE_Components.h +++ b/MDK-ARM/RTE/_signal_generator/RTE_Components.h @@ -3,8 +3,8 @@ * Auto generated Run-Time-Environment Configuration File * *** Do not modify ! *** * - * Project: 'semi-finished_product_testing' - * Target: 'semi-finished_product_testing' + * Project: 'signal_generator' + * Target: 'signal_generator' */ #ifndef RTE_COMPONENTS_H diff --git a/MDK-ARM/semi-finished_product_testing.uvoptx b/MDK-ARM/signal_generator.uvoptx similarity index 90% rename from MDK-ARM/semi-finished_product_testing.uvoptx rename to MDK-ARM/signal_generator.uvoptx index a153d80..e90d26e 100644 --- a/MDK-ARM/semi-finished_product_testing.uvoptx +++ b/MDK-ARM/signal_generator.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -22,7 +22,7 @@ - semi-finished_product_testing + signal_generator 0x4 ARM-ADS @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -104,39 +104,19 @@ 0 0 6 - - - - - - - - - - + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll - - 0 - ARMRTXEVENTFLAGS - -L70 -Z18 -C0 -M0 -T1 - - - 0 - DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) - - - 0 - ARMDBGFLAGS - - - - 0 - DLGUARM - (105=-1,-1,-1,-1,0) - 0 UL2CM3 @@ -145,160 +125,10 @@ 0 ST-LINKIII-KEIL_SWO - -U090F00028316303030303032 -O2254 -SF1000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) + -U090F00028316303030303032 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) - - - - 0 - 1 - current_buff - - - 1 - 1 - ad7124_analog - - - 2 - 1 - xReturn - - - 3 - 1 - direction - - - 4 - 1 - encode_num,0x0A - - - 5 - 1 - htim1,0x0A - - - 6 - 1 - lwip_taskHandle - - - 7 - 1 - led_taskHandle - - - 8 - 1 - dac_taskHandle - - - 9 - 1 - adc_taskHandle - - - 10 - 1 - gpio_di_do_taskHandle - - - 11 - 1 - ec11_taskHandle - - - 12 - 1 - di_state_last - - - 13 - 1 - di_state_now - - - 14 - 1 - tcp_echo_flags_control - - - 15 - 1 - state - - - 16 - 1 - IP_ADDRESS,0x10 - - - 17 - 1 - ipaddr,0x10 - - - 18 - 1 - ip_addr_str,0x0A - - - 19 - 1 - gnetif - - - 20 - 1 - MACConf - - - 21 - 1 - heth - - - 22 - 1 - ip_addr - - - 23 - 1 - tcp_rx_data - - - 24 - 1 - MACAddr - - - 25 - 1 - heth - - - 26 - 1 - gnetif,0x10 - - - 27 - 1 - ipaddr - - - - - 1 - 0 - 0x080E0000 - 0 - - + 0 @@ -328,25 +158,25 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + - 0 + 1 0 0 2 - 1800000 + 10000000 @@ -373,7 +203,7 @@ Application/User/Core - 1 + 0 0 0 0 @@ -1912,7 +1742,7 @@ - User/board + User/application 0 0 0 @@ -1924,46 +1754,14 @@ 0 0 0 - ..\User\board\src\leds.c - leds.c - 0 - 0 - - - - - User/application - 1 - 0 - 0 - 0 - - 11 - 126 - 1 - 0 - 0 - 0 - ..\User\application\src\ble_mx_02.c - ble_mx_02.c - 0 - 0 - - - 11 - 127 - 1 - 0 - 0 - 0 ..\User\application\src\communication_protocol.c communication_protocol.c 0 0 - 11 - 128 + 10 + 126 1 0 0 @@ -1974,8 +1772,8 @@ 0 - 11 - 129 + 10 + 127 1 0 0 @@ -1986,8 +1784,8 @@ 0 - 11 - 130 + 10 + 128 1 0 0 @@ -1999,15 +1797,35 @@ + + User/board + 0 + 0 + 0 + 0 + + 11 + 129 + 1 + 0 + 0 + 0 + ..\User\board\src\leds.c + leds.c + 0 + 0 + + + User/driver - 1 + 0 0 0 0 12 - 131 + 130 1 0 0 @@ -2019,7 +1837,7 @@ 12 - 132 + 131 1 0 0 @@ -2031,7 +1849,7 @@ 12 - 133 + 132 1 0 0 @@ -2043,7 +1861,7 @@ 12 - 134 + 133 1 0 0 @@ -2057,10 +1875,22 @@ User/system - 1 + 0 0 0 0 + + 13 + 134 + 1 + 0 + 0 + 0 + ..\User\system\user_flash.c + user_flash.c + 0 + 0 + 13 135 @@ -2085,18 +1915,6 @@ 0 0 - - 13 - 137 - 1 - 0 - 0 - 0 - ..\User\system\user_flash.c - user_flash.c - 0 - 0 - diff --git a/MDK-ARM/semi-finished_product_testing.uvprojx b/MDK-ARM/signal_generator.uvprojx similarity index 94% rename from MDK-ARM/semi-finished_product_testing.uvprojx rename to MDK-ARM/signal_generator.uvprojx index 0f3605d..4cf0866 100644 --- a/MDK-ARM/semi-finished_product_testing.uvprojx +++ b/MDK-ARM/signal_generator.uvprojx @@ -1,10 +1,13 @@ - - + + + 2.1 +
### uVision Project, (C) Keil Software
+ - semi-finished_product_testing + signal_generator 0x4 ARM-ADS 5060960::V5.06 update 7 (build 960)::.\ARMCC @@ -16,28 +19,28 @@ Keil.STM32F4xx_DFP.2.17.1 https://www.keil.com/pack/ IRAM(0x20000000-0x2001BFFF) IRAM2(0x2001C000-0x2001FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ - - - + + + 0 - - - - - - - - - - - $$Device:STM32F407VGTx$CMSIS\SVD\STM32F40x.svd + + + + + + + + + + + $$Device:STM32F407VGTx$CMSIS\SVD\STM32F407.svd 0 0 - - - - - + + + + + 0 0 @@ -45,22 +48,22 @@ 0 1 - semi-finished_product_testing\ - semi-finished_product_testing + signal_generator\ + signal_generator 1 0 1 1 0 - + 1 0 0 0 0 - - + + 0 0 0 @@ -69,8 +72,8 @@ 0 0 - - + + 0 0 0 @@ -79,15 +82,15 @@ 0 0 - - + + 0 0 0 0 1 - + 0 @@ -101,8 +104,8 @@ 0 0 3 - - + + 0 @@ -135,11 +138,11 @@ 1 BIN\UL2V8M.DLL - "" () - - - - + + + + + 0 @@ -172,7 +175,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -306,7 +309,7 @@ 0x4000 - + 1 @@ -333,10 +336,10 @@ 0 0 - + USE_HAL_DRIVER,STM32F407xx - - ../Core/Inc;../LWIP/App;../LWIP/Target;../Middlewares/Third_Party/LwIP/src/include;../Middlewares/Third_Party/LwIP/system;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/BSP/Components/lan8742;../Middlewares/Third_Party/LwIP/src/include/netif/ppp;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Middlewares/Third_Party/LwIP/src/include/lwip;../Middlewares/Third_Party/LwIP/src/include/lwip/apps;../Middlewares/Third_Party/LwIP/src/include/lwip/priv;../Middlewares/Third_Party/LwIP/src/include/lwip/prot;../Middlewares/Third_Party/LwIP/src/include/netif;../Middlewares/Third_Party/LwIP/src/include/compat/posix;../Middlewares/Third_Party/LwIP/src/include/compat/posix/arpa;../Middlewares/Third_Party/LwIP/src/include/compat/posix/net;../Middlewares/Third_Party/LwIP/src/include/compat/posix/sys;../Middlewares/Third_Party/LwIP/src/include/compat/stdc;../Middlewares/Third_Party/LwIP/system/arch;../Drivers/CMSIS/Include;../User/application/inc;../User/board/inc;../User/driver;../User/system + + ../Core/Inc;../LWIP/App;../LWIP/Target;../Middlewares/Third_Party/LwIP/src/include;../Middlewares/Third_Party/LwIP/system;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Drivers/BSP/Components/lan8742;../Middlewares/Third_Party/LwIP/src/include/netif/ppp;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Middlewares/Third_Party/LwIP/src/include/lwip;../Middlewares/Third_Party/LwIP/src/include/lwip/apps;../Middlewares/Third_Party/LwIP/src/include/lwip/priv;../Middlewares/Third_Party/LwIP/src/include/lwip/prot;../Middlewares/Third_Party/LwIP/src/include/netif;../Middlewares/Third_Party/LwIP/src/include/compat/posix;../Middlewares/Third_Party/LwIP/src/include/compat/posix/arpa;../Middlewares/Third_Party/LwIP/src/include/compat/posix/net;../Middlewares/Third_Party/LwIP/src/include/compat/posix/sys;../Middlewares/Third_Party/LwIP/src/include/compat/stdc;../Middlewares/Third_Party/LwIP/system/arch;../Drivers/CMSIS/Include;..\User\application\inc;..\User\board\inc;..\User\driver;..\User\system @@ -351,9 +354,9 @@ 0 1 - - - + + + ../Core/Inc @@ -364,15 +367,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -1042,24 +1045,9 @@ - - User/board - - - leds.c - 1 - ..\User\board\src\leds.c - - - User/application - - ble_mx_02.c - 1 - ..\User\application\src\ble_mx_02.c - communication_protocol.c 1 @@ -1082,6 +1070,16 @@ + + User/board + + + leds.c + 1 + ..\User\board\src\leds.c + + + User/driver @@ -1110,6 +1108,11 @@ User/system + + user_flash.c + 1 + ..\User\system\user_flash.c + user_gpio.c 1 @@ -1120,11 +1123,6 @@ 1 ..\User\system\user_spi.c - - user_flash.c - 1 - ..\User\system\user_flash.c - @@ -1133,25 +1131,27 @@ + - + - + - + - + + - semi-finished_product_testing + signal_generator 1 - + diff --git a/MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.hex b/MDK-ARM/signal_generator/signal_generator.hex similarity index 99% rename from MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.hex rename to MDK-ARM/signal_generator/signal_generator.hex index 238eac7..bb0cde4 100644 --- a/MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.hex +++ b/MDK-ARM/signal_generator/signal_generator.hex @@ -727,7 +727,7 @@ :102D50000846006800F48050009000BF00BF00BF2C :102D60000020009010481438006840F002000E491E :102D7000143908600846006800F00200009000BFA7 -:102D800000BF382001900220029000200390032011 +:102D800000BF382001900220029001200390032010 :102D900004900520059001A90448FFF777F906B0D3 :102DA00010BD0000003001404438024000040240E1 :102DB0002DE9FF5F0446884691461D460E9E012080 diff --git a/MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.sct b/MDK-ARM/signal_generator/signal_generator.sct similarity index 100% rename from MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.sct rename to MDK-ARM/signal_generator/signal_generator.sct diff --git a/semi-finished_product_testing.ioc b/semi-finished_product_testing.ioc index 212b94d..f542550 100644 --- a/semi-finished_product_testing.ioc +++ b/semi-finished_product_testing.ioc @@ -620,8 +620,8 @@ ProjectManager.MainLocation=Core/Src ProjectManager.NoMain=false ProjectManager.PreviousToolchain= ProjectManager.ProjectBuild=false -ProjectManager.ProjectFileName=semi-finished_product_testing.ioc -ProjectManager.ProjectName=semi-finished_product_testing +ProjectManager.ProjectFileName=signal_generator.ioc +ProjectManager.ProjectName=signal_generator ProjectManager.ProjectStructure= ProjectManager.RegisterCallBack= ProjectManager.StackSize=0x400