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

better? field name

This commit is contained in:
rusEfi 2018-11-30 00:17:55 -05:00
parent d39ec0372b
commit 3d3122c76c
14 changed files with 653 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/NUCLEO_F767/board_configuration.cpp
View File

@ -53,7 +53,7 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->adcVcc = ADC_VCC;
#endif
engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionAdcChannel = EFI_ADC_NONE;
// not used
engineConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;

2
firmware/config/boards/Prometheus/board_configuration.cpp
View File

@ -146,7 +146,7 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->adcVcc = ADC_VCC;
engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionAdcChannel = EFI_ADC_NONE;
boardConfiguration->injectionPins[0] = is469 ? GPIOD_9 : GPIOB_14; // #1
boardConfiguration->injectionPins[1] = is469 ? GPIOD_15 : GPIOC_7; // #2

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

@ -34,7 +34,7 @@ void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE)
// etb testing
// boardConfiguration->clutchUpPin
boardConfiguration->etbControlPin1 = GPIOD_3;
engineConfiguration->pedalPositionChannel = EFI_ADC_1;
engineConfiguration->pedalPositionAdcChannel = EFI_ADC_1;
boardConfiguration->etbDirectionPin2 = GPIOD_5;
engineConfiguration->tpsMin = 337;

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -841,7 +841,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionAdcChannel = EFI_ADC_NONE;
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;

610
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:17:02 EST 2018
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:21:24 EST 2018
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1205,6 +1205,7 @@ typedef struct {
*/
int HD44780height;
/**
* See aslo pedalPositionAdcChannel
* offset 520
*/
adc_channel_e tpsAdcChannel;
@ -1249,9 +1250,11 @@ typedef struct {
*/
afr_sensor_s afr;
/**
* Electronic pedal position input
* See also tpsAdcChannel
* offset 588
*/
adc_channel_e pedalPositionChannel;
adc_channel_e pedalPositionAdcChannel;
/**
* @see hasBaroSensor
* offset 592
@ -1825,4 +1828,605 @@ typedef struct {
* Fixed timing, useful for TDC testing
* offset 2360
*/
float f
float fixedTiming;
/**
* MAP voltage for low point
* offset 2364
*/
float mapLowValueVoltage;
/**
* MAP voltage for low point
* offset 2368
*/
float mapHighValueVoltage;
/**
* EGO value correction
* offset 2372
*/
float egoValueShift;
/**
* offset 2376
*/
brain_input_pin_e camInput;
/**
* IAC position during cranking
* offset 2380
*/
int crankingIACposition;
/**
* offset 2384
*/
float tChargeMinRpmMinTps;
/**
* offset 2388
*/
float tChargeMinRpmMaxTps;
/**
* offset 2392
*/
float tChargeMaxRpmMinTps;
/**
* offset 2396
*/
float tChargeMaxRpmMaxTps;
/**
* offset 2400
*/
brain_pin_e auxPidPins[AUX_PID_COUNT];
/**
* offset 2416
*/
fsio_pwm_freq_t auxPidFrequency[AUX_PID_COUNT];
/**
* offset 2424
*/
int alternatorPwmFrequency;
/**
* offset 2428
*/
mass_storage_e storageMode;
/**
* offset 2432
*/
spi_device_e cj125SpiDevice;
/**
* offset 2436
*/
pin_output_mode_e cj125CsPinMode;
/**
* Narrow Band WBO Approximation
* offset 2440
*/
float narrowToWideOxygenBins[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE];
/**
* offset 2472
*/
float narrowToWideOxygen[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE];
/**
* set vvt_mode X
* offset 2504
*/
vvt_mode_e vvtMode;
/**
* offset 2508
*/
bi_quard_s biQuad;
/**
* CLT-based timing correction
* offset 2528
*/
float cltTimingBins[CLT_TIMING_CURVE_SIZE];
/**
* offset 2560
*/
float cltTimingExtra[CLT_TIMING_CURVE_SIZE];
/**
* offset 2592
*/
int nbVvtIndex;
/**
* offset 2596
*/
float autoTuneCltThreshold;
/**
* offset 2600
*/
float autoTuneTpsRocThreshold;
/**
* offset 2604
*/
float autoTuneTpsQuietPeriod;
/**
* offset 2608
*/
float postCrankingTargetClt;
/**
* Fuel multiplier taper, see also postCrankingDurationSec
* offset 2612
*/
float postCrankingFactor;
/**
* See also postCrankingFactor
* offset 2616
*/
float postCrankingDurationSec;
/**
* todo: finish implementation #332
* offset 2620
*/
ThermistorConf auxTempSensor1;
/**
* todo: finish implementation #332
* offset 2652
*/
ThermistorConf auxTempSensor2;
/**
* offset 2684
*/
int16_t fuelClosedLoopCltThreshold;
/**
* offset 2686
*/
int16_t fuelClosedLoopTpsThreshold;
/**
* offset 2688
*/
int16_t fuelClosedLoopRpmThreshold;
/**
* offset 2690
*/
int16_t etbFreq;
/**
* offset 2692
*/
pid_s fuelClosedLoopPid;
/**
* offset 2712
*/
float fuelClosedLoopAfrHighThreshold;
/**
* offset 2716
*/
pin_mode_e stepperEnablePinMode;
/**
* lambda input
* offset 2720
*/
adc_channel_e cj125ua;
/**
* heater input
* offset 2724
*/
adc_channel_e cj125ur;
/**
* per-cylinder timing correction
* offset 2728
*/
cfg_float_t_1f timing_offset_cylinder[IGNITION_PIN_COUNT];
/**
* offset 2776
*/
pin_input_mode_e brakePedalPinMode;
/**
* offset 2780
*/
float idlePidActivationTime;
/**
* offset 2784
*/
spi_device_e sdCardSpiDevice;
/**
* offset 2788
*/
pin_mode_e spi3SckMode;
/**
* offset 2792
*/
pin_mode_e spi3MosiMode;
/**
* offset 2796
*/
pin_mode_e spi3MisoMode;
/**
* offset 2800
*/
pin_mode_e spi1SckMode;
/**
* offset 2804
*/
pin_mode_e spi1MosiMode;
/**
* offset 2808
*/
pin_mode_e spi1MisoMode;
/**
* offset 2812
*/
brain_pin_e brakePedalPin;
/**
* offset 2816
*/
pid_s auxPid[AUX_PID_COUNT];
/**
* offset 2896
*/
oil_pressure_config_s oilPressure;
/**
* offset 2916
*/
spi_device_e accelerometerSpiDevice;
/**
* offset 2920
*/
float fsioCurve1Bins[FSIO_CURVE_16];
/**
* offset 2984
*/
float fsioCurve1[FSIO_CURVE_16];
/**
* offset 3048
*/
float fsioCurve2Bins[FSIO_CURVE_16];
/**
* offset 3112
*/
float fsioCurve2[FSIO_CURVE_16];
/**
* offset 3176
*/
float fsioCurve3Bins[FSIO_CURVE_8];
/**
* offset 3208
*/
float fsioCurve3[FSIO_CURVE_8];
/**
* offset 3240
*/
float fsioCurve4Bins[FSIO_CURVE_8];
/**
* offset 3272
*/
float fsioCurve4[FSIO_CURVE_8];
/**
* offset 3304
*/
brain_input_pin_e flexFuelSensor;
/**
* offset 3308
*/
brain_pin_e test557pin;
/**
* Optional timing advance table for Cranking (see useSeparateAdvanceForCranking)
* offset 3312
*/
float crankingAdvanceBins[CRANKING_ADVANCE_CURVE_SIZE];
/**
* Optional timing advance table for Cranking (see useSeparateAdvanceForCranking)
* offset 3328
*/
float crankingAdvance[CRANKING_ADVANCE_CURVE_SIZE];
/**
* todo: more comments
* offset 3344
*/
brain_pin_e servoOutputPins[SERVO_COUNT];
/**
* offset 3376
*/
int16_t coastingFuelCutRpmHigh;
/**
* offset 3378
*/
int16_t coastingFuelCutRpmLow;
/**
* percent between 0 and 100
* offset 3380
*/
int16_t coastingFuelCutTps;
/**
* Fuel cutoff is deactivated if CLT<threshold
* offset 3382
*/
int16_t coastingFuelCutClt;
/**
* Increases PID reaction for RPM<target by adding extra percent to PID-error
* offset 3384
*/
int16_t pidExtraForLowRpm;
/**
* maximum manifold pressure for fuel cut
* offset 3386
*/
int16_t coastingFuelCutMap;
/**
* CLT-based idle position for coasting (used in Auto-PID Idle mode)
* offset 3388
*/
float iacCoastingBins[CLT_CURVE_SIZE];
/**
* CLT-based idle position for coasting (used in Auto-PID Idle mode)
* offset 3452
*/
float iacCoasting[CLT_CURVE_SIZE];
/**
* offset 3516
*/
ignition_tps_table_t ignitionTpsTable;
/**
* offset 4028
*/
float ignitionTpsBins[IGN_TPS_COUNT];
/**
* offset 4092
*/
float tChargeAirCoefMin;
/**
* offset 4096
*/
float tChargeAirCoefMax;
/**
* offset 4100
*/
float tChargeAirFlowMax;
/**
* offset 4104
*/
float tChargeAirIncrLimit;
/**
* offset 4108
*/
float tChargeAirDecrLimit;
/**
* offset 4112
*/
tChargeMode_e tChargeMode;
/**
* offset 4116
*/
int unusedEnd[591];
/** total size 6480*/
} engine_configuration_s;
typedef struct {
/**
* offset 0
*/
engine_configuration_s engineConfiguration;
/**
* CLT-based cranking position multiplier for simple manual idle controller
* offset 6480
*/
float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE];
/**
* CLT-based cranking position multiplier for simple manual idle controller
* offset 6512
*/
float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE];
/**
* Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
* offset 6544
*/
float idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE];
/**
* Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
* offset 6576
*/
float idleAdvance[IDLE_ADVANCE_CURVE_SIZE];
/**
* Optional VE table for Idle (see useSeparateVEForIdle)
* offset 6608
*/
float idleVeBins[IDLE_VE_CURVE_SIZE];
/**
* Optional VE table for Idle (see useSeparateVEForIdle)
* offset 6640
*/
float idleVe[IDLE_VE_CURVE_SIZE];
/**
* offset 6672
*/
le_formula_t fsioFormulas[FSIO_COMMAND_COUNT];
/**
* offset 9872
*/
le_formula_t timingMultiplier;
/**
* offset 10072
*/
le_formula_t timingAdditive;
/**
* offset 10272
*/
float cltFuelCorrBins[CLT_CURVE_SIZE];
/**
* offset 10336
*/
float cltFuelCorr[CLT_CURVE_SIZE];
/**
* offset 10400
*/
float iatFuelCorrBins[IAT_CURVE_SIZE];
/**
* offset 10464
*/
float iatFuelCorr[IAT_CURVE_SIZE];
/**
* offset 10528
*/
float crankingFuelCoef[CRANKING_CURVE_SIZE];
/**
* offset 10560
*/
float crankingFuelBins[CRANKING_CURVE_SIZE];
/**
* offset 10592
*/
float crankingCycleCoef[CRANKING_CURVE_SIZE];
/**
* offset 10624
*/
float crankingCycleBins[CRANKING_CURVE_SIZE];
/**
* CLT-based idle position multiplier for simple manual idle controller
* offset 10656
*/
float cltIdleCorrBins[CLT_CURVE_SIZE];
/**
* CLT-based idle position multiplier for simple manual idle controller
* offset 10720
*/
float cltIdleCorr[CLT_CURVE_SIZE];
/**
* kg/hour value.
* By the way 2.081989116 kg/h = 1 ft³/m
* offset 10784
*/
float mafDecoding[MAF_DECODING_COUNT];
/**
* offset 11808
*/
float mafDecodingBins[MAF_DECODING_COUNT];
/**
* offset 12832
*/
angle_table_t ignitionIatCorrTable;
/**
* offset 13856
*/
float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
/**
* offset 13920
*/
float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
/**
* offset 13984
*/
angle_table_t injectionPhase;
/**
* offset 15008
*/
float injPhaseLoadBins[FUEL_LOAD_COUNT];
/**
* offset 15072
*/
float injPhaseRpmBins[FUEL_RPM_COUNT];
/**
* offset 15136
*/
fuel_table_t fuelTable;
/**
* offset 16160
*/
float fuelLoadBins[FUEL_LOAD_COUNT];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 16224
*/
float fuelRpmBins[FUEL_RPM_COUNT];
/**
* offset 16288
*/
ignition_table_t ignitionTable;
/**
* offset 17312
*/
float ignitionLoadBins[IGN_LOAD_COUNT];
/**
* offset 17376
*/
float ignitionRpmBins[IGN_RPM_COUNT];
/**
* offset 17440
*/
ve_table_t veTable;
/**
* offset 18464
*/
float veLoadBins[FUEL_LOAD_COUNT];
/**
* offset 18528
*/
float veRpmBins[FUEL_RPM_COUNT];
/**
* offset 18592
*/
afr_table_t afrTable;
/**
* offset 18848
*/
float afrLoadBins[FUEL_LOAD_COUNT];
/**
* offset 18912
*/
float afrRpmBins[FUEL_RPM_COUNT];
/**
* offset 18976
*/
tps_tps_table_t tpsTpsAccelTable;
/**
* offset 19232
*/
float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 19264
*/
float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE];
/**
* offset 19296
*/
fsio_table_8x8_f32t fsioTable1;
/**
* offset 19552
*/
float fsioTable1LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 19584
*/
float fsioTable1RpmBins[FSIO_TABLE_8];
/**
* offset 19616
*/
fsio_table_8x8_u8t fsioTable2;
/**
* offset 19680
*/
float fsioTable2LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 19712
*/
float fsioTable2RpmBins[FSIO_TABLE_8];
/**
* offset 19744
*/
fsio_table_8x8_u8t fsioTable3;
/**
* offset 19808
*/
float fsioTable3LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 19840
*/
float fsioTable3RpmBins[FSIO_TABLE_8];
/**
* offset 19872
*/
fsio_table_8x8_u8t fsioTable4;
/**
* offset 19936
*/
float fsioTable4LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
* offset 19968
*/
float fsioTable4RpmBins[FSIO_TABLE_8];
/** total size 20000*/
} persistent_config_s;
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:21:24 EST 2018

4
firmware/controllers/algo/rusefi_generated.h
View File

@ -342,8 +342,8 @@
#define afr_v2_offset_hex 244
#define afr_value2_offset 584
#define afr_value2_offset_hex 248
#define pedalPositionChannel_offset 588
#define pedalPositionChannel_offset_hex 24c
#define pedalPositionAdcChannel_offset 588
#define pedalPositionAdcChannel_offset_hex 24c
#define baroSensor_offset 592
#define baroSensor_offset_hex 250
#define baroSensor_lowValue_offset 592

2
firmware/controllers/electronic_throttle.cpp
View File

@ -201,7 +201,7 @@ static void showEthInfo(void) {
getPedalPosition(),
engineConfiguration->throttlePedalUpVoltage,
engineConfiguration->throttlePedalWOTVoltage,
getPinNameByAdcChannel("tPedal", engineConfiguration->pedalPositionChannel, pinNameBuffer));
getPinNameByAdcChannel("tPedal", engineConfiguration->pedalPositionAdcChannel, pinNameBuffer));
scheduleMsg(&logger, "TPS=%.2f", getTPS());

2
firmware/controllers/engine_controller.cpp
View File

@ -346,7 +346,7 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel);
printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor);
printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel);
printAnalogChannelInfo("pPS", engineConfiguration->pedalPositionChannel);
printAnalogChannelInfo("pPS", engineConfiguration->pedalPositionAdcChannel);
if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) {
printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);
}

4
firmware/controllers/sensors/tps.cpp
View File

@ -134,14 +134,14 @@ static percent_t getPrimatyRawTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#define NO_TPS_MAGIC_VALUE 66.611
bool hasPedalPositionSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return engineConfiguration->pedalPositionChannel != EFI_ADC_NONE;
return engineConfiguration->pedalPositionAdcChannel != EFI_ADC_NONE;
}
percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (mockPedalPosition != MOCK_UNDEFINED) {
return mockPedalPosition;
}
float voltage = getVoltageDivided("pPS", engineConfiguration->pedalPositionChannel);
float voltage = getVoltageDivided("pPS", engineConfiguration->pedalPositionAdcChannel);
float result = interpolateMsg("pedal", engineConfiguration->throttlePedalUpVoltage, 0, engineConfiguration->throttlePedalWOTVoltage, 100, voltage);
// this would put the value into the 0-100 range

2
firmware/hw_layer/adc_inputs.cpp
View File

@ -619,7 +619,7 @@ static void configureInputs(void) {
addChannel("TPS", engineConfiguration->tpsAdcChannel, ADC_SLOW);
addChannel("fuel", engineConfiguration->fuelLevelSensor, ADC_SLOW);
addChannel("pPS", engineConfiguration->pedalPositionChannel, ADC_SLOW);
addChannel("pPS", engineConfiguration->pedalPositionAdcChannel, ADC_SLOW);
addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW);
// not currently used addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW);
addChannel("CLT", engineConfiguration->clt.adcChannel, ADC_SLOW);

4
firmware/integration/rusefi_config.txt
View File

@ -383,7 +383,7 @@ log_format_e logFormat;
int HD44780width;;"index", 1, 0, 0, 300, 0
int HD44780height;;"index", 1, 0, 0, 300, 0
adc_channel_e tpsAdcChannel;
adc_channel_e tpsAdcChannel;See aslo pedalPositionAdcChannel
int overrideCrankingIgnition;
int sensorChartFrequency;;"index", 1, 0, 0, 300, 0 ; size 4
@ -428,7 +428,7 @@ end_struct
afr_sensor_s afr
adc_channel_e pedalPositionChannel;
adc_channel_e pedalPositionAdcChannel;Electronic pedal position input\nSee also tpsAdcChannel
air_pressure_sensor_config_s baroSensor;@see hasBaroSensor

32
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 22 10:00:39 EST 2018
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:22:22 EST 2018
pageSize = 20000
page = 1
@ -191,7 +191,7 @@ page = 1
afr_value1 = scalar, F32, 576, "AFR", 1, 0.0, 0, 1000.0, 2
afr_v2 = scalar, F32, 580, "volts", 1, 0.0, 0, 10.0, 2
afr_value2 = scalar, F32, 584, "AFR", 1, 0.0, 0, 1000.0, 2
pedalPositionChannel = bits, U32, 588, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
pedalPositionAdcChannel = bits, U32, 588, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
baroSensor_lowValue = scalar, F32, 592, "kpa", 1, 0, -400, 800, 2
baroSensor_highValue = scalar, F32, 596, "kpa", 1, 0, -400, 800, 2
baroSensor_type = bits, U32, 600, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "INVALID"
@ -2225,7 +2225,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor
field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel
field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor
field = "Accelerator position sensor", pedalPositionChannel
field = "Accelerator position sensor", pedalPositionAdcChannel
field = "Oil Pressure ADC input", oilPressure_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
@ -2273,7 +2273,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "AFR ADC input", afr_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
field = "Throttle pedal Position Channel", pedalPositionChannel
field = "Throttle pedal Position Channel", pedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
@ -3006,18 +3006,18 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "verbose", isVerboseETB
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "PWM Frequency", etbFreq, {pedalPositionChannel != 16}
field = "Dir #1", etbDirectionPin1, {pedalPositionChannel != 16}
field = "Dir #2", etbDirectionPin2, {pedalPositionChannel != 16}
field = "Control #1", etbControlPin1, {pedalPositionChannel != 16}
field = "Control #2", etbControlPin2, {pedalPositionChannel != 16}
field = "pFactor", etb_pFactor, {pedalPositionChannel != 16}
field = "iFactor", etb_iFactor, {pedalPositionChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionChannel != 16}
field = "offset", etb_offset, {pedalPositionChannel != 16}
field = "control period", etb_period, {pedalPositionChannel != 16}
field = "pid min", etb_minValue, {pedalPositionChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionChannel != 16}
field = "PWM Frequency", etbFreq, {pedalPositionAdcChannel != 16}
field = "Dir #1", etbDirectionPin1, {pedalPositionAdcChannel != 16}
field = "Dir #2", etbDirectionPin2, {pedalPositionAdcChannel != 16}
field = "Control #1", etbControlPin1, {pedalPositionAdcChannel != 16}
field = "Control #2", etbControlPin2, {pedalPositionAdcChannel != 16}
field = "pFactor", etb_pFactor, {pedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {pedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionAdcChannel != 16}
field = "offset", etb_offset, {pedalPositionAdcChannel != 16}
field = "control period", etb_period, {pedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {pedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionAdcChannel != 16}
dialog = testSpark, "Spark"
commandButton = "Spark #1", cmd_test_spk1

28
firmware/tunerstudio/rusefi.input
View File

@ -1376,7 +1376,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor
field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel
field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor
field = "Accelerator position sensor", pedalPositionChannel
field = "Accelerator position sensor", pedalPositionAdcChannel
field = "Oil Pressure ADC input", oilPressure_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
@ -1424,7 +1424,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "AFR ADC input", afr_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
field = "Throttle pedal Position Channel", pedalPositionChannel
field = "Throttle pedal Position Channel", pedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
@ -2157,18 +2157,18 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "verbose", isVerboseETB
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "PWM Frequency", etbFreq, {pedalPositionChannel != 16}
field = "Dir #1", etbDirectionPin1, {pedalPositionChannel != 16}
field = "Dir #2", etbDirectionPin2, {pedalPositionChannel != 16}
field = "Control #1", etbControlPin1, {pedalPositionChannel != 16}
field = "Control #2", etbControlPin2, {pedalPositionChannel != 16}
field = "pFactor", etb_pFactor, {pedalPositionChannel != 16}
field = "iFactor", etb_iFactor, {pedalPositionChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionChannel != 16}
field = "offset", etb_offset, {pedalPositionChannel != 16}
field = "control period", etb_period, {pedalPositionChannel != 16}
field = "pid min", etb_minValue, {pedalPositionChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionChannel != 16}
field = "PWM Frequency", etbFreq, {pedalPositionAdcChannel != 16}
field = "Dir #1", etbDirectionPin1, {pedalPositionAdcChannel != 16}
field = "Dir #2", etbDirectionPin2, {pedalPositionAdcChannel != 16}
field = "Control #1", etbControlPin1, {pedalPositionAdcChannel != 16}
field = "Control #2", etbControlPin2, {pedalPositionAdcChannel != 16}
field = "pFactor", etb_pFactor, {pedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {pedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionAdcChannel != 16}
field = "offset", etb_offset, {pedalPositionAdcChannel != 16}
field = "control period", etb_period, {pedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {pedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionAdcChannel != 16}
dialog = testSpark, "Spark"
commandButton = "Spark #1", cmd_test_spk1

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 22 10:00:39 EST 2018
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:22:22 EST 2018
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -233,7 +233,7 @@ public class Fields {
public static final int afr_v2_offset_hex = 244;
public static final int afr_value2_offset = 584;
public static final int afr_value2_offset_hex = 248;
public static final int pedalPositionChannel_offset = 588;
public static final int pedalPositionAdcChannel_offset = 588;
public static final int baroSensor_offset = 592;
public static final int baroSensor_offset_hex = 250;
public static final int baroSensor_lowValue_offset = 592;
@ -1305,7 +1305,7 @@ public class Fields {
public static final Field AFR_VALUE1 = Field.create("AFR_VALUE1", 576, FieldType.FLOAT);
public static final Field AFR_V2 = Field.create("AFR_V2", 580, FieldType.FLOAT);
public static final Field AFR_VALUE2 = Field.create("AFR_VALUE2", 584, FieldType.FLOAT);
public static final Field PEDALPOSITIONCHANNEL = Field.create("PEDALPOSITIONCHANNEL", 588, FieldType.INT, adc_channel_e);
public static final Field PEDALPOSITIONADCCHANNEL = Field.create("PEDALPOSITIONADCCHANNEL", 588, FieldType.INT, adc_channel_e);
public static final Field BAROSENSOR_LOWVALUE = Field.create("BAROSENSOR_LOWVALUE", 592, FieldType.FLOAT);
public static final Field BAROSENSOR_HIGHVALUE = Field.create("BAROSENSOR_HIGHVALUE", 596, FieldType.FLOAT);
public static final Field BAROSENSOR_TYPE = Field.create("BAROSENSOR_TYPE", 600, FieldType.INT);