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

minor LCD progress

This commit is contained in:
rusefi 2019-01-12 04:53:06 -05:00
parent 17dc4c33fd
commit e0a284a7fc
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/lcd_menu_tree.h
View File

@ -37,6 +37,7 @@ typedef enum {
LL_FUEL_TOTAL, LL_FUEL_TOTAL,
LL_FUEL_CLT_CORRECTION, LL_FUEL_CLT_CORRECTION,
LL_FUEL_IAT_CORRECTION, LL_FUEL_IAT_CORRECTION,
LL_FUEL_INJECTOR_LAG,
} lcd_line_e; } lcd_line_e;
typedef void (*VoidCallback)(void); typedef void (*VoidCallback)(void);

2
firmware/controllers/engine_controller.cpp
View File

@ -770,7 +770,7 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
} }
static char UNUSED_RAM_SIZE[10400]; static char UNUSED_RAM_SIZE[10300];
static char UNUSED_CCM_SIZE[7100] CCM_OPTIONAL; static char UNUSED_CCM_SIZE[7100] CCM_OPTIONAL;

32
firmware/controllers/lcd_controller.cpp
View File

@ -54,15 +54,17 @@ static MenuTree tree(&ROOT);
* todo: add some comment explaining how this works * todo: add some comment explaining how this works
*/ */
static MenuItem miRpm(tree.root, LL_RPM); static MenuItem miRpm(tree.root, LL_RPM);
static MenuItem miSensors(tree.root, "sensors"); static MenuItem miSensors(tree.root, "SENSORS");
static MenuItem miFuelControl(tree.root, "fuel"); static MenuItem miFuelControl(tree.root, "FUEL CONTROL");
static MenuItem miBench(tree.root, "bench test"); static MenuItem miBench(tree.root, "BENCH TEST");
static MenuItem miAbout(tree.root, "about"); static MenuItem miAbout(tree.root, "ABOUT");
static MenuItem miTriggerErrors(&miRpm, LL_TRIGGER_ERRORS); static MenuItem miTriggerErrors(&miRpm, LL_TRIGGER_ERRORS);
static MenuItem miTriggerDuty(&miRpm, LL_TRIGGER_DUTY); static MenuItem miTriggerDuty(&miRpm, LL_TRIGGER_DUTY);
static MenuItem miFuelCltCorr(&miFuelControl, LL_FUEL_CLT_CORRECTION); static MenuItem miFuelCltCorr(&miFuelControl, LL_FUEL_CLT_CORRECTION);
static MenuItem miFuelIatCorr(&miFuelControl, LL_FUEL_IAT_CORRECTION);
static MenuItem miFuelInjectorLag(&miFuelControl, LL_FUEL_INJECTOR_LAG);
static MenuItem miClt(&miSensors, LL_CLT_TEMPERATURE); static MenuItem miClt(&miSensors, LL_CLT_TEMPERATURE);
static MenuItem miIat(&miSensors, LL_IAT_TEMPERATURE); static MenuItem miIat(&miSensors, LL_IAT_TEMPERATURE);
@ -202,13 +204,16 @@ static void showLine(lcd_line_e line, int screenY) {
switch (line) { switch (line) {
case LL_VERSION: case LL_VERSION:
lcdPrintf("version %s", VCS_VERSION); lcdPrintf("ver %s %d", VCS_VERSION, getRusEfiVersion());
return; return;
case LL_CONFIG: case LL_CONFIG:
lcdPrintf("config %s", getConfigurationName(engineConfiguration->engineType)); lcdPrintf("config %s", getConfigurationName(engineConfiguration->engineType));
return; return;
case LL_RPM: case LL_RPM:
lcdPrintf("RPM %d", getRpmE(engine)); {
int seconds = minI(9999, getTimeNowSeconds());
lcdPrintf("RPM %d %d ", getRpmE(engine), seconds);
}
#if EFI_FILE_LOGGING || defined(__DOXYGEN__) #if EFI_FILE_LOGGING || defined(__DOXYGEN__)
{ {
char sdState; char sdState;
@ -217,10 +222,8 @@ static void showLine(lcd_line_e line, int screenY) {
} else { } else {
sdState = 'D'; sdState = 'D';
} }
efitimesec_t seconds = getTimeNowSeconds();
if (seconds < 10000) { lcdPrintf("%c", sdState);
lcdPrintf(" %d%c", seconds, sdState);
}
} }
#endif #endif
return; return;
@ -248,9 +251,14 @@ static void showLine(lcd_line_e line, int screenY) {
lcdPrintf("Throttle %s %.2f%%", buffer, getTPS()); lcdPrintf("Throttle %s %.2f%%", buffer, getTPS());
return; return;
case LL_FUEL_CLT_CORRECTION: case LL_FUEL_CLT_CORRECTION:
lcdPrintf("CLT corr %.2fv", getCltFuelCorrection(PASS_ENGINE_PARAMETER_SIGNATURE)); lcdPrintf("CLT corr %.2f", getCltFuelCorrection(PASS_ENGINE_PARAMETER_SIGNATURE));
return;
case LL_FUEL_IAT_CORRECTION:
lcdPrintf("IAT corr %.2f", getIatFuelCorrection(engine->sensors.iat PASS_ENGINE_PARAMETER_SIGNATURE));
return;
case LL_FUEL_INJECTOR_LAG:
lcdPrintf("ING LAG %.2f", getInjectorLag(engine->sensors.vBatt PASS_ENGINE_PARAMETER_SIGNATURE));
return; return;
case LL_VBATT: case LL_VBATT:
lcdPrintf("Battery %.2fv", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE)); lcdPrintf("Battery %.2fv", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE));
return; return;