andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

time_since_boot should be used in MAIN_RELAY_LOGIC #2258 

safer implementation for now
This commit is contained in:
rusefillc 2021-03-20 12:47:02 -04:00
parent 89b631a794
commit b90dfd5414
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/system_fsio.h
View File

@ -1,6 +1,6 @@
// this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically // this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically
// from controllers/system_fsio.txt // from controllers/system_fsio.txt
// on 2021-01-11_14_17_13_143 // on 2021-03-20_12_45_43_719
// //
// //
// in this file we define system FSIO expressions // in this file we define system FSIO expressions
@ -33,11 +33,16 @@
// Human-readable: (rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4))) // Human-readable: (rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4)))
#define COMBINED_WARNING_LIGHT "rpm 2 fsio_setting > coolant 3 fsio_setting > vbatt 4 fsio_setting < | |" #define COMBINED_WARNING_LIGHT "rpm 2 fsio_setting > coolant 3 fsio_setting > vbatt 4 fsio_setting < | |"
//needed by EFI_MAIN_RELAY_CONTROL //needed by EFI_MAIN_RELAY_CONTROL which is currently FALSE for most of the boards
// todo: make '5' a setting?
// todo: always have 'EFI_MAIN_RELAY_CONTROL'?
// at the moment microRusEFI would not be happy with vbatt > 5 since microRusEFI senses main relay output
// todo https://github.com/rusefi/rusefi/issues/2258
//MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown //MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown
//MAIN_RELAY_LOGIC=(!in_mr_bench) & ((vbatt > 5) | in_shutdown)
// Human-readable: (!in_mr_bench) & ((vbatt > 5) | in_shutdown) // Human-readable: (!in_mr_bench) & (vbatt > 5)
#define MAIN_RELAY_LOGIC "in_mr_bench ! vbatt 5 > in_shutdown | &" #define MAIN_RELAY_LOGIC "in_mr_bench ! vbatt 5 > &"
// could be used for simple variable intake geometry setups or warning light or starter block // could be used for simple variable intake geometry setups or warning light or starter block
// Human-readable: rpm > fsio_setting(1) // Human-readable: rpm > fsio_setting(1)

3
firmware/controllers/system_fsio.txt
View File

@ -30,7 +30,8 @@ COMBINED_WARNING_LIGHT=(rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) |
# at the moment microRusEFI would not be happy with vbatt > 5 since microRusEFI senses main relay output # at the moment microRusEFI would not be happy with vbatt > 5 since microRusEFI senses main relay output
# todo https://github.com/rusefi/rusefi/issues/2258 # todo https://github.com/rusefi/rusefi/issues/2258
#MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown #MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown
MAIN_RELAY_LOGIC=(!in_mr_bench) & ((vbatt > 5) | in_shutdown) #MAIN_RELAY_LOGIC=(!in_mr_bench) & ((vbatt > 5) | in_shutdown)
MAIN_RELAY_LOGIC=(!in_mr_bench) & (vbatt > 5)
# could be used for simple variable intake geometry setups or warning light or starter block # could be used for simple variable intake geometry setups or warning light or starter block
RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1) RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1)