stockcropper/SC-F001
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jack sensor re-added/re-integrated

Browse Source
This commit is contained in:
Thaddeus Hughes
2026-02-06 07:23:57 -06:00
parent a1a8313525
commit 26c3058c23
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/control_fsm.c
View File

@@ -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"); ESP_LOGI(TAG, "DOWN->IDLE BY OVERCURRENT");
// Current spike detected // Current spike detected
@@ -486,6 +486,13 @@ void control_task(void *param) {
log = true; log = true;
break; break;
}*/
if (get_sensor(SENSOR_JACK)) {
ESP_LOGI(TAG, "DOWN->IDLE BY SENSOR");
current_state = STATE_IDLE;
log = true;
break;
} }
if (timer_done() ) { if (timer_done() ) {
@@ -586,11 +593,11 @@ void control_task(void *param) {
} }
break; break;
case FSM_OVERRIDE_JACK_DOWN: 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)) get_bridge_spike(BRIDGE_JACK, get_param_value_t(PARAM_JACK_IS_DOWN).f32))
efuse_set(BRIDGE_JACK, EFUSE_OVERCURRENT); 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 = { driveRelays((relay_port_t){.bridges = {
.DRIVE=BRIDGE_OFF, .DRIVE=BRIDGE_OFF,
.JACK=BRIDGE_OFF, .JACK=BRIDGE_OFF,

3
main/sensors.c
View File

@@ -218,7 +218,8 @@ bool get_sensor(sensor_t i) {
} }
bool get_is_safe(void) { bool get_is_safe(void) {
return is_safe; return true;
//return is_safe;
} }
int16_t get_sensor_counter(sensor_t i) { int16_t get_sensor_counter(sensor_t i) {

4
main/sensors.h
View File

@@ -17,8 +17,8 @@
typedef enum { typedef enum {
SENSOR_SAFETY = 0, // IO27 SENSOR_SAFETY = 0, // IO27
SENSOR_DRIVE = 1, // IO14 SENSOR_JACK = 1, // IO14
SENSOR_AUX1 = 2, // IO16 on V4 SENSOR_DRIVE = 2, // IO16 on V4
SENSOR_AUX2 = 3, // IO19 on V4 SENSOR_AUX2 = 3, // IO19 on V4
N_SENSORS = 4 N_SENSORS = 4
} sensor_t; } sensor_t;