diff --git a/firmware/config/engines/bmw_m73_mre.cpp b/firmware/config/engines/bmw_m73_mre.cpp index c07f5d8bad..3869f949bf 100644 --- a/firmware/config/engines/bmw_m73_mre.cpp +++ b/firmware/config/engines/bmw_m73_mre.cpp @@ -104,9 +104,6 @@ void setEngineBMW_M73_microRusEfi() { // do I have VR wires flipped? engineConfiguration->trigger.type = trigger_type_e::TT_60_2_VW; - //set tps_min 891 engineConfiguration->tpsMin = 891; - //set tps_max 177 engineConfiguration->tpsMax = 177; - } diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index a7c18669cc..864333d7f9 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -218,10 +218,8 @@ void setFrankensoBoardTestConfiguration() { // set engine_type 58 void setEtbTestConfiguration() { // VAG test ETB - // set tps_min 54 engineConfiguration->tpsMin = 54; // by the way this ETB has default position of ADC=74 which is about 4% - // set tps_max 540 engineConfiguration->tpsMax = 540; // yes, 30K - that's a test configuration @@ -359,10 +357,8 @@ void setTle8888TestConfiguration() { engineConfiguration->etb_iTermMax = 300; // VAG test ETB, no divider on red board - direct 3v TPS sensor - // set tps_min 332 engineConfiguration->tpsMin = 332; // by the way this ETB has default position of ADC=74 which is about 4% - // set tps_max 540 engineConfiguration->tpsMax = 799; } diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 9ddcc2d72c..6cba165d19 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -350,9 +350,7 @@ static void setCommonMazdaNB() { // Sensors // TPS - // set tps_min 90 engineConfiguration->tpsMin = 100; // convert 12to10 bit (ADC/4) - // set tps_max 540 engineConfiguration->tpsMax = 650; // convert 12to10 bit (ADC/4) // CLT/IAT @@ -629,10 +627,7 @@ static void setMiataNB2_MRE_common() { // disabled for now since only allowed with ETB // engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; - // set tps_min 90 engineConfiguration->tpsMin = 90; - - // set tps_max 540 engineConfiguration->tpsMax = 870; // 0.3#4 has wrong R139? TODO: fix that custom board to match proper value!!! @@ -857,10 +852,7 @@ void setMiataNB2_Hellen72() { setMazdaMiataEngineNB2Defaults(); strcpy(engineConfiguration->vehicleName, "H72 test"); - - // set tps_min 90 engineConfiguration->tpsMin = 110; // convert 12to10 bit (ADC/4) - } void setMiataNB2_Hellen72_36() { diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 2353e371d3..d90c3e112c 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -104,10 +104,6 @@ static void printErrorCounters() { /* 10mS when receiving byte by byte */ #define TS_COMMUNICATION_TIMEOUT_SHORT TIME_MS2I(10) -static void resetTs() { - memset(&tsState, 0, sizeof(tsState)); -} - #endif // EFI_TUNER_STUDIO void tunerStudioDebug(TsChannelBase* tsChannel, const char *msg) { @@ -724,8 +720,7 @@ void startTunerStudioConnectivity(void) { memset(&tsState, 0, sizeof(tsState)); addConsoleAction("tsinfo", printErrorCounters); - addConsoleAction("reset_ts", resetTs); - + #if EFI_BLUETOOTH_SETUP // module initialization start (it waits for disconnect and then communicates to the module) // Usage: "bluetooth_hc06 " diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 05590094cb..1aeef682ad 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -842,9 +842,7 @@ static const float boschBiasValues[] = { }; void setBoschVAGETB() { - // set tps_min 890 engineConfiguration->tpsMin = 890; // convert 12to10 bit (ADC/4) - // set tps_max 70 engineConfiguration->tpsMax = 70; // convert 12to10 bit (ADC/4) engineConfiguration->tps1SecondaryMin = 102; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a96e28678e..c57a4813ef 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -202,10 +202,6 @@ void setConstantDwell(floatms_t dwellMs) { setArrayValues(config->sparkDwellValues, dwellMs); } -void setWholeIgnitionIatCorr(float value) { - setTable(config->ignitionIatCorrTable, value); -} - void setFuelTablesLoadBin(float minValue, float maxValue) { setLinearCurve(config->injPhaseLoadBins, minValue, maxValue, 1); setLinearCurve(config->veLoadBins, minValue, maxValue, 1); diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 894155c2c8..8372ce581f 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -27,7 +27,6 @@ void setTwoStrokeOperationMode(); void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); void setTargetRpmCurve(int rpm); -void setWholeIgnitionIatCorr(float value); void setFuelTablesLoadBin(float minValue, float maxValue); void setWholeIatCorrTimingTable(float value); void setWholeTimingTable_d(angle_t value); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index dc73ce96cc..3201b5c7e1 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -102,14 +102,6 @@ static void setIgnitionMode(int value) { prepareOutputSignals(); } -static void setOneCoilIgnition() { - setIgnitionMode((int)IM_ONE_COIL); -} - -static void setWastedIgnition() { - setIgnitionMode((int)IM_WASTED_SPARK); -} - static void setIndividualCoilsIgnition() { setIgnitionMode((int)IM_INDIVIDUAL_COILS); } @@ -129,26 +121,12 @@ static void setWholeTimingMap(float 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) { efiPrintf("Setting whole timing advance map to %.2f", value); setWholeTimingMap(value); 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 static brain_pin_e parseBrainPinWithErrorMessage(const char *pinName) { @@ -178,36 +156,6 @@ static void setIgnitionPin(const char *indexStr, const char *pinName) { 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) { brain_pin_e pin = parseBrainPinWithErrorMessage(pinName); if (pin == Gpio::Invalid) { @@ -228,30 +176,10 @@ static void setIdlePin(const char *pinName) { 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) { 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) { int index = atoi(indexStr) - 1; // convert from human index into software index if (index < 0 || index >= MAX_CYLINDER_COUNT) @@ -564,10 +492,6 @@ static void setValue(const char *paramStr, const char *valueStr) { setConstantDwell(valueF); } else if (strEqualCaseInsensitive(paramStr, CMD_ENGINESNIFFERRPMTHRESHOLD)) { 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 } else if (strEqualCaseInsensitive(paramStr, CMD_RPM)) { setTriggerEmulatorRPM(valueI); @@ -607,14 +531,9 @@ void initSettings() { addConsoleAction("calibrate_tps_1_closed", grabTPSIsClosed); addConsoleAction("calibrate_tps_1_wot", grabTPSIsWideOpen); - addConsoleAction("set_one_coil_ignition", setOneCoilIgnition); - addConsoleAction("set_wasted_spark_ignition", setWastedIgnition); addConsoleAction("set_individual_coils_ignition", setIndividualCoilsIgnition); - addConsoleActionF("set_whole_phase_map", setWholePhaseMapCmd); addConsoleActionF("set_whole_timing_map", setWholeTimingMapCmd); - addConsoleActionF("set_whole_ve_map", setWholeVeCmd); - addConsoleActionF("set_whole_ign_corr_map", setWholeIgnitionIatCorr); addConsoleAction("stopengine", (Void) scheduleStopEngine); @@ -633,17 +552,9 @@ void initSettings() { addConsoleActionI(CMD_ECU_UNLOCK, unlockEcu); - addConsoleActionS("set_fuel_pump_pin", setFuelPumpPin); - addConsoleActionS("set_acrelay_pin", setACRelayPin); addConsoleActionS(CMD_ALTERNATOR_PIN, setAlternatorPin); 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); #if HAL_USE_ADC diff --git a/firmware/controllers/settings.h b/firmware/controllers/settings.h index 90965a737d..00954daf3d 100644 --- a/firmware/controllers/settings.h +++ b/firmware/controllers/settings.h @@ -16,7 +16,6 @@ void scheduleStopEngine(); void setEngineType(int value); void setEngineType(engine_type_e value); -void readPin(const char *pinName); void printDateTime(); void setDateTime(const char * const isoDateTime);