kevin/motor_controller2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了限位开关的判断逻辑

Browse Source
This commit is contained in:
kevin
2021-11-05 01:31:09 +08:00
parent a2d1502c30
commit a4d76b0005
4 changed files with 945 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Debug/Motor_Controller2.bin
BIN
View File
Binary file not shown.
Debug/Motor_Controller2.list
+865 -810
View File
File diff suppressed because it is too large Load Diff
Debug/Motor_Controller2.map
+74 -74
View File
@@ -3532,7 +3532,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
0x0000000008000000 g_pfnVectors
0x00000000080000c0 . = ALIGN (0x4)
.text 0x00000000080000c0 0x3d8c
.text 0x00000000080000c0 0x3e00
0x00000000080000c0 . = ALIGN (0x4)
*(.text)
.text 0x00000000080000c0 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
@@ -3799,109 +3799,109 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
.text.check_need_reset
0x0000000008003340 0xd8 ./my_software/my_code.o
0x0000000008003340 check_need_reset
.text.my_code 0x0000000008003418 0x820 ./my_software/my_code.o
.text.my_code 0x0000000008003418 0x894 ./my_software/my_code.o
0x0000000008003418 my_code
.text.r480_init
0x0000000008003c38 0x20 ./my_software/r480r.o
0x0000000008003c38 r480_init
0x0000000008003cac 0x20 ./my_software/r480r.o
0x0000000008003cac r480_init
.text.read_433_exit
0x0000000008003c58 0x138 ./my_software/r480r.o
0x0000000008003c58 read_433_exit
0x0000000008003ccc 0x138 ./my_software/r480r.o
0x0000000008003ccc read_433_exit
.text.HAL_GPIO_EXTI_Callback
0x0000000008003d90 0x20 ./my_software/r480r.o
0x0000000008003d90 HAL_GPIO_EXTI_Callback
0x0000000008003e04 0x20 ./my_software/r480r.o
0x0000000008003e04 HAL_GPIO_EXTI_Callback
.text.HAL_TIM_PeriodElapsedCallback
0x0000000008003db0 0x2c ./my_software/r480r.o
0x0000000008003db0 HAL_TIM_PeriodElapsedCallback
0x0000000008003e24 0x2c ./my_software/r480r.o
0x0000000008003e24 HAL_TIM_PeriodElapsedCallback
.text.__libc_init_array
0x0000000008003ddc 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libc_nano.a(lib_a-init.o)
0x0000000008003ddc __libc_init_array
.text.memset 0x0000000008003e24 0x10 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libc_nano.a(lib_a-memset.o)
0x0000000008003e24 memset
0x0000000008003e50 0x48 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libc_nano.a(lib_a-init.o)
0x0000000008003e50 __libc_init_array
.text.memset 0x0000000008003e98 0x10 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libc_nano.a(lib_a-memset.o)
0x0000000008003e98 memset
*(.glue_7)
.glue_7 0x0000000008003e34 0x0 linker stubs
.glue_7 0x0000000008003ea8 0x0 linker stubs
*(.glue_7t)
.glue_7t 0x0000000008003e34 0x0 linker stubs
.glue_7t 0x0000000008003ea8 0x0 linker stubs
*(.eh_frame)
.eh_frame 0x0000000008003e34 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.eh_frame 0x0000000008003ea8 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
*(.init)
.init 0x0000000008003e34 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crti.o
0x0000000008003e34 _init
.init 0x0000000008003e38 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtn.o
.init 0x0000000008003ea8 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crti.o
0x0000000008003ea8 _init
.init 0x0000000008003eac 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtn.o
*(.fini)
.fini 0x0000000008003e40 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crti.o
0x0000000008003e40 _fini
.fini 0x0000000008003e44 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtn.o
0x0000000008003e4c . = ALIGN (0x4)
0x0000000008003e4c _etext = .
.fini 0x0000000008003eb4 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crti.o
0x0000000008003eb4 _fini
.fini 0x0000000008003eb8 0x8 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtn.o
0x0000000008003ec0 . = ALIGN (0x4)
0x0000000008003ec0 _etext = .
.vfp11_veneer 0x0000000008003e4c 0x0
.vfp11_veneer 0x0000000008003e4c 0x0 linker stubs
.vfp11_veneer 0x0000000008003ec0 0x0
.vfp11_veneer 0x0000000008003ec0 0x0 linker stubs
.v4_bx 0x0000000008003e4c 0x0
.v4_bx 0x0000000008003e4c 0x0 linker stubs
.v4_bx 0x0000000008003ec0 0x0
.v4_bx 0x0000000008003ec0 0x0 linker stubs
.iplt 0x0000000008003e4c 0x0
.iplt 0x0000000008003e4c 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.iplt 0x0000000008003ec0 0x0
.iplt 0x0000000008003ec0 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.rodata 0x0000000008003e4c 0x58
0x0000000008003e4c . = ALIGN (0x4)
.rodata 0x0000000008003ec0 0x58
0x0000000008003ec0 . = ALIGN (0x4)
*(.rodata)
.rodata 0x0000000008003e4c 0x20 ./Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.o
.rodata 0x0000000008003ec0 0x20 ./Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.o
*(.rodata*)
.rodata.AHBPrescTable
0x0000000008003e6c 0x10 ./Core/Src/system_stm32f0xx.o
0x0000000008003e6c AHBPrescTable
0x0000000008003ee0 0x10 ./Core/Src/system_stm32f0xx.o
0x0000000008003ee0 AHBPrescTable
.rodata.LED_Tab
0x0000000008003e7c 0x12 ./my_software/my_code.o
0x0000000008003e7c LED_Tab
*fill* 0x0000000008003e8e 0x2
0x0000000008003ef0 0x12 ./my_software/my_code.o
0x0000000008003ef0 LED_Tab
*fill* 0x0000000008003f02 0x2
.rodata.my_code
0x0000000008003e90 0x14 ./my_software/my_code.o
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003f04 0x14 ./my_software/my_code.o
0x0000000008003f18 . = ALIGN (0x4)
.rel.dyn 0x0000000008003ea4 0x0
.rel.iplt 0x0000000008003ea4 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.rel.dyn 0x0000000008003f18 0x0
.rel.iplt 0x0000000008003f18 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.ARM.extab 0x0000000008003ea4 0x0
0x0000000008003ea4 . = ALIGN (0x4)
.ARM.extab 0x0000000008003f18 0x0
0x0000000008003f18 . = ALIGN (0x4)
*(.ARM.extab* .gnu.linkonce.armextab.*)
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003f18 . = ALIGN (0x4)
.ARM 0x0000000008003ea4 0x0
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003ea4 __exidx_start = .
.ARM 0x0000000008003f18 0x0
0x0000000008003f18 . = ALIGN (0x4)
0x0000000008003f18 __exidx_start = .
*(.ARM.exidx*)
0x0000000008003ea4 __exidx_end = .
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003f18 __exidx_end = .
0x0000000008003f18 . = ALIGN (0x4)
.preinit_array 0x0000000008003ea4 0x0
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003ea4 PROVIDE (__preinit_array_start = .)
.preinit_array 0x0000000008003f18 0x0
0x0000000008003f18 . = ALIGN (0x4)
0x0000000008003f18 PROVIDE (__preinit_array_start = .)
*(.preinit_array*)
0x0000000008003ea4 PROVIDE (__preinit_array_end = .)
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003f18 PROVIDE (__preinit_array_end = .)
0x0000000008003f18 . = ALIGN (0x4)
.init_array 0x0000000008003ea4 0x4
0x0000000008003ea4 . = ALIGN (0x4)
0x0000000008003ea4 PROVIDE (__init_array_start = .)
.init_array 0x0000000008003f18 0x4
0x0000000008003f18 . = ALIGN (0x4)
0x0000000008003f18 PROVIDE (__init_array_start = .)
*(SORT_BY_NAME(.init_array.*))
*(.init_array*)
.init_array 0x0000000008003ea4 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
0x0000000008003ea8 PROVIDE (__init_array_end = .)
0x0000000008003ea8 . = ALIGN (0x4)
.init_array 0x0000000008003f18 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
0x0000000008003f1c PROVIDE (__init_array_end = .)
0x0000000008003f1c . = ALIGN (0x4)
.fini_array 0x0000000008003ea8 0x4
0x0000000008003ea8 . = ALIGN (0x4)
.fini_array 0x0000000008003f1c 0x4
0x0000000008003f1c . = ALIGN (0x4)
[!provide] PROVIDE (__fini_array_start = .)
*(SORT_BY_NAME(.fini_array.*))
*(.fini_array*)
.fini_array 0x0000000008003ea8 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
.fini_array 0x0000000008003f1c 0x4 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
[!provide] PROVIDE (__fini_array_end = .)
0x0000000008003eac . = ALIGN (0x4)
0x0000000008003eac _sidata = LOADADDR (.data)
0x0000000008003f20 . = ALIGN (0x4)
0x0000000008003f20 _sidata = LOADADDR (.data)
.data 0x0000000020000000 0xc load address 0x0000000008003eac
.data 0x0000000020000000 0xc load address 0x0000000008003f20
0x0000000020000000 . = ALIGN (0x4)
0x0000000020000000 _sdata = .
*(.data)
@@ -3921,11 +3921,11 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
*fill* 0x0000000020000009 0x3
0x000000002000000c _edata = .
.igot.plt 0x000000002000000c 0x0 load address 0x0000000008003eb8
.igot.plt 0x000000002000000c 0x0 load address 0x0000000008003f2c
.igot.plt 0x000000002000000c 0x0 /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.macos64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o
0x000000002000000c . = ALIGN (0x4)
.bss 0x000000002000000c 0x144 load address 0x0000000008003eb8
.bss 0x000000002000000c 0x144 load address 0x0000000008003f2c
0x000000002000000c _sbss = .
0x000000002000000c __bss_start__ = _sbss
*(.bss)
@@ -3969,7 +3969,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
0x0000000020000150 __bss_end__ = _ebss
._user_heap_stack
0x0000000020000150 0x600 load address 0x0000000008003eb8
0x0000000020000150 0x600 load address 0x0000000008003f2c
0x0000000020000150 . = ALIGN (0x8)
[!provide] PROVIDE (end = .)
0x0000000020000150 PROVIDE (_end = .)
@@ -4225,7 +4225,7 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
.debug_macro 0x0000000000010216 0x4c ./my_software/my_code.o
.debug_macro 0x0000000000010262 0x1e0 ./my_software/r480r.o
.debug_line 0x0000000000000000 0xf1d9
.debug_line 0x0000000000000000 0xf273
.debug_line 0x0000000000000000 0x8df ./Core/Src/main.o
.debug_line 0x00000000000008df 0x793 ./Core/Src/stm32f0xx_hal_msp.o
.debug_line 0x0000000000001072 0x7a5 ./Core/Src/stm32f0xx_it.o
@@ -4244,8 +4244,8 @@ LOAD /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.id
.debug_line 0x000000000000c3c8 0x725 ./my_software/gpio.o
.debug_line 0x000000000000caed 0x835 ./my_software/ht1621.o
.debug_line 0x000000000000d322 0x923 ./my_software/iic.o
.debug_line 0x000000000000dc45 0xda3 ./my_software/my_code.o
.debug_line 0x000000000000e9e8 0x7f1 ./my_software/r480r.o
.debug_line 0x000000000000dc45 0xe3d ./my_software/my_code.o
.debug_line 0x000000000000ea82 0x7f1 ./my_software/r480r.o
.debug_str 0x0000000000000000 0x5f5c4
.debug_str 0x0000000000000000 0x5c9bc ./Core/Src/main.o
my_software/my_code.c
+6 -6
View File
@@ -451,18 +451,18 @@ void my_code()
moto.moto2a=0;
moto.moto2b=10;
}
if(key4.code!=0||(moto_in1==1&&READ_MOT_IN1==0))
if(key4.code!=0||(moto.moto1a==0&&moto.moto1b==0&&moto.moto2a==0&&moto.moto2b==0))
{
mode=1;
}
if(ADCC.adc_value[1]>400)
if(ADCC.adc_value[1]>400||(moto_in1==1&&READ_MOT_IN1==0))
{
//overload_times=0;
moto.moto1a=0;
moto.moto1b=0;
}
if(ADCC.adc_value[0]>400)
if(ADCC.adc_value[0]>400||(moto_in2==1&&READ_MOT_IN2==0))
{
moto.moto2a=0;
moto.moto2b=0;
@@ -500,17 +500,17 @@ void my_code()
moto.moto2a=10;
moto.moto2b=0;
}
if(key4.code!=0||(moto_in2==1&&READ_MOT_IN2==0))
if(key4.code!=0||(moto.moto1a==0&&moto.moto1b==0&&moto.moto2a==0&&moto.moto2b==0))
{
mode=1;
}
if(ADCC.adc_value[1]>400)
if(ADCC.adc_value[1]>400||(moto_in1==1&&READ_MOT_IN1==0))
{
//overload_times=0;
moto.moto1a=0;
moto.moto1b=0;
}
if(ADCC.adc_value[0]>400)
if(ADCC.adc_value[0]>400||(moto_in2==1&&READ_MOT_IN2==0))
{
//overload_times2=0;
moto.moto2a=0;