FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove tach output pin (#1779) 

* remove from cfg

* cfg

* rip out impl

* efi gpio
This commit is contained in:
Matthew Kennedy 2020-09-09 13:52:23 -07:00 committed by GitHub
parent 0354eccb2e
commit c2eb7c9f4a
14 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/me7_pnp/board_configuration.cpp
View File

@ -43,7 +43,6 @@ void setPinConfigurationOverrides(void) {
void setBoardConfigurationOverrides(void) {
// NOT USED
engineConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;
engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE;
engineConfiguration->displayMode = DM_NONE;
engineConfiguration->HD44780_rs = GPIO_UNASSIGNED;

1
firmware/config/boards/nucleo_f767/board_configuration.cpp
View File

@ -53,7 +53,6 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_NONE;
// not used
engineConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;
engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE;
engineConfiguration->displayMode = DM_NONE;
engineConfiguration->HD44780_rs = GPIO_UNASSIGNED;

1
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -200,7 +200,6 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->triggerSimulatorPinModes[0] = OM_DEFAULT;
// not used
engineConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;
engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE;
engineConfiguration->displayMode = DM_NONE;
engineConfiguration->HD44780_rs = GPIO_UNASSIGNED;

3
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -187,7 +187,4 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, default_tps_advance_table);
#endif
engineConfiguration->dizzySparkOutputPin = GPIOE_3;
engineConfiguration->dizzySparkOutputPinMode = OM_INVERTED;
}

2
firmware/config/engines/ford_festiva.cpp
View File

@ -174,8 +174,6 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;
engineConfiguration->dizzySparkOutputPin = GPIOE_14; // Frankenso high side - pin 1G;
/**
* Outputs
*/

4
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -407,7 +407,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// high-side driver with +12v VP jumper
engineConfiguration->dizzySparkOutputPin = GPIOE_8; // tachometer
engineConfiguration->tachOutputPin = GPIOE_8; // tachometer
// set global_trigger_offset_angle 0
engineConfiguration->globalTriggerAngleOffset = 0;
@ -594,7 +594,7 @@ static void setMiataNB2_MRE_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// GPIOD_6: "13 - GP Out 6" - selected to +12v
engineConfiguration->alternatorControlPin = GPIOD_6;
// GPIOD_7: "14 - GP Out 5" - selected to +12v
engineConfiguration->dizzySparkOutputPin = GPIOD_7; // tachometer
engineConfiguration->tachOutputPin = GPIOD_7; // tachometer
// set cranking_fuel 9
engineConfiguration->cranking.baseFuel = 9; // higher value for return system NA conversion since lower fuel pressure

1
firmware/console/status_loop.cpp
View File

@ -202,7 +202,6 @@ void printOverallStatus(systime_t nowSeconds) {
printOutPin(PROTOCOL_VVT_NAME, engineConfiguration->camInputs[0]);
printOutPin(PROTOCOL_HIP_NAME, CONFIG(hip9011IntHoldPin));
printOutPin(PROTOCOL_TACH_NAME, CONFIG(tachOutputPin));
printOutPin(PROTOCOL_DIZZY_NAME, engineConfiguration->dizzySparkOutputPin);
#if EFI_LOGIC_ANALYZER
printOutPin(PROTOCOL_WA_CHANNEL_1, CONFIG(logicAnalyzerPins)[0]);
printOutPin(PROTOCOL_WA_CHANNEL_2, CONFIG(logicAnalyzerPins)[1]);

6
firmware/controllers/bench_test.cpp
View File

@ -225,11 +225,6 @@ static void sparkbench(const char * onTimeStr, const char *offTimeStr, const cha
sparkbench2("0", "1", onTimeStr, offTimeStr, countStr);
}
void dizzyBench(void) {
pinbench("300", "5", "400", "3", &enginePins.dizzyOutput, engineConfiguration->dizzySparkOutputPin);
}
class BenchController : public PeriodicController<UTILITY_THREAD_STACK_SIZE> {
public:
BenchController() : PeriodicController("BenchThread") { }
@ -383,7 +378,6 @@ void initBenchTest(Logging *sharedLogger) {
addConsoleActionS("fuelpumpbench2", fuelPumpBenchExt);
addConsoleAction("fanbench", fanBench);
addConsoleActionS("fanbench2", fanBenchExt);
addConsoleAction("dizzybench", dizzyBench); // this is useful for tach output testing
addConsoleAction(CMD_STARTER_BENCH, starterRelayBench);
addConsoleAction(CMD_MIL_BENCH, milBench);

10
firmware/controllers/engine_cycle/spark_logic.cpp
View File

@ -69,11 +69,6 @@ static void fireSparkBySettingPinLow(IgnitionEvent *event, IgnitionOutputPin *ou
}
output->setLow();
#if EFI_PROD_CODE
if (CONFIG(dizzySparkOutputPin) != GPIO_UNASSIGNED) {
enginePins.dizzyOutput.setLow();
}
#endif /* EFI_PROD_CODE */
}
// todo: make this a class method?
@ -246,11 +241,6 @@ static void startDwellByTurningSparkPinHigh(IgnitionEvent *event, IgnitionOutput
}
output->setHigh();
#if EFI_PROD_CODE
if (CONFIG(dizzySparkOutputPin) != GPIO_UNASSIGNED) {
enginePins.dizzyOutput.setHigh();
}
#endif /* EFI_PROD_CODE */
}
void turnSparkPinHigh(IgnitionEvent *event) {

2
firmware/controllers/gauges/tachometer.cpp
View File

@ -4,8 +4,6 @@
*
* This implementation produces one pulse per engine cycle
*
* todo: these is a bit of duplication with dizzySparkOutputPin
*
* @date Aug 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2020
*/

7
firmware/controllers/system/efi_gpio.cpp
View File

@ -50,7 +50,6 @@ static const char *injectorShortNames[] = { PROTOCOL_INJ1_SHORT_NAME, "i2", "i3"
static const char *auxValveShortNames[] = { "a1", "a2"};
EnginePins::EnginePins() {
dizzyOutput.name = PROTOCOL_DIZZY_NAME;
tachOut.name = PROTOCOL_TACH_NAME;
static_assert(efi::size(sparkNames) >= IGNITION_PIN_COUNT, "Too many ignition pins");
@ -132,7 +131,6 @@ void EnginePins::unregisterPins() {
unregisterOutputIfPinOrModeChanged(hipCs, hip9011CsPin, hip9011CsPinMode);
unregisterOutputIfPinOrModeChanged(triggerDecoderErrorPin, triggerErrorPin, triggerErrorPinMode);
unregisterOutputIfPinOrModeChanged(checkEnginePin, malfunctionIndicatorPin, malfunctionIndicatorPinMode);
unregisterOutputIfPinOrModeChanged(dizzyOutput, dizzySparkOutputPin, dizzySparkOutputPinMode);
unregisterOutputIfPinOrModeChanged(tachOut, tachOutputPin, tachOutputPinMode);
unregisterOutputIfPinOrModeChanged(idleSolenoidPin, idle.solenoidPin, idle.solenoidPinMode);
unregisterOutputIfPinOrModeChanged(secondIdleSolenoidPin, secondSolenoidPin, idle.solenoidPinMode);
@ -201,11 +199,6 @@ void EnginePins::startIgnitionPins(void) {
output->initPin(output->name, CONFIG(ignitionPins)[i], &CONFIG(ignitionPinMode));
}
}
if (isPinOrModeChanged(dizzySparkOutputPin, dizzySparkOutputPinMode)) {
enginePins.dizzyOutput.initPin("Distributor", engineConfiguration->dizzySparkOutputPin,
&engineConfiguration->dizzySparkOutputPinMode);
}
#endif /* EFI_PROD_CODE */
}

2
firmware/controllers/system/efi_gpio.h
View File

@ -171,8 +171,6 @@ public:
OutputPin checkEnginePin;
NamedOutputPin tachOut;
// todo: remove this feature https://github.com/rusefi/rusefi/issues/1775
NamedOutputPin dizzyOutput;
OutputPin fsioOutputs[FSIO_COMMAND_COUNT];
OutputPin triggerDecoderErrorPin;

6
firmware/integration/rusefi_config.txt
View File

@ -710,7 +710,7 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas
brain_input_pin_e[TRIGGER_INPUT_PIN_COUNT iterate] triggerInputPins;
pin_output_mode_e hip9011CsPinMode;
output_pin_e tachOutputPin;+This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin.
output_pin_e tachOutputPin;
pin_output_mode_e tachOutputPinMode;
output_pin_e mainRelayPin;
@ -1201,8 +1201,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
spi_device_e cj125SpiDevice;
pin_output_mode_e cj125CsPinMode;
output_pin_e dizzySparkOutputPin;+This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin
pin_output_mode_e dizzySparkOutputPinMode;
uint8_t unusedDizzy;;"units",1,0,-20,100,0
int crankingIACposition;+This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling.;"percent", 1, 0, -100.0, 100, 0
float tChargeMinRpmMinTps;;"mult", 1, 0, 0, 3, 4
@ -1685,7 +1684,6 @@ end_struct
#define PROTOCOL_VVT_NAME "VVT"
#define PROTOCOL_HIP_NAME "HIP"
#define PROTOCOL_TACH_NAME "tach"
#define PROTOCOL_DIZZY_NAME "dizzy"
#define PROTOCOL_WA_CHANNEL_1 "input1"
#define PROTOCOL_WA_CHANNEL_2 "input2"

7
firmware/tunerstudio/rusefi.input
View File

@ -1600,10 +1600,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
; see rusefi_config.txt comment next to 'ignitionPin2logic' which says
; this section is auto-generated by FiringOrderTSLogic.java
@@FIRINGORDER@@
field = "This is useful to have tachometer working"
field = " while converting from distributor"
field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1}
field = "Dizzy out Pin Mode", dizzySparkOutputPinMode, {isIgnitionEnabled == 1}
dialog = ignitionBasic, ""
field = "Enabled", isIgnitionEnabled
@ -1949,7 +1945,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = allPins1_2
field = "Tachometer output Pin", tachOutputPin
field = "Dizzy out Pin", dizzySparkOutputPin
field = "O2 heater pin", o2heaterPin
field = "Idle Solenoid Pin", idle_solenoidPin
field = "Second Idle Solenoid Pin", secondSolenoidPin
@ -2599,13 +2594,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
field = "Smoothing factor", slowAdcAlpha
dialog = tachSettings, "Tachometer output"
field = "!See also dizzySparkOutputPin"
field = "Pin", tachOutputPin
field = "Pin mode", tachOutputPinMode
field = "Rise at trigger index", tachPulseTriggerIndex
field = "Pulse duration is duty cycle", tachPulseDurationAsDutyCycle
field = "Pulse duration", tachPulseDuractionMs
; todo: finish implementation under #907
field = "Pulse per Rev", tachPulsePerRev