rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #445 from andreika-git/fsio_starter_block 

FSIO Starter Block using cranking_rpm
This commit is contained in:
rusefi 2017-06-14 08:37:04 -04:00 committed by GitHub
parent 2af10a0a72 5d438b9a11
commit 7ae60f7038
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/core/fsio_core.h
View File

@ -53,6 +53,7 @@ typedef enum {
LE_METHOD_INTAKE_VVT = 117, LE_METHOD_INTAKE_VVT = 117,
LE_METHOD_EXHAUST_VVT = 118, LE_METHOD_EXHAUST_VVT = 118,
LE_METHOD_IS_COOLANT_BROKEN = 119, LE_METHOD_IS_COOLANT_BROKEN = 119,
LE_METHOD_CRANKING_RPM = 120,
Force_4b_le_action = ENUM_32_BITS, Force_4b_le_action = ENUM_32_BITS,

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

@ -44,6 +44,7 @@ static LENameOrdinalPair leFsioAnalogInput(LE_METHOD_FSIO_ANALOG_INPUT, "fsio_in
static LENameOrdinalPair leKnock(LE_METHOD_KNOCK, "knock"); static LENameOrdinalPair leKnock(LE_METHOD_KNOCK, "knock");
static LENameOrdinalPair leIntakeVVT(LE_METHOD_INTAKE_VVT, "ivvt"); static LENameOrdinalPair leIntakeVVT(LE_METHOD_INTAKE_VVT, "ivvt");
static LENameOrdinalPair leExhaustVVT(LE_METHOD_EXHAUST_VVT, "evvt"); static LENameOrdinalPair leExhaustVVT(LE_METHOD_EXHAUST_VVT, "evvt");
static LENameOrdinalPair leCrankingRpm(LE_METHOD_CRANKING_RPM, "cranking_rpm");
#define LE_EVAL_POOL_SIZE 32 #define LE_EVAL_POOL_SIZE 32
@ -106,6 +107,8 @@ float getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
return engineConfiguration->fanOffTemperature; return engineConfiguration->fanOffTemperature;
case LE_METHOD_FAN_ON_SETTING: case LE_METHOD_FAN_ON_SETTING:
return engineConfiguration->fanOnTemperature; return engineConfiguration->fanOnTemperature;
case LE_METHOD_CRANKING_RPM:
return engineConfiguration->cranking.rpm;
case LE_METHOD_VBATT: case LE_METHOD_VBATT:
return getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE); return getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE);
default: default:
@ -288,6 +291,8 @@ static const char * action2String(le_action_e action) {
switch(action) { switch(action) {
case LE_METHOD_RPM: case LE_METHOD_RPM:
return "RPM"; return "RPM";
case LE_METHOD_CRANKING_RPM:
return "cranking_rpm";
case LE_METHOD_COOLANT: case LE_METHOD_COOLANT:
return "CLT"; return "CLT";
case LE_METHOD_FAN_ON_SETTING: case LE_METHOD_FAN_ON_SETTING:

6
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 2017-06-13_19_39_11 // on 2017-06-14_11_10_39
// //
// //
// in this file we define system FSIO expressions // in this file we define system FSIO expressions
@ -44,3 +44,7 @@
// Human-readable: rpm < fsio_setting(1) // Human-readable: rpm < fsio_setting(1)
#define RPM_BELOW_USER_SETTING_1 "rpm 1 fsio_setting <" #define RPM_BELOW_USER_SETTING_1 "rpm 1 fsio_setting <"
// starter block using configurable parameter
// Human-readable: rpm < cranking_rpm
#define STARTER_BLOCK "rpm cranking_rpm <"

2
firmware/controllers/system_fsio.txt
View File

@ -32,3 +32,5 @@ RPM_ABOVE_USER_SETTING_2=rpm > fsio_setting(2)
RPM_BELOW_USER_SETTING_1=rpm < fsio_setting(1) RPM_BELOW_USER_SETTING_1=rpm < fsio_setting(1)
# starter block using configurable parameter
STARTER_BLOCK=rpm < cranking_rpm