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

auto-sync

This commit is contained in:
rusEfi 2014-12-09 22:03:07 -06:00
parent b61f93242e
commit d443256045
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/controllers/engine_controller.cpp
View File

@ -267,6 +267,10 @@ static void onEvenyGeneralMilliseconds(Engine *engine) {
setPinState(ALTERNATOR_SWITCH, alternatorLogic, engine);
}
if (boardConfiguration->fanPin != GPIO_UNASSIGNED) {
// setPinState(FAN_RELAY, radiatorFanLogic, engine);
}
updateErrorCodes();
// todo: migrate this to flex logic
@ -337,8 +341,10 @@ static void showFsio(const char *msg, LEElement *element) {
static void showFsioInfo(void) {
scheduleMsg(&logger, "sys used %d/user used %d", sysPool.getSize(), userPool.getSize());
showFsio("ac", acRelayLogic);
showFsio("a/c", acRelayLogic);
showFsio("fuel", fuelPumpLogic);
showFsio("fan", radiatorFanLogic);
showFsio("alt", alternatorLogic);
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
char * exp = boardConfiguration->le_formulas[i];
@ -366,6 +372,7 @@ static void setFsioSetting(float indexF, float value) {
return;
}
engineConfiguration->bc.fsio_setting[index] = value;
showFsioInfo();
}
static void setFsioFrequency(int index, int frequency) {
@ -538,6 +545,7 @@ void initEngineContoller(Engine *engine) {
#endif
acRelayLogic = sysPool.parseExpression(AC_RELAY_LOGIC);
radiatorFanLogic = sysPool.parseExpression(FAN_CONTROL_LOGIC);
alternatorLogic = sysPool.parseExpression(ALTERNATOR_LOGIC);
@ -569,6 +577,7 @@ void initEngineContoller(Engine *engine) {
addConsoleActionI("get_float", getFloat);
addConsoleActionI("get_int", getInt);
addConsoleActionFF("set_fsio_setting", setFsioSetting);
addConsoleAction("fsioinfo", showFsioInfo);
initEval(engine);
}

20
firmware/tunerstudio/rusefi.ini
View File

@ -388,7 +388,7 @@ fileVersion = { 20141103 }
TPS = scalar, F32, 12, "%", 1, 0
MAF = scalar, F32, 16, "V", 1, 0
AFRactual = scalar, F32, 20, "AFR", 1, 0.0, 0.00, 25.5, 1 ;
fuelload = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
engineload = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0, 8, 21;
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0;
@ -397,9 +397,9 @@ fileVersion = { 20141103 }
MAP = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuel = scalar, F32, 44, "ms", 1, 0.0;
AFRextected = scalar, F32, 48, "adc", 1, 0
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
inj_adv = scalar, F32, 56, "MAP", 1, 0.0;
ign_adv = scalar, F32, 56, "deg", 1, 0.0;
sparkDwell = scalar, F32, 60, "MAP", 1, 0.0;
pulseWidth = scalar, F32, 64, "ms", 1, 0.0;
warmUpEnrich = scalar, F32, 68, "%", 1, 0.0;
@ -422,8 +422,7 @@ fileVersion = { 20141103 }
ind_iat_error = bits, U32, 80, [3:3], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version", 1, 0
egt0 = scalar, S16, 88, "°C", 1, 0
egt1 = scalar, S16, 90, "°C", 1, 0
egt1 = scalar, S16, 90, "°C", 1, 0
time = { timeNow }
engineLoad = { fuelAlgorithm == 0 ? MAF : TPS }
@ -544,7 +543,7 @@ fileVersion = { 20141103 }
mapCGauge = MAP, "MAP", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0
pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1
crankingFuelGauge = crankingFuel, "crank Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1
injadvGauge = inj_adv, "Injection Timing 1", "degrees", -360, 360, -999, -999, 999, 999, 1, 1
ignadvGauge = ign_adv, "Ignition Advance 1", "degrees", -100, 100, -999, -999, 999, 999, 1, 1
; warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 150, -1, -1, 101, 105, 0, 0
; accelEnrichGauge = accDecEnrich, "Accel Enrich", "%", 50, 150, -1, -1, 999, 999, 0, 0
dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1
@ -564,8 +563,8 @@ fileVersion = { 20141103 }
gauge5 = afr1Gauge
gauge6 = tpsADCGauge
gauge7 = dwellGauge
gauge8 = injadvGauge
gauge8 = ignadvGauge
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
@ -601,8 +600,11 @@ fileVersion = { 20141103 }
entry = MAP, "MAP", float, "%d"
entry = AFRactual, "AFR", float, "%.2f"
entry = VBatt, "vBatt", float, "%.2f"
entry = fuelload "Fuelload" float, "%d"
entry = engineload "Load" float, "%d"
entry = pulseWidth "injPulse" float, "%.3f"
entry = baseFuel "baseFuel", float, "%.2f"
entry = ign_adv "ignAdv", float, "%.2f"
; tpsADC = U16, "ADC",
; alignmet = U16, "al",
; atmPres = F32, "pres",