diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 6cb9a7f6b1..14d6acec7e 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -251,7 +251,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->fsio_setting[3] = 13.5; // voltage threshold // setFsio(1, GPIOC_13, "rpm 2 fsio_setting > coolant 3 fsio_setting > | vbatt 4 fsio_setting < |" PASS_ENGINE_PARAMETER_SUFFIX); - setFsio(1, GPIOD_7, "rpm 2 fsio_setting >" PASS_ENGINE_PARAMETER_SUFFIX); + setFsio(1, GPIOD_7, RPM_ABOVE_USER_SETTING_2 PASS_ENGINE_PARAMETER_SUFFIX); config->ignitionRpmBins[0] = 800; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 6d4341e70e..e3ed5a02ab 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -164,6 +164,8 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->fsioAdc[0] = EFI_ADC_4; + /* + these indeces are off // warning light /** * to test @@ -174,6 +176,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" * rpn_eval "rpm 1 fsio_setting > coolant 2 fsio_setting > | vbatt 4 fsio_setting < |" */ + /* boardConfiguration->fsio_setting[0] = 6400; // RPM threshold boardConfiguration->fsio_setting[1] = 100; // CLT threshold, fsio_setting #2 boardConfiguration->fsio_setting[2] = 13.0; // voltage threshold, fsio_setting #3 @@ -182,6 +185,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->fsio_setting[3] = 3000; // oil pressure RPM, fsio_setting #4 // set_fsio_setting 5 0.52 boardConfiguration->fsio_setting[4] = 0.52; // oil pressure threshold, fsio_setting #5 +*/ // * set_rpn_expression 1 "rpm 3 fsio_setting >" // rpn_eval "rpm 1 fsio_setting >" @@ -190,7 +194,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // set_fsio_expression 0 "((rpm > fsio_setting(4) & (fsio_input < fsio_setting(5)) | rpm > fsio_setting(1) | (coolant > fsio_setting(2) > | (vbatt < fsio_setting(3)" // todo: convert - setFsio(0, GPIOC_13, "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" PASS_ENGINE_PARAMETER_SUFFIX); + setFsio(0, GPIOC_13, COMBINED_WARNING_LIGHT PASS_ENGINE_PARAMETER_SUFFIX); boardConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; diff --git a/firmware/controllers/system_fsio.h b/firmware/controllers/system_fsio.h index 3d94a46062..41387e51b0 100644 --- a/firmware/controllers/system_fsio.h +++ b/firmware/controllers/system_fsio.h @@ -1,10 +1,12 @@ // this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically // from controllers/system_fsio.txt -// on 2017-06-12_17_45_41 +// on 2017-06-13_19_39_11 // // // in this file we define system FSIO expressions // +// system_fsio.txt is input for compile_fsio_file tool, see gen_system_fsio.bat +// // see http://rusefi.com/wiki/index.php?title=Manual:Flexible_Logic // // Jan 19, 2017 @@ -31,3 +33,14 @@ // Human-readable: (time_since_boot < 2) | (vbatt > 5) #define MAIN_RELAY_LOGIC "time_since_boot 2 < vbatt 5 > |" +// could be used for simple variable intake geometry setups or warning light or starter block + +// Human-readable: rpm > fsio_setting(1) +#define RPM_ABOVE_USER_SETTING_1 "rpm 1 fsio_setting >" +// could be used for simple variable intake geometry setups or warning light or starter block + +// Human-readable: rpm > fsio_setting(2) +#define RPM_ABOVE_USER_SETTING_2 "rpm 2 fsio_setting >" + +// Human-readable: rpm < fsio_setting(1) +#define RPM_BELOW_USER_SETTING_1 "rpm 1 fsio_setting <" diff --git a/firmware/controllers/system_fsio.txt b/firmware/controllers/system_fsio.txt index aff91693f2..0f310682bc 100644 --- a/firmware/controllers/system_fsio.txt +++ b/firmware/controllers/system_fsio.txt @@ -1,6 +1,8 @@ # # in this file we define system FSIO expressions # +# system_fsio.txt is input for compile_fsio_file tool, see gen_system_fsio.bat +# # see http://rusefi.com/wiki/index.php?title=Manual:Flexible_Logic # # Jan 19, 2017 @@ -21,3 +23,12 @@ COMBINED_WARNING_LIGHT=(rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | #needed by EFI_MAIN_RELAY_CONTROL MAIN_RELAY_LOGIC=(time_since_boot < 2) | (vbatt > 5) + +# could be used for simple variable intake geometry setups or warning light or starter block +RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1) + +# could be used for simple variable intake geometry setups or warning light or starter block +RPM_ABOVE_USER_SETTING_2=rpm > fsio_setting(2) + +RPM_BELOW_USER_SETTING_1=rpm < fsio_setting(1) +