Skip to content

Commit 940e393

Browse files
committed
latch only has one switch
1 parent b12ba27 commit 940e393

File tree

6 files changed

+4
-15
lines changed

6 files changed

+4
-15
lines changed

stm32-modules/flex-stacker/firmware/motor_control/motor_hardware.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static motor_hardware_t _motor_hardware = {
8484
.direction = {L_DIR_PORT, L_DIR_PIN, GPIO_PIN_SET},
8585
.step = {L_STEP_PORT, L_STEP_PIN, GPIO_PIN_SET},
8686
.limit_switch_minus = {L_N_HELD_PORT, L_N_HELD_PIN, GPIO_PIN_RESET},
87-
.limit_switch_plus = {L_N_RELEASED_PORT, L_N_RELEASED_PIN, GPIO_PIN_RESET},
87+
.limit_switch_plus = {0},
8888
.diag0 = {MOTOR_DIAG0_PORT, MOTOR_DIAG0_PIN, GPIO_PIN_SET},
8989
.ebrake = {0},
9090
},
@@ -176,9 +176,6 @@ void motor_hardware_gpio_init(void){
176176
init.Pin = L_N_HELD_PIN;
177177
HAL_GPIO_Init(L_N_HELD_PORT, &init);
178178

179-
init.Pin = L_N_RELEASED_PIN;
180-
HAL_GPIO_Init(L_N_RELEASED_PORT, &init);
181-
182179
init.Pin = ESTOP_PIN;
183180
HAL_GPIO_Init(ESTOP_PORT, &init);
184181

stm32-modules/include/flex-stacker/firmware/motor_hardware.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ bool hw_read_platform_sensor(bool direction);
9191
/* Note: Mechanical limit switches */
9292
#define L_N_HELD_PIN (GPIO_PIN_5)
9393
#define L_N_HELD_PORT (GPIOB)
94-
#define L_N_RELEASED_PIN (GPIO_PIN_11)
95-
#define L_N_RELEASED_PORT (GPIOC)
9694

9795
/**************** COMMON ********************/
9896
#define ESTOP_PIN (GPIO_PIN_6)

stm32-modules/include/flex-stacker/flex-stacker/gcodes_motor.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -764,13 +764,11 @@ struct GetLimitSwitches {
764764
std::sized_sentinel_for<InputIt, InLimit>
765765
static auto write_response_into(InputIt buf, InLimit limit, int x_extended,
766766
int x_retracted, int z_extended,
767-
int z_retracted, int l_released, int l_held)
768-
-> InputIt {
767+
int z_retracted, int l_held) -> InputIt {
769768
int res = 0;
770769
res = snprintf(&*buf, (limit - buf),
771-
"M119 XE:%i XR:%i ZE:%i ZR:%i LR:%i LH:%i OK\n",
772-
x_extended, x_retracted, z_extended, z_retracted,
773-
l_released, l_held);
770+
"M119 XE:%i XR:%i ZE:%i ZR:%i LR:%i OK\n", x_extended,
771+
x_retracted, z_extended, z_retracted, l_held);
774772
if (res <= 0) {
775773
return buf;
776774
}

stm32-modules/include/flex-stacker/flex-stacker/host_comms_task.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ class HostCommsTask {
331331
response.x_retract_triggered,
332332
response.z_extend_triggered,
333333
response.x_retract_triggered,
334-
response.l_released_triggered,
335334
response.l_held_triggered);
336335
}
337336
},

stm32-modules/include/flex-stacker/flex-stacker/messages.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ struct GetLimitSwitchesResponses {
176176
bool x_retract_triggered;
177177
bool z_extend_triggered;
178178
bool z_retract_triggered;
179-
bool l_released_triggered;
180179
bool l_held_triggered;
181180
};
182181

stm32-modules/include/flex-stacker/flex-stacker/motor_task.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@ class MotorTask {
330330
policy.check_limit_switch(MotorID::MOTOR_Z, true),
331331
.z_retract_triggered =
332332
policy.check_limit_switch(MotorID::MOTOR_Z, false),
333-
.l_released_triggered =
334-
policy.check_limit_switch(MotorID::MOTOR_L, true),
335333
.l_held_triggered =
336334
policy.check_limit_switch(MotorID::MOTOR_L, false),
337335
};

0 commit comments

Comments
 (0)