From e1beee711ef98c09580475a0a190856cda6c1d2e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 13 Feb 2015 21:04:11 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata.cpp | 5 ++++ firmware/controllers/algo/lcd_menu_tree.h | 4 +++ firmware/controllers/lcd_controller.cpp | 36 ++++++++++++++++++++--- firmware/controllers/sensors/maf.cpp | 3 ++ firmware/svnversion.h | 5 ++-- firmware/tunerstudio/rusefi.ini | 11 +++++++ 6 files changed, 57 insertions(+), 7 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index e940643aae..8b005b94c1 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -256,6 +256,11 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration) { boardConfiguration->triggerInputPins[0] = GPIOC_6; boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP + // Denso 195500-2180 + engineConfiguration->injector.flow = 265; + + engineConfiguration->hasBaroSensor = false; + engineConfiguration->hasMapSensor = true; engineConfiguration->map.sensor.type = MT_DENSO183; // set_global_trigger_offset_angle 659 diff --git a/firmware/controllers/algo/lcd_menu_tree.h b/firmware/controllers/algo/lcd_menu_tree.h index fd96e0f603..585f59ae96 100644 --- a/firmware/controllers/algo/lcd_menu_tree.h +++ b/firmware/controllers/algo/lcd_menu_tree.h @@ -14,6 +14,7 @@ typedef enum { LL_ALGORITHM, LL_INJECTION, LL_IGNITION, + LL_ING_FLOW, LL_RPM, LL_TRIGGER_ERRORS, @@ -21,10 +22,13 @@ typedef enum { LL_CLT_TEMPERATURE, LL_IAT_TEMPERATURE, + LL_AFR, LL_TPS, LL_VBATT, LL_MAF, LL_MAP, + LL_MAF_V, + LL_MAF_KG_HR, LL_EGO, LL_BARO, diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp index 76ce359d8f..18c4e566be 100644 --- a/firmware/controllers/lcd_controller.cpp +++ b/firmware/controllers/lcd_controller.cpp @@ -45,7 +45,10 @@ static MenuItem miIat(&miSensors, LL_IAT_TEMPERATURE); static MenuItem miTps(&miSensors, LL_TPS); static MenuItem miVBatt(&miSensors, LL_VBATT); static MenuItem miMap(&miSensors, LL_MAP); +static MenuItem miAfr(&miSensors, LL_AFR); static MenuItem miBaro(&miSensors, LL_BARO); +static MenuItem miMapV(&miSensors, LL_MAF_V); +static MenuItem miMapKgHr(&miSensors, LL_MAF_KG_HR); static MenuItem miStopEngine(&miBench, "stop engine", stopEngine); static MenuItem miTestFan(&miBench, "test fan", fanBench); @@ -64,6 +67,7 @@ static MenuItem miConfig(&miAbout, LL_CONFIG); static MenuItem miAlgo(&miAbout, LL_ALGORITHM); static MenuItem miInjection(&miAbout, LL_INJECTION); static MenuItem miIgnition(&miAbout, LL_IGNITION); +static MenuItem miInjFlow(&miAbout, LL_ING_FLOW); #define DISP_LINES (engineConfiguration->HD44780height - 1) @@ -208,6 +212,9 @@ static void showLine(lcd_line_e line) { case LL_INJECTION: lcdPrintf(getInjection_mode_e(engineConfiguration->injectionMode)); return; + case LL_ING_FLOW: + lcdPrintf("Inj %fcc", engineConfiguration->injector.flow); + return; case LL_IGNITION: lcdPrintf(getIgnition_mode_e(engineConfiguration->ignitionMode)); return; @@ -219,16 +226,37 @@ static void showLine(lcd_line_e line) { return; case LL_BARO: if (engineConfiguration->hasBaroSensor) { - lcdPrintf("Baro: none"); - } else { lcdPrintf("Baro: %f", getBaroPressure()); + } else { + lcdPrintf("Baro: none"); + } + return; + case LL_AFR: + if (engineConfiguration->hasAfrSensor) { + lcdPrintf("AFR: %f", getAfr()); + } else { + lcdPrintf("AFR: none"); } return; case LL_MAP: if (engineConfiguration->hasMapSensor) { - lcdPrintf("MAP: none"); + lcdPrintf("MAP %f", getMap()); } else { - lcdPrintf("MAP %s", getMap()); + lcdPrintf("MAP: none"); + } + return; + case LL_MAF_V: + if (engineConfiguration->hasMafSensor) { + lcdPrintf("MAF: %fv", getMaf()); + } else { + lcdPrintf("MAF: none"); + } + return; + case LL_MAF_KG_HR: + if (engineConfiguration->hasMafSensor) { + lcdPrintf("MAF: %f kg/hr", getRealMaf()); + } else { + lcdPrintf("MAF: none"); } return; case LL_TRIGGER_ERRORS: diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/maf.cpp index 95b4af3dd6..85001db2bd 100644 --- a/firmware/controllers/sensors/maf.cpp +++ b/firmware/controllers/sensors/maf.cpp @@ -6,6 +6,9 @@ EXTERN_ENGINE ; +/** + * @return MAF sensor voltage + */ float getMaf(DECLARE_ENGINE_PARAMETER_F) { return getMafT(engineConfiguration); } diff --git a/firmware/svnversion.h b/firmware/svnversion.h index aad4e8a68d..4998a51cd1 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,6 +1,5 @@ // This file was generated by Version2Header -// Sat Jan 31 16:18:01 EST 2015 +// Fri Feb 13 20:54:42 EST 2015 #ifndef VCS_VERSION -#define VCS_VERSION "6619" +#define VCS_VERSION "6833" #endif - diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 91ec54b4d5..39a181727a 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -676,6 +676,15 @@ fileVersion = { 20150211 } gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = ve2TableTbl, ve2TableMap, "VE2 Table", 1 + ; constant, variable + xBins = ve2RpmBins, rpm + yBins = ve2LoadBins, engineLoad + zBins = ve2Table +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = injPhaseTableTbl, injPhaseTableMap, "Injection Phase Table", 1 ; constant, variable xBins = injPhaseRpmBins, rpm @@ -828,6 +837,7 @@ fileVersion = { 20150211 } subMenu = iatFuelCorrCurve, "Intake air temp fuel correction" subMenu = cltFuelCorrCurve, "Coolant temp fuel correction" subMenu = veTableTbl, "VE Table", {algorithm == 3} + subMenu = ve2TableTbl, "VE2 Table" subMenu = afrTableTbl, "Targe AFR Table", {algorithm == 3} subMenu = injPhaseTableTbl, "Injection Phase" subMenu = std_separator @@ -842,6 +852,7 @@ fileVersion = { 20150211 } subMenu = ignitionTableMap, "Ignition Map" subMenu = fuelTableMap, "Fuel Table" subMenu = veTableMap, "VE Table" + subMenu = ve2TableMap, "VE2 Table" subMenu = afrTableMap, "Targe AFR Table" subMenu = injPhaseTableMap, "Injection Phase"