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

auto-sync

This commit is contained in:
rusEfi 2014-10-12 17:02:54 -05:00
parent 74f708ecf0
commit 183fbbc2e2
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/status_loop.cpp
View File

@ -308,7 +308,7 @@ void updateDevConsoleState(void) {
static void showFuelInfo2(float rpm, float engineLoad) { static void showFuelInfo2(float rpm, float engineLoad) {
float baseFuel = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad); float baseFuel = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
scheduleMsg(&logger2, "algo=%s/pump=%s", algorithmToString(engineConfiguration->algorithm), boolToString(getOutputPinValue(FUEL_PUMP_RELAY))); scheduleMsg(&logger2, "algo=%s/pump=%s", getEngine_load_mode_e(engineConfiguration->algorithm), boolToString(getOutputPinValue(FUEL_PUMP_RELAY)));
scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel(&engine)); scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel(&engine));

7
firmware/controllers/algo/enum_strings.cpp
View File

@ -69,7 +69,7 @@ const char* getConfigurationName(engine_type_e engineType) {
return NULL; return NULL;
} }
} }
/*
const char * ignitionModeToString(ignition_mode_e mode) { const char * ignitionModeToString(ignition_mode_e mode) {
switch (mode) { switch (mode) {
case IM_ONE_COIL: case IM_ONE_COIL:
@ -82,7 +82,7 @@ const char * ignitionModeToString(ignition_mode_e mode) {
return "unexpected"; return "unexpected";
} }
} }
*/
const char * pinModeToString(pin_output_mode_e mode) { const char * pinModeToString(pin_output_mode_e mode) {
switch (mode) { switch (mode) {
case OM_DEFAULT: case OM_DEFAULT:
@ -97,7 +97,7 @@ const char * pinModeToString(pin_output_mode_e mode) {
return "unexpected"; return "unexpected";
} }
} }
/*
const char * algorithmToString(engine_load_mode_e mode) { const char * algorithmToString(engine_load_mode_e mode) {
switch(mode) { switch(mode) {
case LM_ALPHA_N: case LM_ALPHA_N:
@ -112,3 +112,4 @@ const char * algorithmToString(engine_load_mode_e mode) {
return "unexpected"; return "unexpected";
} }
} }
*/

12
firmware/controllers/settings.cpp
View File

@ -66,8 +66,8 @@ extern board_configuration_s *boardConfiguration;
*/ */
void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) { void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) {
scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType), scheduleMsg(&logger, "Template %s/%d trigger %s", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType); engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType));
scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion()); scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion());
@ -99,9 +99,9 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
scheduleMsg(&logger, "tpsMin: %d/tpsMax: %d", engineConfiguration->tpsMin, engineConfiguration->tpsMax); scheduleMsg(&logger, "tpsMin: %d/tpsMax: %d", engineConfiguration->tpsMin, engineConfiguration->tpsMax);
scheduleMsg(&logger, "ignitionMode: %s/enabled=%s", ignitionModeToString(engineConfiguration->ignitionMode), scheduleMsg(&logger, "ignitionMode: %s/enabled=%s", getIgnition_mode_e(engineConfiguration->ignitionMode),
boolToString(engineConfiguration->isIgnitionEnabled)); boolToString(engineConfiguration->isIgnitionEnabled));
scheduleMsg(&logger, "timingMode: %d", engineConfiguration->timingMode); scheduleMsg(&logger, "timingMode: %d", /*getTiming_mode_etodo*/(engineConfiguration->timingMode));
scheduleMsg(&logger, "fixedModeTiming: %d", (int) engineConfiguration->fixedModeTiming); scheduleMsg(&logger, "fixedModeTiming: %d", (int) engineConfiguration->fixedModeTiming);
scheduleMsg(&logger, "ignitionOffset=%f", engineConfiguration->ignitionOffset); scheduleMsg(&logger, "ignitionOffset=%f", engineConfiguration->ignitionOffset);
scheduleMsg(&logger, "injectionOffset=%f/enabled=%s", (double) engineConfiguration->injectionOffset, scheduleMsg(&logger, "injectionOffset=%f/enabled=%s", (double) engineConfiguration->injectionOffset,
@ -125,12 +125,12 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient); scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient);
#if EFI_PROD_CODE #if EFI_PROD_CODE
scheduleMsg(&logger, "idlePin: mode %s @ %s", pinModeToString(boardConfiguration->idleValvePinMode), scheduleMsg(&logger, "idlePin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->idleValvePinMode),
hwPortname(boardConfiguration->idleValvePin)); hwPortname(boardConfiguration->idleValvePin));
scheduleMsg(&logger, "malfunctionIndicatorPinMode: %s", scheduleMsg(&logger, "malfunctionIndicatorPinMode: %s",
pinModeToString(boardConfiguration->malfunctionIndicatorPinMode)); pinModeToString(boardConfiguration->malfunctionIndicatorPinMode));
scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", pinModeToString(boardConfiguration->fuelPumpPinMode), scheduleMsg(&logger, "fuelPumpPin: mode %s @ %s", getPin_output_mode_e(boardConfiguration->fuelPumpPinMode),
hwPortname(boardConfiguration->fuelPumpPin)); hwPortname(boardConfiguration->fuelPumpPin));
scheduleMsg(&logger, "injectionPins: mode %s", pinModeToString(boardConfiguration->injectionPinMode)); scheduleMsg(&logger, "injectionPins: mode %s", pinModeToString(boardConfiguration->injectionPinMode));

2
firmware/util/cli_registry.h
View File

@ -65,7 +65,7 @@ void helpCommand(void);
void initConsoleLogic(void); void initConsoleLogic(void);
void handleConsoleLine(char *line); void handleConsoleLine(char *line);
int findEndOfToken(const char *line); int findEndOfToken(const char *line);
char *unquote(char *line);
void addConsoleAction(const char *token, Void callback); void addConsoleAction(const char *token, Void callback);
void addConsoleActionP(const char *token, VoidPtr callback, void *param); void addConsoleActionP(const char *token, VoidPtr callback, void *param);