mirror of https://github.com/FOME-Tech/fome-fw.git
more dead console command cleanup
This commit is contained in:
parent
23f91d2fca
commit
8831512b6b
|
@ -104,9 +104,6 @@ void setEngineBMW_M73_microRusEfi() {
|
||||||
// do I have VR wires flipped?
|
// do I have VR wires flipped?
|
||||||
engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW;
|
engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW;
|
||||||
|
|
||||||
//set tps_min 891
|
|
||||||
engineConfiguration->tpsMin = 891;
|
engineConfiguration->tpsMin = 891;
|
||||||
//set tps_max 177
|
|
||||||
engineConfiguration->tpsMax = 177;
|
engineConfiguration->tpsMax = 177;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,10 +218,8 @@ void setFrankensoBoardTestConfiguration() {
|
||||||
// set engine_type 58
|
// set engine_type 58
|
||||||
void setEtbTestConfiguration() {
|
void setEtbTestConfiguration() {
|
||||||
// VAG test ETB
|
// VAG test ETB
|
||||||
// set tps_min 54
|
|
||||||
engineConfiguration->tpsMin = 54;
|
engineConfiguration->tpsMin = 54;
|
||||||
// by the way this ETB has default position of ADC=74 which is about 4%
|
// by the way this ETB has default position of ADC=74 which is about 4%
|
||||||
// set tps_max 540
|
|
||||||
engineConfiguration->tpsMax = 540;
|
engineConfiguration->tpsMax = 540;
|
||||||
|
|
||||||
// yes, 30K - that's a test configuration
|
// yes, 30K - that's a test configuration
|
||||||
|
@ -359,10 +357,8 @@ void setTle8888TestConfiguration() {
|
||||||
engineConfiguration->etb_iTermMax = 300;
|
engineConfiguration->etb_iTermMax = 300;
|
||||||
|
|
||||||
// VAG test ETB, no divider on red board - direct 3v TPS sensor
|
// VAG test ETB, no divider on red board - direct 3v TPS sensor
|
||||||
// set tps_min 332
|
|
||||||
engineConfiguration->tpsMin = 332;
|
engineConfiguration->tpsMin = 332;
|
||||||
// by the way this ETB has default position of ADC=74 which is about 4%
|
// by the way this ETB has default position of ADC=74 which is about 4%
|
||||||
// set tps_max 540
|
|
||||||
engineConfiguration->tpsMax = 799;
|
engineConfiguration->tpsMax = 799;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -350,9 +350,7 @@ static void setCommonMazdaNB() {
|
||||||
// Sensors
|
// Sensors
|
||||||
|
|
||||||
// TPS
|
// TPS
|
||||||
// set tps_min 90
|
|
||||||
engineConfiguration->tpsMin = 100; // convert 12to10 bit (ADC/4)
|
engineConfiguration->tpsMin = 100; // convert 12to10 bit (ADC/4)
|
||||||
// set tps_max 540
|
|
||||||
engineConfiguration->tpsMax = 650; // convert 12to10 bit (ADC/4)
|
engineConfiguration->tpsMax = 650; // convert 12to10 bit (ADC/4)
|
||||||
|
|
||||||
// CLT/IAT
|
// CLT/IAT
|
||||||
|
@ -629,10 +627,7 @@ static void setMiataNB2_MRE_common() {
|
||||||
// disabled for now since only allowed with ETB
|
// disabled for now since only allowed with ETB
|
||||||
// engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7;
|
// engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7;
|
||||||
|
|
||||||
// set tps_min 90
|
|
||||||
engineConfiguration->tpsMin = 90;
|
engineConfiguration->tpsMin = 90;
|
||||||
|
|
||||||
// set tps_max 540
|
|
||||||
engineConfiguration->tpsMax = 870;
|
engineConfiguration->tpsMax = 870;
|
||||||
|
|
||||||
// 0.3#4 has wrong R139? TODO: fix that custom board to match proper value!!!
|
// 0.3#4 has wrong R139? TODO: fix that custom board to match proper value!!!
|
||||||
|
@ -857,10 +852,7 @@ void setMiataNB2_Hellen72() {
|
||||||
setMazdaMiataEngineNB2Defaults();
|
setMazdaMiataEngineNB2Defaults();
|
||||||
strcpy(engineConfiguration->vehicleName, "H72 test");
|
strcpy(engineConfiguration->vehicleName, "H72 test");
|
||||||
|
|
||||||
|
|
||||||
// set tps_min 90
|
|
||||||
engineConfiguration->tpsMin = 110; // convert 12to10 bit (ADC/4)
|
engineConfiguration->tpsMin = 110; // convert 12to10 bit (ADC/4)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void setMiataNB2_Hellen72_36() {
|
void setMiataNB2_Hellen72_36() {
|
||||||
|
|
|
@ -104,10 +104,6 @@ static void printErrorCounters() {
|
||||||
/* 10mS when receiving byte by byte */
|
/* 10mS when receiving byte by byte */
|
||||||
#define TS_COMMUNICATION_TIMEOUT_SHORT TIME_MS2I(10)
|
#define TS_COMMUNICATION_TIMEOUT_SHORT TIME_MS2I(10)
|
||||||
|
|
||||||
static void resetTs() {
|
|
||||||
memset(&tsState, 0, sizeof(tsState));
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // EFI_TUNER_STUDIO
|
#endif // EFI_TUNER_STUDIO
|
||||||
|
|
||||||
void tunerStudioDebug(TsChannelBase* tsChannel, const char *msg) {
|
void tunerStudioDebug(TsChannelBase* tsChannel, const char *msg) {
|
||||||
|
@ -724,7 +720,6 @@ void startTunerStudioConnectivity(void) {
|
||||||
memset(&tsState, 0, sizeof(tsState));
|
memset(&tsState, 0, sizeof(tsState));
|
||||||
|
|
||||||
addConsoleAction("tsinfo", printErrorCounters);
|
addConsoleAction("tsinfo", printErrorCounters);
|
||||||
addConsoleAction("reset_ts", resetTs);
|
|
||||||
|
|
||||||
#if EFI_BLUETOOTH_SETUP
|
#if EFI_BLUETOOTH_SETUP
|
||||||
// module initialization start (it waits for disconnect and then communicates to the module)
|
// module initialization start (it waits for disconnect and then communicates to the module)
|
||||||
|
|
|
@ -842,9 +842,7 @@ static const float boschBiasValues[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
void setBoschVAGETB() {
|
void setBoschVAGETB() {
|
||||||
// set tps_min 890
|
|
||||||
engineConfiguration->tpsMin = 890; // convert 12to10 bit (ADC/4)
|
engineConfiguration->tpsMin = 890; // convert 12to10 bit (ADC/4)
|
||||||
// set tps_max 70
|
|
||||||
engineConfiguration->tpsMax = 70; // convert 12to10 bit (ADC/4)
|
engineConfiguration->tpsMax = 70; // convert 12to10 bit (ADC/4)
|
||||||
|
|
||||||
engineConfiguration->tps1SecondaryMin = 102;
|
engineConfiguration->tps1SecondaryMin = 102;
|
||||||
|
|
|
@ -202,10 +202,6 @@ void setConstantDwell(floatms_t dwellMs) {
|
||||||
setArrayValues(config->sparkDwellValues, dwellMs);
|
setArrayValues(config->sparkDwellValues, dwellMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setWholeIgnitionIatCorr(float value) {
|
|
||||||
setTable(config->ignitionIatCorrTable, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setFuelTablesLoadBin(float minValue, float maxValue) {
|
void setFuelTablesLoadBin(float minValue, float maxValue) {
|
||||||
setLinearCurve(config->injPhaseLoadBins, minValue, maxValue, 1);
|
setLinearCurve(config->injPhaseLoadBins, minValue, maxValue, 1);
|
||||||
setLinearCurve(config->veLoadBins, minValue, maxValue, 1);
|
setLinearCurve(config->veLoadBins, minValue, maxValue, 1);
|
||||||
|
|
|
@ -27,7 +27,6 @@ void setTwoStrokeOperationMode();
|
||||||
|
|
||||||
void prepareVoidConfiguration(engine_configuration_s *activeConfiguration);
|
void prepareVoidConfiguration(engine_configuration_s *activeConfiguration);
|
||||||
void setTargetRpmCurve(int rpm);
|
void setTargetRpmCurve(int rpm);
|
||||||
void setWholeIgnitionIatCorr(float value);
|
|
||||||
void setFuelTablesLoadBin(float minValue, float maxValue);
|
void setFuelTablesLoadBin(float minValue, float maxValue);
|
||||||
void setWholeIatCorrTimingTable(float value);
|
void setWholeIatCorrTimingTable(float value);
|
||||||
void setWholeTimingTable_d(angle_t value);
|
void setWholeTimingTable_d(angle_t value);
|
||||||
|
|
|
@ -102,14 +102,6 @@ static void setIgnitionMode(int value) {
|
||||||
prepareOutputSignals();
|
prepareOutputSignals();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setOneCoilIgnition() {
|
|
||||||
setIgnitionMode((int)IM_ONE_COIL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setWastedIgnition() {
|
|
||||||
setIgnitionMode((int)IM_WASTED_SPARK);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setIndividualCoilsIgnition() {
|
static void setIndividualCoilsIgnition() {
|
||||||
setIgnitionMode((int)IM_INDIVIDUAL_COILS);
|
setIgnitionMode((int)IM_INDIVIDUAL_COILS);
|
||||||
}
|
}
|
||||||
|
@ -129,26 +121,12 @@ static void setWholeTimingMap(float value) {
|
||||||
setTable(config->ignitionTable, value);
|
setTable(config->ignitionTable, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setWholePhaseMapCmd(float value) {
|
|
||||||
efiPrintf("Setting whole injection phase map to %.2f", value);
|
|
||||||
setTable(config->injectionPhase, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setWholeTimingMapCmd(float value) {
|
static void setWholeTimingMapCmd(float value) {
|
||||||
efiPrintf("Setting whole timing advance map to %.2f", value);
|
efiPrintf("Setting whole timing advance map to %.2f", value);
|
||||||
setWholeTimingMap(value);
|
setWholeTimingMap(value);
|
||||||
engine->resetEngineSnifferIfInTestMode();
|
engine->resetEngineSnifferIfInTestMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setWholeVeCmd(float value) {
|
|
||||||
efiPrintf("Setting whole VE map to %.2f", value);
|
|
||||||
if (engineConfiguration->fuelAlgorithm != LM_SPEED_DENSITY) {
|
|
||||||
efiPrintf("WARNING: setting VE map not in SD mode is pointless");
|
|
||||||
}
|
|
||||||
setTable(config->veTable, value);
|
|
||||||
engine->resetEngineSnifferIfInTestMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
#if EFI_PROD_CODE
|
#if EFI_PROD_CODE
|
||||||
|
|
||||||
static brain_pin_e parseBrainPinWithErrorMessage(const char *pinName) {
|
static brain_pin_e parseBrainPinWithErrorMessage(const char *pinName) {
|
||||||
|
@ -178,36 +156,6 @@ static void setIgnitionPin(const char *indexStr, const char *pinName) {
|
||||||
incrementGlobalConfigurationVersion();
|
incrementGlobalConfigurationVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
// this method is useful for desperate time debugging
|
|
||||||
// readpin PA0
|
|
||||||
void readPin(const char *pinName) {
|
|
||||||
brain_pin_e pin = parseBrainPinWithErrorMessage(pinName);
|
|
||||||
if (pin == Gpio::Invalid) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
int physicalValue = palReadPad(getHwPort("read", pin), getHwPin("read", pin));
|
|
||||||
efiPrintf("pin %s value %d", hwPortname(pin), physicalValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
// this method is useful for desperate time debugging or hardware validation
|
|
||||||
static void benchSetPinValue(const char *pinName, int bit) {
|
|
||||||
brain_pin_e pin = parseBrainPinWithErrorMessage(pinName);
|
|
||||||
if (pin == Gpio::Invalid) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
palWritePad(getHwPort("write", pin), getHwPin("write", pin), bit);
|
|
||||||
efiPrintf("pin %s set value", hwPortname(pin));
|
|
||||||
readPin(pinName);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void benchClearPin(const char *pinName) {
|
|
||||||
benchSetPinValue(pinName, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void benchSetPin(const char *pinName) {
|
|
||||||
benchSetPinValue(pinName, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setIndividualPin(const char *pinName, brain_pin_e *targetPin, const char *name) {
|
static void setIndividualPin(const char *pinName, brain_pin_e *targetPin, const char *name) {
|
||||||
brain_pin_e pin = parseBrainPinWithErrorMessage(pinName);
|
brain_pin_e pin = parseBrainPinWithErrorMessage(pinName);
|
||||||
if (pin == Gpio::Invalid) {
|
if (pin == Gpio::Invalid) {
|
||||||
|
@ -228,30 +176,10 @@ static void setIdlePin(const char *pinName) {
|
||||||
setIndividualPin(pinName, &engineConfiguration->idle.solenoidPin, "idle");
|
setIndividualPin(pinName, &engineConfiguration->idle.solenoidPin, "idle");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setMainRelayPin(const char *pinName) {
|
|
||||||
setIndividualPin(pinName, &engineConfiguration->mainRelayPin, "main relay");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setTriggerSyncPin(const char *pinName) {
|
|
||||||
setIndividualPin(pinName, &engineConfiguration->debugTriggerSync, "trigger sync");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setStarterRelayPin(const char *pinName) {
|
|
||||||
setIndividualPin(pinName, &engineConfiguration->starterRelayDisablePin, "starter disable relay");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setAlternatorPin(const char *pinName) {
|
static void setAlternatorPin(const char *pinName) {
|
||||||
setIndividualPin(pinName, &engineConfiguration->alternatorControlPin, "alternator");
|
setIndividualPin(pinName, &engineConfiguration->alternatorControlPin, "alternator");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setACRelayPin(const char *pinName) {
|
|
||||||
setIndividualPin(pinName, &engineConfiguration->acRelayPin, "A/C");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setFuelPumpPin(const char *pinName) {
|
|
||||||
setIndividualPin(pinName, &engineConfiguration->fuelPumpPin, "fuelPump");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setInjectionPin(const char *indexStr, const char *pinName) {
|
static void setInjectionPin(const char *indexStr, const char *pinName) {
|
||||||
int index = atoi(indexStr) - 1; // convert from human index into software index
|
int index = atoi(indexStr) - 1; // convert from human index into software index
|
||||||
if (index < 0 || index >= MAX_CYLINDER_COUNT)
|
if (index < 0 || index >= MAX_CYLINDER_COUNT)
|
||||||
|
@ -564,10 +492,6 @@ static void setValue(const char *paramStr, const char *valueStr) {
|
||||||
setConstantDwell(valueF);
|
setConstantDwell(valueF);
|
||||||
} else if (strEqualCaseInsensitive(paramStr, CMD_ENGINESNIFFERRPMTHRESHOLD)) {
|
} else if (strEqualCaseInsensitive(paramStr, CMD_ENGINESNIFFERRPMTHRESHOLD)) {
|
||||||
engineConfiguration->engineSnifferRpmThreshold = valueI;
|
engineConfiguration->engineSnifferRpmThreshold = valueI;
|
||||||
} else if (strEqualCaseInsensitive(paramStr, "tps_max")) {
|
|
||||||
engineConfiguration->tpsMax = valueI;
|
|
||||||
} else if (strEqualCaseInsensitive(paramStr, "tps_min")) {
|
|
||||||
engineConfiguration->tpsMin = valueI;
|
|
||||||
#if EFI_EMULATE_POSITION_SENSORS
|
#if EFI_EMULATE_POSITION_SENSORS
|
||||||
} else if (strEqualCaseInsensitive(paramStr, CMD_RPM)) {
|
} else if (strEqualCaseInsensitive(paramStr, CMD_RPM)) {
|
||||||
setTriggerEmulatorRPM(valueI);
|
setTriggerEmulatorRPM(valueI);
|
||||||
|
@ -607,14 +531,9 @@ void initSettings() {
|
||||||
addConsoleAction("calibrate_tps_1_closed", grabTPSIsClosed);
|
addConsoleAction("calibrate_tps_1_closed", grabTPSIsClosed);
|
||||||
addConsoleAction("calibrate_tps_1_wot", grabTPSIsWideOpen);
|
addConsoleAction("calibrate_tps_1_wot", grabTPSIsWideOpen);
|
||||||
|
|
||||||
addConsoleAction("set_one_coil_ignition", setOneCoilIgnition);
|
|
||||||
addConsoleAction("set_wasted_spark_ignition", setWastedIgnition);
|
|
||||||
addConsoleAction("set_individual_coils_ignition", setIndividualCoilsIgnition);
|
addConsoleAction("set_individual_coils_ignition", setIndividualCoilsIgnition);
|
||||||
|
|
||||||
addConsoleActionF("set_whole_phase_map", setWholePhaseMapCmd);
|
|
||||||
addConsoleActionF("set_whole_timing_map", setWholeTimingMapCmd);
|
addConsoleActionF("set_whole_timing_map", setWholeTimingMapCmd);
|
||||||
addConsoleActionF("set_whole_ve_map", setWholeVeCmd);
|
|
||||||
addConsoleActionF("set_whole_ign_corr_map", setWholeIgnitionIatCorr);
|
|
||||||
|
|
||||||
addConsoleAction("stopengine", (Void) scheduleStopEngine);
|
addConsoleAction("stopengine", (Void) scheduleStopEngine);
|
||||||
|
|
||||||
|
@ -633,17 +552,9 @@ void initSettings() {
|
||||||
|
|
||||||
addConsoleActionI(CMD_ECU_UNLOCK, unlockEcu);
|
addConsoleActionI(CMD_ECU_UNLOCK, unlockEcu);
|
||||||
|
|
||||||
addConsoleActionS("set_fuel_pump_pin", setFuelPumpPin);
|
|
||||||
addConsoleActionS("set_acrelay_pin", setACRelayPin);
|
|
||||||
addConsoleActionS(CMD_ALTERNATOR_PIN, setAlternatorPin);
|
addConsoleActionS(CMD_ALTERNATOR_PIN, setAlternatorPin);
|
||||||
addConsoleActionS(CMD_IDLE_PIN, setIdlePin);
|
addConsoleActionS(CMD_IDLE_PIN, setIdlePin);
|
||||||
addConsoleActionS("set_main_relay_pin", setMainRelayPin);
|
|
||||||
addConsoleActionS("set_starter_relay_pin", setStarterRelayPin);
|
|
||||||
addConsoleActionS("set_trigger_sync_pin", setTriggerSyncPin);
|
|
||||||
|
|
||||||
addConsoleActionS("bench_clearpin", benchClearPin);
|
|
||||||
addConsoleActionS("bench_setpin", benchSetPin);
|
|
||||||
addConsoleActionS("readpin", readPin);
|
|
||||||
addConsoleAction("adc_report", printFullAdcReport);
|
addConsoleAction("adc_report", printFullAdcReport);
|
||||||
|
|
||||||
#if HAL_USE_ADC
|
#if HAL_USE_ADC
|
||||||
|
|
|
@ -16,7 +16,6 @@ void scheduleStopEngine();
|
||||||
|
|
||||||
void setEngineType(int value);
|
void setEngineType(int value);
|
||||||
void setEngineType(engine_type_e value);
|
void setEngineType(engine_type_e value);
|
||||||
void readPin(const char *pinName);
|
|
||||||
|
|
||||||
void printDateTime();
|
void printDateTime();
|
||||||
void setDateTime(const char * const isoDateTime);
|
void setDateTime(const char * const isoDateTime);
|
||||||
|
|
Loading…
Reference in New Issue