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

reducing dead code

This commit is contained in:
rusEfi 2019-08-31 17:59:18 -04:00
parent dd087425d5
commit d696412312
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,6 @@ static void setupEtb() {
// engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7;
// Unused // Unused
boardConfiguration->etb1.controlPin2 = GPIO_UNASSIGNED;
boardConfiguration->etb1.directionPin2 = GPIO_UNASSIGNED; boardConfiguration->etb1.directionPin2 = GPIO_UNASSIGNED;
// we only have pwm/dir, no dira/dirb // we only have pwm/dir, no dira/dirb

5
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -323,7 +323,8 @@ static void showEthInfo(void) {
hwPortname(CONFIGB(etb1.controlPin1)), hwPortname(CONFIGB(etb1.controlPin1)),
currentEtbDuty, currentEtbDuty,
engineConfiguration->etbFreq); engineConfiguration->etbFreq);
scheduleMsg(&logger, "close dir=%s", hwPortname(CONFIGB(etb1.directionPin2))); scheduleMsg(&logger, "dir1=%s", hwPortname(CONFIGB(etb1.directionPin1)));
scheduleMsg(&logger, "dir2=%s", hwPortname(CONFIGB(etb1.directionPin2)));
etbPid.showPidStatus(&logger, "ETB"); etbPid.showPidStatus(&logger, "ETB");
} }
@ -399,7 +400,6 @@ void setDefaultEtbParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
static bool isSamePins(etb_io *current, etb_io *active) { static bool isSamePins(etb_io *current, etb_io *active) {
return current->controlPin1 != active->controlPin1 || return current->controlPin1 != active->controlPin1 ||
current->controlPin2 != active->controlPin2 ||
current->directionPin1 != active->directionPin1 || current->directionPin1 != active->directionPin1 ||
current->directionPin2 != active->directionPin2; current->directionPin2 != active->directionPin2;
} }
@ -413,7 +413,6 @@ bool isETBRestartNeeded(void) {
void stopETBPins(void) { void stopETBPins(void) {
brain_pin_markUnused(activeConfiguration.bc.etb1.controlPin1); brain_pin_markUnused(activeConfiguration.bc.etb1.controlPin1);
brain_pin_markUnused(activeConfiguration.bc.etb1.controlPin2);
brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin1); brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin1);
brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin2); brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin2);
} }

2
firmware/integration/rusefi_config.txt
View File

@ -492,7 +492,7 @@ struct etb_io
brain_pin_e directionPin1; brain_pin_e directionPin1;
brain_pin_e directionPin2; brain_pin_e directionPin2;
brain_pin_e controlPin1; brain_pin_e controlPin1;
brain_pin_e controlPin2;currently UNUSED brain_pin_e unusedPin
end_struct end_struct
struct_no_prefix board_configuration_s struct_no_prefix board_configuration_s

14
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Aug 18 14:59:42 EDT 2019 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Aug 31 17:47:54 EDT 2019
// by class com.rusefi.output.JavaFieldsConsumer // by class com.rusefi.output.JavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -323,16 +323,16 @@ public class Fields {
public static final int engineType_offset = 0; public static final int engineType_offset = 0;
public static final int engineType_offset_hex = 0; public static final int engineType_offset_hex = 0;
public static final int etb1_controlPin1_offset = 682; public static final int etb1_controlPin1_offset = 682;
public static final int etb1_controlPin2_offset = 683;
public static final int etb1_directionPin1_offset = 680; public static final int etb1_directionPin1_offset = 680;
public static final int etb1_directionPin2_offset = 681; public static final int etb1_directionPin2_offset = 681;
public static final int etb1_offset = 680; public static final int etb1_offset = 680;
public static final int etb1_unusedPin_offset = 683;
public static final int etb1_use_two_wires_offset = 76; public static final int etb1_use_two_wires_offset = 76;
public static final int etb2_controlPin1_offset = 3966; public static final int etb2_controlPin1_offset = 3966;
public static final int etb2_controlPin2_offset = 3967;
public static final int etb2_directionPin1_offset = 3964; public static final int etb2_directionPin1_offset = 3964;
public static final int etb2_directionPin2_offset = 3965; public static final int etb2_directionPin2_offset = 3965;
public static final int etb2_offset = 3964; public static final int etb2_offset = 3964;
public static final int etb2_unusedPin_offset = 3967;
public static final int etb2_use_two_wires_offset = 76; public static final int etb2_use_two_wires_offset = 76;
public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_BIAS_CURVE_LENGTH = 8;
public static final int etb_dFactor_offset = 1744; public static final int etb_dFactor_offset = 1744;
@ -1480,7 +1480,7 @@ public class Fields {
public static final Field ETB1_DIRECTIONPIN1 = Field.create("ETB1_DIRECTIONPIN1", 680, FieldType.INT8, brain_pin_e); public static final Field ETB1_DIRECTIONPIN1 = Field.create("ETB1_DIRECTIONPIN1", 680, FieldType.INT8, brain_pin_e);
public static final Field ETB1_DIRECTIONPIN2 = Field.create("ETB1_DIRECTIONPIN2", 681, FieldType.INT8, brain_pin_e); public static final Field ETB1_DIRECTIONPIN2 = Field.create("ETB1_DIRECTIONPIN2", 681, FieldType.INT8, brain_pin_e);
public static final Field ETB1_CONTROLPIN1 = Field.create("ETB1_CONTROLPIN1", 682, FieldType.INT8, brain_pin_e); public static final Field ETB1_CONTROLPIN1 = Field.create("ETB1_CONTROLPIN1", 682, FieldType.INT8, brain_pin_e);
public static final Field ETB1_CONTROLPIN2 = Field.create("ETB1_CONTROLPIN2", 683, FieldType.INT8, brain_pin_e); public static final Field ETB1_UNUSEDPIN = Field.create("ETB1_UNUSEDPIN", 683, FieldType.INT8, brain_pin_e);
public static final Field FUELLEVELEMPTYTANKVOLTAGE = Field.create("FUELLEVELEMPTYTANKVOLTAGE", 684, FieldType.FLOAT); public static final Field FUELLEVELEMPTYTANKVOLTAGE = Field.create("FUELLEVELEMPTYTANKVOLTAGE", 684, FieldType.FLOAT);
public static final Field FUELLEVELFULLTANKVOLTAGE = Field.create("FUELLEVELFULLTANKVOLTAGE", 688, FieldType.FLOAT); public static final Field FUELLEVELFULLTANKVOLTAGE = Field.create("FUELLEVELFULLTANKVOLTAGE", 688, FieldType.FLOAT);
public static final String[] ego_sensor_e = {"BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom"}; public static final String[] ego_sensor_e = {"BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom"};
@ -2004,7 +2004,7 @@ public class Fields {
public static final Field ETB2_DIRECTIONPIN1 = Field.create("ETB2_DIRECTIONPIN1", 3964, FieldType.INT8, brain_pin_e); public static final Field ETB2_DIRECTIONPIN1 = Field.create("ETB2_DIRECTIONPIN1", 3964, FieldType.INT8, brain_pin_e);
public static final Field ETB2_DIRECTIONPIN2 = Field.create("ETB2_DIRECTIONPIN2", 3965, FieldType.INT8, brain_pin_e); public static final Field ETB2_DIRECTIONPIN2 = Field.create("ETB2_DIRECTIONPIN2", 3965, FieldType.INT8, brain_pin_e);
public static final Field ETB2_CONTROLPIN1 = Field.create("ETB2_CONTROLPIN1", 3966, FieldType.INT8, brain_pin_e); public static final Field ETB2_CONTROLPIN1 = Field.create("ETB2_CONTROLPIN1", 3966, FieldType.INT8, brain_pin_e);
public static final Field ETB2_CONTROLPIN2 = Field.create("ETB2_CONTROLPIN2", 3967, FieldType.INT8, brain_pin_e); public static final Field ETB2_UNUSEDPIN = Field.create("ETB2_UNUSEDPIN", 3967, FieldType.INT8, brain_pin_e);
public static final Field IDLETIMINGPID_PFACTOR = Field.create("IDLETIMINGPID_PFACTOR", 3968, FieldType.FLOAT); public static final Field IDLETIMINGPID_PFACTOR = Field.create("IDLETIMINGPID_PFACTOR", 3968, FieldType.FLOAT);
public static final Field IDLETIMINGPID_IFACTOR = Field.create("IDLETIMINGPID_IFACTOR", 3972, FieldType.FLOAT); public static final Field IDLETIMINGPID_IFACTOR = Field.create("IDLETIMINGPID_IFACTOR", 3972, FieldType.FLOAT);
public static final Field IDLETIMINGPID_DFACTOR = Field.create("IDLETIMINGPID_DFACTOR", 3976, FieldType.FLOAT); public static final Field IDLETIMINGPID_DFACTOR = Field.create("IDLETIMINGPID_DFACTOR", 3976, FieldType.FLOAT);
@ -2253,7 +2253,7 @@ public class Fields {
ETB1_DIRECTIONPIN1, ETB1_DIRECTIONPIN1,
ETB1_DIRECTIONPIN2, ETB1_DIRECTIONPIN2,
ETB1_CONTROLPIN1, ETB1_CONTROLPIN1,
ETB1_CONTROLPIN2, ETB1_UNUSEDPIN,
FUELLEVELEMPTYTANKVOLTAGE, FUELLEVELEMPTYTANKVOLTAGE,
FUELLEVELFULLTANKVOLTAGE, FUELLEVELFULLTANKVOLTAGE,
AFR_TYPE, AFR_TYPE,
@ -2768,7 +2768,7 @@ public class Fields {
ETB2_DIRECTIONPIN1, ETB2_DIRECTIONPIN1,
ETB2_DIRECTIONPIN2, ETB2_DIRECTIONPIN2,
ETB2_CONTROLPIN1, ETB2_CONTROLPIN1,
ETB2_CONTROLPIN2, ETB2_UNUSEDPIN,
IDLETIMINGPID_PFACTOR, IDLETIMINGPID_PFACTOR,
IDLETIMINGPID_IFACTOR, IDLETIMINGPID_IFACTOR,
IDLETIMINGPID_DFACTOR, IDLETIMINGPID_DFACTOR,