|
@@ -31,17 +31,17 @@ Idx Name Size VMA LMA File off Algn
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
13 .debug_macro 0003f867 00000000 00000000 00056e30 2**0
|
|
13 .debug_macro 0003f867 00000000 00000000 00056e30 2**0
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
- 14 .debug_line 000314de 00000000 00000000 00096697 2**0
|
|
|
|
|
|
+ 14 .debug_line 000314d8 00000000 00000000 00096697 2**0
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
- 15 .debug_str 0018843f 00000000 00000000 000c7b75 2**0
|
|
|
|
|
|
+ 15 .debug_str 0018843f 00000000 00000000 000c7b6f 2**0
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
- 16 .comment 00000043 00000000 00000000 0024ffb4 2**0
|
|
|
|
|
|
+ 16 .comment 00000043 00000000 00000000 0024ffae 2**0
|
|
CONTENTS, READONLY
|
|
CONTENTS, READONLY
|
|
- 17 .debug_rnglists 00001c8e 00000000 00000000 0024fff7 2**0
|
|
|
|
|
|
+ 17 .debug_rnglists 00001c8e 00000000 00000000 0024fff1 2**0
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
- 18 .debug_frame 0000a3b4 00000000 00000000 00251c88 2**2
|
|
|
|
|
|
+ 18 .debug_frame 0000a3b4 00000000 00000000 00251c80 2**2
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
- 19 .debug_line_str 00000066 00000000 00000000 0025c03c 2**0
|
|
|
|
|
|
+ 19 .debug_line_str 00000066 00000000 00000000 0025c034 2**0
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
CONTENTS, READONLY, DEBUGGING, OCTETS
|
|
|
|
|
|
Disassembly of section .text:
|
|
Disassembly of section .text:
|
|
@@ -3860,11 +3860,6 @@ void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef *htim)
|
|
8001a6a: b084 sub sp, #16
|
|
8001a6a: b084 sub sp, #16
|
|
8001a6c: af00 add r7, sp, #0
|
|
8001a6c: af00 add r7, sp, #0
|
|
8001a6e: 6078 str r0, [r7, #4]
|
|
8001a6e: 6078 str r0, [r7, #4]
|
|
- encoderYChannelA = 0;
|
|
|
|
- encoderYChannelB = 0;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-#endif
|
|
|
|
if (htim->Instance == TIM4)
|
|
if (htim->Instance == TIM4)
|
|
8001a70: 687b ldr r3, [r7, #4]
|
|
8001a70: 687b ldr r3, [r7, #4]
|
|
8001a72: 681b ldr r3, [r3, #0]
|
|
8001a72: 681b ldr r3, [r3, #0]
|
|
@@ -4644,10 +4639,10 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
|
8001f30: d102 bne.n 8001f38 <HAL_TIM_PeriodElapsedCallback+0x18>
|
|
8001f30: d102 bne.n 8001f38 <HAL_TIM_PeriodElapsedCallback+0x18>
|
|
HAL_IncTick();
|
|
HAL_IncTick();
|
|
8001f32: f003 fb05 bl 8005540 <HAL_IncTick>
|
|
8001f32: f003 fb05 bl 8005540 <HAL_IncTick>
|
|
-// encoderYChannelB = 0;
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
|
|
+ {
|
|
|
|
+ encoderYChannelA = 0;
|
|
|
|
+ encoderYChannelB = 0;
|
|
|
|
+ }
|
|
/* USER CODE END Callback 1 */
|
|
/* USER CODE END Callback 1 */
|
|
}
|
|
}
|
|
8001f36: e016 b.n 8001f66 <HAL_TIM_PeriodElapsedCallback+0x46>
|
|
8001f36: e016 b.n 8001f66 <HAL_TIM_PeriodElapsedCallback+0x46>
|
|
@@ -6050,74 +6045,74 @@ void LimiterSwitchTask (void* arg) {
|
|
8002c02: d003 beq.n 8002c0c <LimiterSwitchTask+0xb0>
|
|
8002c02: d003 beq.n 8002c0c <LimiterSwitchTask+0xb0>
|
|
8002c04: f5b3 7f00 cmp.w r3, #512 @ 0x200
|
|
8002c04: f5b3 7f00 cmp.w r3, #512 @ 0x200
|
|
8002c08: d00b beq.n 8002c22 <LimiterSwitchTask+0xc6>
|
|
8002c08: d00b beq.n 8002c22 <LimiterSwitchTask+0xc6>
|
|
- case GPIO_PIN_9: sensorsInfo.limitYSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
- case GPIO_PIN_10: sensorsInfo.limitXSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
- case GPIO_PIN_11: sensorsInfo.limitYSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
- case GPIO_PIN_12: sensorsInfo.limitXSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
- case GPIO_PIN_13: sensorsInfo.limitXSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_9: sensorsInfo.limitYSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
|
|
+ case GPIO_PIN_10: sensorsInfo.limitXSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
|
|
+ case GPIO_PIN_11: sensorsInfo.limitYSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
|
|
+ case GPIO_PIN_12: sensorsInfo.limitXSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
|
|
+ case GPIO_PIN_13: sensorsInfo.limitXSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
default: break;
|
|
default: break;
|
|
8002c0a: e041 b.n 8002c90 <LimiterSwitchTask+0x134>
|
|
8002c0a: e041 b.n 8002c90 <LimiterSwitchTask+0x134>
|
|
- case GPIO_PIN_8: sensorsInfo.limitYSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_8: sensorsInfo.limitYSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c0c: 7abb ldrb r3, [r7, #10]
|
|
8002c0c: 7abb ldrb r3, [r7, #10]
|
|
8002c0e: 2b01 cmp r3, #1
|
|
8002c0e: 2b01 cmp r3, #1
|
|
- 8002c10: bf14 ite ne
|
|
|
|
- 8002c12: 2301 movne r3, #1
|
|
|
|
- 8002c14: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c10: bf0c ite eq
|
|
|
|
+ 8002c12: 2301 moveq r3, #1
|
|
|
|
+ 8002c14: 2300 movne r3, #0
|
|
8002c16: b2db uxtb r3, r3
|
|
8002c16: b2db uxtb r3, r3
|
|
8002c18: 461a mov r2, r3
|
|
8002c18: 461a mov r2, r3
|
|
8002c1a: 4b47 ldr r3, [pc, #284] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c1a: 4b47 ldr r3, [pc, #284] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c1c: f883 202d strb.w r2, [r3, #45] @ 0x2d
|
|
8002c1c: f883 202d strb.w r2, [r3, #45] @ 0x2d
|
|
8002c20: e037 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
8002c20: e037 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
- case GPIO_PIN_9: sensorsInfo.limitYSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_9: sensorsInfo.limitYSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c22: 7abb ldrb r3, [r7, #10]
|
|
8002c22: 7abb ldrb r3, [r7, #10]
|
|
8002c24: 2b01 cmp r3, #1
|
|
8002c24: 2b01 cmp r3, #1
|
|
- 8002c26: bf14 ite ne
|
|
|
|
- 8002c28: 2301 movne r3, #1
|
|
|
|
- 8002c2a: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c26: bf0c ite eq
|
|
|
|
+ 8002c28: 2301 moveq r3, #1
|
|
|
|
+ 8002c2a: 2300 movne r3, #0
|
|
8002c2c: b2db uxtb r3, r3
|
|
8002c2c: b2db uxtb r3, r3
|
|
8002c2e: 461a mov r2, r3
|
|
8002c2e: 461a mov r2, r3
|
|
8002c30: 4b41 ldr r3, [pc, #260] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c30: 4b41 ldr r3, [pc, #260] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c32: f883 202c strb.w r2, [r3, #44] @ 0x2c
|
|
8002c32: f883 202c strb.w r2, [r3, #44] @ 0x2c
|
|
8002c36: e02c b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
8002c36: e02c b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
- case GPIO_PIN_10: sensorsInfo.limitXSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_10: sensorsInfo.limitXSwitchCenter = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c38: 7abb ldrb r3, [r7, #10]
|
|
8002c38: 7abb ldrb r3, [r7, #10]
|
|
8002c3a: 2b01 cmp r3, #1
|
|
8002c3a: 2b01 cmp r3, #1
|
|
- 8002c3c: bf14 ite ne
|
|
|
|
- 8002c3e: 2301 movne r3, #1
|
|
|
|
- 8002c40: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c3c: bf0c ite eq
|
|
|
|
+ 8002c3e: 2301 moveq r3, #1
|
|
|
|
+ 8002c40: 2300 movne r3, #0
|
|
8002c42: b2db uxtb r3, r3
|
|
8002c42: b2db uxtb r3, r3
|
|
8002c44: 461a mov r2, r3
|
|
8002c44: 461a mov r2, r3
|
|
8002c46: 4b3c ldr r3, [pc, #240] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c46: 4b3c ldr r3, [pc, #240] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c48: f883 202a strb.w r2, [r3, #42] @ 0x2a
|
|
8002c48: f883 202a strb.w r2, [r3, #42] @ 0x2a
|
|
8002c4c: e021 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
8002c4c: e021 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
- case GPIO_PIN_11: sensorsInfo.limitYSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_11: sensorsInfo.limitYSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c4e: 7abb ldrb r3, [r7, #10]
|
|
8002c4e: 7abb ldrb r3, [r7, #10]
|
|
8002c50: 2b01 cmp r3, #1
|
|
8002c50: 2b01 cmp r3, #1
|
|
- 8002c52: bf14 ite ne
|
|
|
|
- 8002c54: 2301 movne r3, #1
|
|
|
|
- 8002c56: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c52: bf0c ite eq
|
|
|
|
+ 8002c54: 2301 moveq r3, #1
|
|
|
|
+ 8002c56: 2300 movne r3, #0
|
|
8002c58: b2db uxtb r3, r3
|
|
8002c58: b2db uxtb r3, r3
|
|
8002c5a: 461a mov r2, r3
|
|
8002c5a: 461a mov r2, r3
|
|
8002c5c: 4b36 ldr r3, [pc, #216] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c5c: 4b36 ldr r3, [pc, #216] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c5e: f883 202b strb.w r2, [r3, #43] @ 0x2b
|
|
8002c5e: f883 202b strb.w r2, [r3, #43] @ 0x2b
|
|
8002c62: e016 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
8002c62: e016 b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
- case GPIO_PIN_12: sensorsInfo.limitXSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_12: sensorsInfo.limitXSwitchUp = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c64: 7abb ldrb r3, [r7, #10]
|
|
8002c64: 7abb ldrb r3, [r7, #10]
|
|
8002c66: 2b01 cmp r3, #1
|
|
8002c66: 2b01 cmp r3, #1
|
|
- 8002c68: bf14 ite ne
|
|
|
|
- 8002c6a: 2301 movne r3, #1
|
|
|
|
- 8002c6c: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c68: bf0c ite eq
|
|
|
|
+ 8002c6a: 2301 moveq r3, #1
|
|
|
|
+ 8002c6c: 2300 movne r3, #0
|
|
8002c6e: b2db uxtb r3, r3
|
|
8002c6e: b2db uxtb r3, r3
|
|
8002c70: 461a mov r2, r3
|
|
8002c70: 461a mov r2, r3
|
|
8002c72: 4b31 ldr r3, [pc, #196] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c72: 4b31 ldr r3, [pc, #196] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c74: f883 2028 strb.w r2, [r3, #40] @ 0x28
|
|
8002c74: f883 2028 strb.w r2, [r3, #40] @ 0x28
|
|
8002c78: e00b b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
8002c78: e00b b.n 8002c92 <LimiterSwitchTask+0x136>
|
|
- case GPIO_PIN_13: sensorsInfo.limitXSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 0 : 1; break;
|
|
|
|
|
|
+ case GPIO_PIN_13: sensorsInfo.limitXSwitchDown = limiterSwitchData.pinState == GPIO_PIN_SET ? 1 : 0; break;
|
|
8002c7a: 7abb ldrb r3, [r7, #10]
|
|
8002c7a: 7abb ldrb r3, [r7, #10]
|
|
8002c7c: 2b01 cmp r3, #1
|
|
8002c7c: 2b01 cmp r3, #1
|
|
- 8002c7e: bf14 ite ne
|
|
|
|
- 8002c80: 2301 movne r3, #1
|
|
|
|
- 8002c82: 2300 moveq r3, #0
|
|
|
|
|
|
+ 8002c7e: bf0c ite eq
|
|
|
|
+ 8002c80: 2301 moveq r3, #1
|
|
|
|
+ 8002c82: 2300 movne r3, #0
|
|
8002c84: b2db uxtb r3, r3
|
|
8002c84: b2db uxtb r3, r3
|
|
8002c86: 461a mov r2, r3
|
|
8002c86: 461a mov r2, r3
|
|
8002c88: 4b2b ldr r3, [pc, #172] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|
|
8002c88: 4b2b ldr r3, [pc, #172] @ (8002d38 <LimiterSwitchTask+0x1dc>)
|