diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 6b9204a..55c1c63 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -53,7 +53,7 @@ void MX_GPIO_Init(void) __HAL_RCC_GPIOD_CLK_ENABLE(); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOC, ETH_RESET_Pin|DO_CH7_Pin|DO_CH12_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(ETH_RESET_GPIO_Port, ETH_RESET_Pin, GPIO_PIN_SET); /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOB, LED_R_Pin|LED_G_Pin|DO_EN_Pin, GPIO_PIN_SET); @@ -65,15 +65,15 @@ void MX_GPIO_Init(void) HAL_GPIO_WritePin(GPIOB, RELAY_1_Pin|RELAY_2_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOD, RELAY_3_Pin|RELAY_4_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOD, RELAY_3_Pin|RELAY_4_Pin|DO_CH1_Pin|DO_CH2_Pin + |DO_CH3_Pin|DO_CH4_Pin|DO_CH5_Pin|DO_CH6_Pin + |DO_CH13_Pin|DO_CH14_Pin|DO_CH15_Pin|DO_CH16_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOD, DO_CH1_Pin|DO_CH2_Pin|DO_CH3_Pin|DO_CH4_Pin - |DO_CH5_Pin|DO_CH6_Pin|DO_CH13_Pin|DO_CH14_Pin - |DO_CH15_Pin|DO_CH16_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(GPIOC, DO_CH7_Pin|DO_CH12_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOA, DO_CH8_Pin|DO_CH9_Pin|DO_CH10_Pin|DO_CH11_Pin, GPIO_PIN_SET); + HAL_GPIO_WritePin(GPIOA, DO_CH8_Pin|DO_CH9_Pin|DO_CH10_Pin|DO_CH11_Pin, GPIO_PIN_RESET); /*Configure GPIO pins : PEPin PEPin PEPin PEPin PEPin PEPin PEPin */ diff --git a/MDK-ARM/DebugConfig/remote_dido_unit_STM32F407VGTx.dbgconf b/MDK-ARM/DebugConfig/remote_dido_unit_STM32F407VGTx.dbgconf new file mode 100644 index 0000000..1df0a1b --- /dev/null +++ b/MDK-ARM/DebugConfig/remote_dido_unit_STM32F407VGTx.dbgconf @@ -0,0 +1,48 @@ +// 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/remote_dido_unit.uvoptx b/MDK-ARM/remote_dido_unit.uvoptx index 8451f46..a936f77 100644 --- a/MDK-ARM/remote_dido_unit.uvoptx +++ b/MDK-ARM/remote_dido_unit.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -104,16 +104,16 @@ 0 0 6 - - - - - - - - - - + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll @@ -130,7 +130,7 @@ 0 ARMDBGFLAGS - + 0 @@ -148,7 +148,7 @@ -U-O142 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) - + 0 @@ -185,19 +185,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + 1 0 diff --git a/MDK-ARM/remote_dido_unit.uvprojx b/MDK-ARM/remote_dido_unit.uvprojx index eb3cd7c..96350e4 100644 --- a/MDK-ARM/remote_dido_unit.uvprojx +++ b/MDK-ARM/remote_dido_unit.uvprojx @@ -1,10 +1,7 @@ - - - + + 2.1 -
### uVision Project, (C) Keil Software
- remote_dido_unit @@ -19,28 +16,28 @@ Keil.STM32F4xx_DFP.2.12.0 http://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 0 0 - - - - - + + + + + 0 0 @@ -55,15 +52,15 @@ 0 1 0 - + 1 0 0 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -82,15 +79,15 @@ 0 0 - - + + 0 0 0 0 1 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 0 @@ -139,10 +136,10 @@ 1 BIN\UL2V8M.DLL "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -309,7 +306,7 @@ 0x4000 - + 1 @@ -336,9 +333,9 @@ 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/system;../User/board/inc @@ -354,9 +351,9 @@ 0 1 - - - + + + ../Core/Inc @@ -367,15 +364,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -1066,20 +1063,18 @@ - - + - + - + - + - @@ -1088,5 +1083,5 @@ -
+ diff --git a/remote_dido_unit.ioc b/remote_dido_unit.ioc index 506fc94..37bc523 100644 --- a/remote_dido_unit.ioc +++ b/remote_dido_unit.ioc @@ -135,13 +135,13 @@ PA11.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PA11.GPIO_Label=DO_CH9 PA11.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA11.Locked=true -PA11.PinState=GPIO_PIN_SET +PA11.PinState=GPIO_PIN_RESET PA11.Signal=GPIO_Output PA12.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PA12.GPIO_Label=DO_CH10 PA12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA12.Locked=true -PA12.PinState=GPIO_PIN_SET +PA12.PinState=GPIO_PIN_RESET PA12.Signal=GPIO_Output PA13.Mode=Serial_Wire PA13.Signal=SYS_JTMS-SWDIO @@ -151,7 +151,7 @@ PA15.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PA15.GPIO_Label=DO_CH11 PA15.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA15.Locked=true -PA15.PinState=GPIO_PIN_SET +PA15.PinState=GPIO_PIN_RESET PA15.Signal=GPIO_Output PA2.Mode=RMII PA2.Signal=ETH_MDIO @@ -161,7 +161,7 @@ PA8.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PA8.GPIO_Label=DO_CH8 PA8.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA8.Locked=true -PA8.PinState=GPIO_PIN_SET +PA8.PinState=GPIO_PIN_RESET PA8.Signal=GPIO_Output PB1.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PB1.GPIO_Label=LED_R @@ -234,7 +234,7 @@ PC12.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PC12.GPIO_Label=DO_CH12 PC12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PC12.Locked=true -PC12.PinState=GPIO_PIN_SET +PC12.PinState=GPIO_PIN_RESET PC12.Signal=GPIO_Output PC4.Mode=RMII PC4.Signal=ETH_RXD0 @@ -244,67 +244,67 @@ PC9.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PC9.GPIO_Label=DO_CH7 PC9.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PC9.Locked=true -PC9.PinState=GPIO_PIN_SET +PC9.PinState=GPIO_PIN_RESET PC9.Signal=GPIO_Output PD0.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD0.GPIO_Label=DO_CH13 PD0.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD0.Locked=true -PD0.PinState=GPIO_PIN_SET +PD0.PinState=GPIO_PIN_RESET PD0.Signal=GPIO_Output PD1.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD1.GPIO_Label=DO_CH14 PD1.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD1.Locked=true -PD1.PinState=GPIO_PIN_SET +PD1.PinState=GPIO_PIN_RESET PD1.Signal=GPIO_Output PD10.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD10.GPIO_Label=DO_CH1 PD10.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD10.Locked=true -PD10.PinState=GPIO_PIN_SET +PD10.PinState=GPIO_PIN_RESET PD10.Signal=GPIO_Output PD11.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD11.GPIO_Label=DO_CH2 PD11.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD11.Locked=true -PD11.PinState=GPIO_PIN_SET +PD11.PinState=GPIO_PIN_RESET PD11.Signal=GPIO_Output PD12.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD12.GPIO_Label=DO_CH3 PD12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD12.Locked=true -PD12.PinState=GPIO_PIN_SET +PD12.PinState=GPIO_PIN_RESET PD12.Signal=GPIO_Output PD13.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD13.GPIO_Label=DO_CH4 PD13.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD13.Locked=true -PD13.PinState=GPIO_PIN_SET +PD13.PinState=GPIO_PIN_RESET PD13.Signal=GPIO_Output PD14.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD14.GPIO_Label=DO_CH5 PD14.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD14.Locked=true -PD14.PinState=GPIO_PIN_SET +PD14.PinState=GPIO_PIN_RESET PD14.Signal=GPIO_Output PD15.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD15.GPIO_Label=DO_CH6 PD15.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD15.Locked=true -PD15.PinState=GPIO_PIN_SET +PD15.PinState=GPIO_PIN_RESET PD15.Signal=GPIO_Output PD2.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD2.GPIO_Label=DO_CH15 PD2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD2.Locked=true -PD2.PinState=GPIO_PIN_SET +PD2.PinState=GPIO_PIN_RESET PD2.Signal=GPIO_Output PD3.GPIOParameters=GPIO_Speed,PinState,GPIO_Label PD3.GPIO_Label=DO_CH16 PD3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PD3.Locked=true -PD3.PinState=GPIO_PIN_SET +PD3.PinState=GPIO_PIN_RESET PD3.Signal=GPIO_Output PD4.GPIOParameters=GPIO_PuPd,GPIO_Label PD4.GPIO_Label=DI_CH1