From 26c3058c23be21cf6f9cc812bd5d0a8907b2ecf2 Mon Sep 17 00:00:00 2001 From: Thaddeus Hughes Date: Fri, 6 Feb 2026 07:23:57 -0600 Subject: [PATCH] jack sensor re-added/re-integrated --- main/control_fsm.c | 15 +++++++++++---- main/sensors.c | 3 ++- main/sensors.h | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/main/control_fsm.c b/main/control_fsm.c index 8c9e53c..5e25409 100644 --- a/main/control_fsm.c +++ b/main/control_fsm.c @@ -468,7 +468,7 @@ void control_task(void *param) { } - if (get_bridge_overcurrent(BRIDGE_JACK, get_param_value_t(PARAM_JACK_I_DOWN).f32)) { + /*if (get_bridge_overcurrent(BRIDGE_JACK, get_param_value_t(PARAM_JACK_I_DOWN).f32)) { ESP_LOGI(TAG, "DOWN->IDLE BY OVERCURRENT"); // Current spike detected @@ -486,6 +486,13 @@ void control_task(void *param) { log = true; break; + }*/ + + if (get_sensor(SENSOR_JACK)) { + ESP_LOGI(TAG, "DOWN->IDLE BY SENSOR"); + current_state = STATE_IDLE; + log = true; + break; } if (timer_done() ) { @@ -586,11 +593,11 @@ void control_task(void *param) { } break; case FSM_OVERRIDE_JACK_DOWN: - if (get_bridge_overcurrent(BRIDGE_JACK, get_param_value_t(PARAM_JACK_I_DOWN).f32) || + /*if (get_bridge_overcurrent(BRIDGE_JACK, get_param_value_t(PARAM_JACK_I_DOWN).f32) || get_bridge_spike(BRIDGE_JACK, get_param_value_t(PARAM_JACK_IS_DOWN).f32)) efuse_set(BRIDGE_JACK, EFUSE_OVERCURRENT); - - if (efuse_get(BRIDGE_JACK)) { + */ + if (get_sensor(SENSOR_JACK) || efuse_get(BRIDGE_JACK)) { driveRelays((relay_port_t){.bridges = { .DRIVE=BRIDGE_OFF, .JACK=BRIDGE_OFF, diff --git a/main/sensors.c b/main/sensors.c index a524989..11a82e9 100644 --- a/main/sensors.c +++ b/main/sensors.c @@ -218,7 +218,8 @@ bool get_sensor(sensor_t i) { } bool get_is_safe(void) { - return is_safe; + return true; + //return is_safe; } int16_t get_sensor_counter(sensor_t i) { diff --git a/main/sensors.h b/main/sensors.h index 7e3ba05..b64b788 100644 --- a/main/sensors.h +++ b/main/sensors.h @@ -17,8 +17,8 @@ typedef enum { SENSOR_SAFETY = 0, // IO27 - SENSOR_DRIVE = 1, // IO14 - SENSOR_AUX1 = 2, // IO16 on V4 + SENSOR_JACK = 1, // IO14 + SENSOR_DRIVE = 2, // IO16 on V4 SENSOR_AUX2 = 3, // IO19 on V4 N_SENSORS = 4 } sensor_t;