diff --git a/firmware/controllers/system_fsio.h b/firmware/controllers/system_fsio.h index c17f44bc96..ede68a0d1b 100644 --- a/firmware/controllers/system_fsio.h +++ b/firmware/controllers/system_fsio.h @@ -1,6 +1,6 @@ // this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically // from controllers/system_fsio.txt -// on 2020-10-07_19_21_50_355 +// on 2021-01-10_23_54_03_624 // // // in this file we define system FSIO expressions @@ -17,8 +17,13 @@ // Human-readable: (fan and (coolant > cfg_fanOffTemperature)) | (coolant > cfg_fanOnTemperature) | is_clt_broken #define FAN_CONTROL_LOGIC "fan coolant cfg_fanofftemperature > and coolant cfg_fanontemperature > | is_clt_broken |" +// +// todo: we might have a bug here? +// todo: 'time_since_boot' means 'getTimeIgnitionSeconds' in case of EFI_MAIN_RELAY_CONTROL like Proteus +// and it's negative if ignition is off? does Proteus not get fuel pump start-up priming pulse?! +// -// Human-readable: ((time_since_boot >= 0) & (time_since_boot < startup_fuel_pump_duration)) | (time_since_trigger > 0) +// Human-readable: ((time_since_boot >= 0) & (time_since_boot < startup_fuel_pump_duration)) | (time_since_trigger < 1) #define FUEL_PUMP_LOGIC "time_since_boot 0 >= time_since_boot startup_fuel_pump_duration < & time_since_trigger 1 < |" // Human-readable: vbatt < 14.5 @@ -36,8 +41,8 @@ //needed by EFI_MAIN_RELAY_CONTROL //MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown -// Human-readable: (vbatt > 5) | in_shutdown -#define MAIN_RELAY_LOGIC "vbatt 5 > in_shutdown |" +// Human-readable: (!in_mr_bench) & ((vbatt > 5) | in_shutdown) +#define MAIN_RELAY_LOGIC "in_mr_bench ! vbatt 5 > in_shutdown | &" // could be used for simple variable intake geometry setups or warning light or starter block // Human-readable: rpm > fsio_setting(1) diff --git a/firmware/controllers/system_fsio.txt b/firmware/controllers/system_fsio.txt index f12e75fe23..a5927efd8c 100644 --- a/firmware/controllers/system_fsio.txt +++ b/firmware/controllers/system_fsio.txt @@ -31,7 +31,7 @@ COMBINED_WARNING_LIGHT=(rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | #needed by EFI_MAIN_RELAY_CONTROL #MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown -MAIN_RELAY_LOGIC=(vbatt > 5) | in_shutdown +MAIN_RELAY_LOGIC=(!in_mr_bench) & ((vbatt > 5) | in_shutdown) # could be used for simple variable intake geometry setups or warning light or starter block RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1)