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

progress #369

This commit is contained in:
rusefi 2017-03-09 00:05:52 -05:00
parent 1319b18c5a
commit 2d407cda60
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/ford_festiva.cpp
View File

@ -230,7 +230,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
* set_fsio_setting 0 5000 * set_fsio_setting 0 5000
*/ */
boardConfiguration->fsio_setting[0] = 5000; boardConfiguration->fsio_setting[0] = 5000;
// set_fsio_expression 1 "rpm 0 fsio_setting >" // set_rpn_expression 1 "rpm 0 fsio_setting >"
setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting >", 150 PASS_ENGINE_PARAMETER); setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting >", 150 PASS_ENGINE_PARAMETER);
@ -241,7 +241,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
* set_fsio_setting 2 95 * set_fsio_setting 2 95
* set_fsio_setting 3 14 * set_fsio_setting 3 14
* *
* set_fsio_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
* eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
*/ */
boardConfiguration->fsio_setting[1] = 6200; // RPM threshold boardConfiguration->fsio_setting[1] = 6200; // RPM threshold

2
firmware/config/engines/lada_kalina.cpp
View File

@ -55,7 +55,7 @@ void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) {
* set_fsio_setting 0 5000 * set_fsio_setting 0 5000
*/ */
engineConfiguration->bc.fsio_setting[0] = 500; engineConfiguration->bc.fsio_setting[0] = 500;
// set_fsio_expression 1 "rpm 0 fsio_setting <" // set_rpn_expression 1 "rpm 0 fsio_setting <"
setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting <", 0 PASS_ENGINE_PARAMETER); setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting <", 0 PASS_ENGINE_PARAMETER);
} }

12
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -171,8 +171,8 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
* set_fsio_setting 1 95 * set_fsio_setting 1 95
* set_fsio_setting 3 14 * set_fsio_setting 3 14
* *
* set_fsio_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
* eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" * rpn_eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
*/ */
boardConfiguration->fsio_setting[0] = 6400; // RPM threshold boardConfiguration->fsio_setting[0] = 6400; // RPM threshold
boardConfiguration->fsio_setting[1] = 100; // CLT threshold boardConfiguration->fsio_setting[1] = 100; // CLT threshold
@ -183,11 +183,11 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
// set_fsio_setting 4 0.52 // set_fsio_setting 4 0.52
boardConfiguration->fsio_setting[4] = 0.52; // oil pressure threshold boardConfiguration->fsio_setting[4] = 0.52; // oil pressure threshold
// * set_fsio_expression 1 "rpm 3 fsio_setting >" // * set_rpn_expression 1 "rpm 3 fsio_setting >"
// eval "rpm 3 fsio_setting >" // rpn_eval "rpm 3 fsio_setting >"
// eval "fsio_input" // rpn_eval "fsio_input"
// set_fsio_expression 0 "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" // set_rpn_expression 0 "rpm 3 fsio_setting > fsio_input 4 fsio_setting < & rpm 0 fsio_setting | > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |"
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); 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);

2
firmware/config/engines/mazda_miata_nb.cpp
View File

@ -87,6 +87,6 @@ void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
*/ */
boardConfiguration->fsio_setting[0] = 5000; boardConfiguration->fsio_setting[0] = 5000;
// (self and (rpm > 4800)) OR (rpm > 5000) // (self and (rpm > 4800)) OR (rpm > 5000)
// set_fsio_expression 1 "self rpm 4800 > & rpm 5000 > OR" // set_rpn_expression 1 "self rpm 4800 > & rpm 5000 > OR"
// setFsioExt(0, GPIOE_3, "self rpm 4800 > & rpm 5000 > OR", 150 PASS_ENGINE_PARAMETER); // setFsioExt(0, GPIOE_3, "self rpm 4800 > & rpm 5000 > OR", 150 PASS_ENGINE_PARAMETER);
} }

8
firmware/controllers/core/fsio_impl.cpp
View File

@ -461,7 +461,7 @@ static void setFsioExpression(const char *indexStr, const char *quotedLine, Engi
#endif #endif
} }
static void eval(char *line, Engine *engine) { static void rpnEval(char *line, Engine *engine) {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
line = unquote(line); line = unquote(line);
scheduleMsg(logger, "Parsing [%s]", line); scheduleMsg(logger, "Parsing [%s]", line);
@ -471,7 +471,7 @@ static void eval(char *line, Engine *engine) {
scheduleMsg(logger, "parsing failed"); scheduleMsg(logger, "parsing failed");
} else { } else {
float result = evalCalc.getValue2(0, e, engine); float result = evalCalc.getValue2(0, e, engine);
scheduleMsg(logger, "Eval result: %f", result); scheduleMsg(logger, "Evaluate result: %f", result);
} }
#endif #endif
} }
@ -523,10 +523,10 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
addConsoleActionSSP("set_fsio_expression", (VoidCharPtrCharPtrVoidPtr) setFsioExpression, engine); addConsoleActionSSP("set_rpn_expression", (VoidCharPtrCharPtrVoidPtr) setFsioExpression, engine);
addConsoleActionFF("set_fsio_setting", setFsioSetting); addConsoleActionFF("set_fsio_setting", setFsioSetting);
addConsoleAction("fsioinfo", showFsioInfo); addConsoleAction("fsioinfo", showFsioInfo);
addConsoleActionSP("eval", (VoidCharPtrVoidPtr) eval, engine); addConsoleActionSP("rpn_eval", (VoidCharPtrVoidPtr) rpnEval, engine);
#endif #endif
fsioTable1.init(config->fsioTable1, config->fsioTable1LoadBins, fsioTable1.init(config->fsioTable1, config->fsioTable1LoadBins,