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

all ETBs to run in same HW mode

This commit is contained in:
rusEfi 2019-11-29 16:51:51 -05:00
parent 7aa5d3321e
commit 799027c2e9
18 changed files with 97 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Nov 25 01:00:42 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -523,8 +523,6 @@
#define etb1_directionPin2_offset_hex 2a9
#define etb1_offset 680
#define etb1_offset_hex 2a8
#define etb1_use_two_wires_offset 76
#define etb1_use_two_wires_offset_hex 4c
#define etb2_controlPin1_offset 3966
#define etb2_controlPin1_offset_hex f7e
#define etb2_controlPinMode_offset 3967
@ -535,8 +533,6 @@
#define etb2_directionPin2_offset_hex f7d
#define etb2_offset 3964
#define etb2_offset_hex f7c
#define etb2_use_two_wires_offset 76
#define etb2_use_two_wires_offset_hex 4c
#define ETB_BIAS_CURVE_LENGTH 8
#define etb_dFactor_offset 1744
#define etb_dFactor_offset_hex 6d0
@ -558,6 +554,8 @@
#define etb_periodMs_offset_hex 6d6
#define etb_pFactor_offset 1736
#define etb_pFactor_offset_hex 6c8
#define etb_use_two_wires_offset 76
#define etb_use_two_wires_offset_hex 4c
#define etbBiasBins_offset 3888
#define etbBiasBins_offset_hex f30
#define etbBiasValues_offset 3920
@ -1939,6 +1937,8 @@
#define unusedFlexFuelSensor_offset_hex c1c
#define unusedFormerWarmupAfrPid_offset 1768
#define unusedFormerWarmupAfrPid_offset_hex 6e8
#define unusedHereo_wires_offset 76
#define unusedHereo_wires_offset_hex 4c
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpiPadding3_offset 4036
@ -3155,10 +3155,10 @@ struct engine_configuration_s {
bool cj125isLsu49 : 1;
/**
offset 76 bit 12 */
bool etb1_use_two_wires : 1;
bool etb_use_two_wires : 1;
/**
offset 76 bit 13 */
bool etb2_use_two_wires : 1;
bool unusedHereo_wires : 1;
/**
offset 76 bit 14 */
bool showSdCardWarning : 1;
@ -4961,4 +4961,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Nov 25 01:00:42 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019

8
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -521,8 +521,6 @@
#define etb1_directionPin2_offset_hex 2a9
#define etb1_offset 680
#define etb1_offset_hex 2a8
#define etb1_use_two_wires_offset 76
#define etb1_use_two_wires_offset_hex 4c
#define etb2_controlPin1_offset 3966
#define etb2_controlPin1_offset_hex f7e
#define etb2_controlPinMode_offset 3967
@ -533,8 +531,6 @@
#define etb2_directionPin2_offset_hex f7d
#define etb2_offset 3964
#define etb2_offset_hex f7c
#define etb2_use_two_wires_offset 76
#define etb2_use_two_wires_offset_hex 4c
#define ETB_BIAS_CURVE_LENGTH 8
#define etb_dFactor_offset 1744
#define etb_dFactor_offset_hex 6d0
@ -556,6 +552,8 @@
#define etb_periodMs_offset_hex 6d6
#define etb_pFactor_offset 1736
#define etb_pFactor_offset_hex 6c8
#define etb_use_two_wires_offset 76
#define etb_use_two_wires_offset_hex 4c
#define etbBiasBins_offset 3888
#define etbBiasBins_offset_hex f30
#define etbBiasValues_offset 3920
@ -1937,6 +1935,8 @@
#define unusedFlexFuelSensor_offset_hex c1c
#define unusedFormerWarmupAfrPid_offset 1768
#define unusedFormerWarmupAfrPid_offset_hex 6e8
#define unusedHereo_wires_offset 76
#define unusedHereo_wires_offset_hex 4c
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpiPadding3_offset 4036

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

@ -116,7 +116,7 @@ static void setupEtb() {
boardConfiguration->etb1.directionPin2 = GPIO_UNASSIGNED;
// we only have pwm/dir, no dira/dirb
engineConfiguration->etb1_use_two_wires = false;
engineConfiguration->etb_use_two_wires = false;
engineConfiguration->etbFreq = 800;
}

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

@ -64,7 +64,7 @@ static void setupTle8888() {
// diagnostic interface on SPI
static void setupTle9201Etb() {
// This chip has PWM/DIR, not dira/dirb
engineConfiguration->etb1_use_two_wires = false;
engineConfiguration->etb_use_two_wires = false;
// PWM and DIR pins
boardConfiguration->etb1.controlPin1 = GPIOC_7;
boardConfiguration->etb1.directionPin1 = GPIOA_8;

5
firmware/config/engines/bmw_m73.cpp
View File

@ -156,7 +156,7 @@ GPIOA_6
/**
* Yellow op-amp board
*
* AN5 tested pull-down 1M PA3 TPS1
* AN5 tested pull-down 1M PA3 TPS1 orange wire
* AN6 tested pull-down 1M PA4 TPS2
* AN7 tested pull-down 1M PA6 PPS
* AN8 tested no pull-down / no pull-up
@ -178,14 +178,13 @@ GPIOA_6
// DIR pin
boardConfiguration->etb1.directionPin1 = GPIOC_9;
boardConfiguration->etb1.directionPin2 = GPIOC_8;
CONFIG(etb1_use_two_wires) = true;
CONFIG(etb_use_two_wires) = true;
// PWM pin
engineConfiguration->etb2.controlPin1 = GPIO_UNASSIGNED;
// DIR pin
engineConfiguration->etb2.directionPin1 = GPIOB_8;
engineConfiguration->etb2.directionPin2 = GPIOB_9;
CONFIG(etb2_use_two_wires) = true;
boardConfiguration->injectionPins[0] = GPIO_UNASSIGNED;

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

@ -352,7 +352,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIGB(etb1.directionPin1) = GPIOF_15;
CONFIGB(etb1.directionPin2) = GPIOF_14;
#endif /* STM32_HAS_GPIOF */
CONFIG(etb1_use_two_wires) = true;
CONFIG(etb_use_two_wires) = true;
boardConfiguration->isHip9011Enabled = false;
// ETB #2
@ -365,7 +365,6 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setFsio(13, GPIOE_5, "0" PASS_CONFIG_PARAMETER_SUFFIX);
setFsio(15, GPIOE_6, "1" PASS_CONFIG_PARAMETER_SUFFIX);
#endif
CONFIG(etb2_use_two_wires) = true;
CONFIG(etb2.directionPin1) = GPIOE_2;
CONFIG(etb2.directionPin2) = GPIOE_4;

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

@ -140,7 +140,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setFsioExt (3, GPIOE_0, "0.15 90 coolant 120 min max 90 - 30 / 0.8 * +", 25 PASS_CONFIG_PARAMETER_SUFFIX);
#endif
engineConfiguration->auxPidFrequency[3] = 25;
CONFIG(etb1_use_two_wires) = true;
CONFIG(etb_use_two_wires) = true;
#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
CONFIGB(etb1.directionPin1) = GPIOF_15;
CONFIGB(etb1.directionPin2) = GPIOF_14;
@ -151,7 +151,6 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setFsio (13, GPIOE_5, "0" PASS_CONFIG_PARAMETER_SUFFIX);
setFsio (15, GPIOE_6, "1" PASS_CONFIG_PARAMETER_SUFFIX);
#endif
CONFIG(etb2_use_two_wires) = true;
CONFIG(etb2.directionPin1) = GPIOE_2;
CONFIG(etb2.directionPin2) = GPIOE_4;

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

@ -459,6 +459,12 @@ void setEtbOffset(int value) {
#endif /* EFI_UNIT_TEST */
static etb_io *getEtbIo(int index) {
if (index == 0)
return &CONFIGB(etb1);
return &CONFIG(etb2);
}
void setBoschVNH2SP30Curve(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->etbBiasBins[0] = 0;
engineConfiguration->etbBiasBins[1] = 1;
@ -534,9 +540,12 @@ bool isETBRestartNeeded(void) {
}
void stopETBPins(void) {
brain_pin_markUnused(activeConfiguration.bc.etb1.controlPin1);
brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin1);
brain_pin_markUnused(activeConfiguration.bc.etb1.directionPin2);
for (int i = 0 ; i < ETB_COUNT; i++) {
etb_io *io = getEtbIo(i);
brain_pin_markUnused(io->controlPin1);
brain_pin_markUnused(io->directionPin1);
brain_pin_markUnused(io->directionPin2);
}
}
#endif /* EFI_PROD_CODE */
@ -549,16 +558,19 @@ void onConfigurationChangeElectronicThrottleCallback(engine_configuration_s *pre
void startETBPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// controlPinMode is a strange feature - it's simply because I am short on 5v I/O on Frankenso with Miata NB2 test mule
etbHardware[0].start(
CONFIG(etb1_use_two_wires),
CONFIGB(etb1.controlPin1),
&CONFIGB(etb1.controlPinMode),
CONFIGB(etb1.directionPin1),
CONFIGB(etb1.directionPin2),
&ENGINE(executor),
CONFIG(etbFreq)
);
for (int i = 0 ; i < ETB_COUNT; i++) {
etb_io *io = getEtbIo(i);
// controlPinMode is a strange feature - it's simply because I am short on 5v I/O on Frankenso with Miata NB2 test mule
etbHardware[i].start(
CONFIG(etb_use_two_wires),
io->controlPin1,
&io->controlPinMode,
io->directionPin1,
io->directionPin2,
&ENGINE(executor),
CONFIG(etbFreq)
);
}
}
#if EFI_PROD_CODE && 0

8
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 01:00:31 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1094,10 +1094,10 @@ struct engine_configuration_s {
bool cj125isLsu49 : 1;
/**
offset 76 bit 12 */
bool etb1_use_two_wires : 1;
bool etb_use_two_wires : 1;
/**
offset 76 bit 13 */
bool etb2_use_two_wires : 1;
bool unusedHereo_wires : 1;
/**
offset 76 bit 14 */
bool showSdCardWarning : 1;
@ -2900,4 +2900,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 01:00:31 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019

8
firmware/controllers/generated/rusefi_generated.h
View File

@ -521,8 +521,6 @@
#define etb1_directionPin2_offset_hex 2a9
#define etb1_offset 680
#define etb1_offset_hex 2a8
#define etb1_use_two_wires_offset 76
#define etb1_use_two_wires_offset_hex 4c
#define etb2_controlPin1_offset 3966
#define etb2_controlPin1_offset_hex f7e
#define etb2_controlPinMode_offset 3967
@ -533,8 +531,6 @@
#define etb2_directionPin2_offset_hex f7d
#define etb2_offset 3964
#define etb2_offset_hex f7c
#define etb2_use_two_wires_offset 76
#define etb2_use_two_wires_offset_hex 4c
#define ETB_BIAS_CURVE_LENGTH 8
#define etb_dFactor_offset 1744
#define etb_dFactor_offset_hex 6d0
@ -556,6 +552,8 @@
#define etb_periodMs_offset_hex 6d6
#define etb_pFactor_offset 1736
#define etb_pFactor_offset_hex 6c8
#define etb_use_two_wires_offset 76
#define etb_use_two_wires_offset_hex 4c
#define etbBiasBins_offset 3888
#define etbBiasBins_offset_hex f30
#define etbBiasValues_offset 3920
@ -1937,6 +1935,8 @@
#define unusedFlexFuelSensor_offset_hex c1c
#define unusedFormerWarmupAfrPid_offset 1768
#define unusedFormerWarmupAfrPid_offset_hex 6e8
#define unusedHereo_wires_offset 76
#define unusedHereo_wires_offset_hex 4c
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpiPadding3_offset 4036

4
firmware/integration/rusefi_config.txt
View File

@ -297,8 +297,8 @@ bit isVerboseAuxPid4;
bit useBiQuadAnalogFiltering;
bit cj125isUaDivided;
bit cj125isLsu49;
bit etb1_use_two_wires;
bit etb2_use_two_wires;
bit etb_use_two_wires;
bit unusedHereo_wires;
bit showSdCardWarning;
bit cj125isUrDivided;looks like 3v range should be enough, divider not needed
bit useTLE8888_hall_mode;

13
firmware/tunerstudio/rusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 20:08:17 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:25:45 EST 2019
pageSize = 20000
page = 1
@ -106,8 +106,8 @@ page = 1
useBiQuadAnalogFiltering= bits, U32, 76, [9:9], "false", "true"
cj125isUaDivided = bits, U32, 76, [10:10], "false", "true"
cj125isLsu49 = bits, U32, 76, [11:11], "false", "true"
etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true"
etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true"
etb_use_two_wires = bits, U32, 76, [12:12], "false", "true"
unusedHereo_wires = bits, U32, 76, [13:13], "false", "true"
showSdCardWarning = bits, U32, 76, [14:14], "false", "true"
cj125isUrDivided = bits, U32, 76, [15:15], "false", "true"
useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true"
@ -3488,16 +3488,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

7
firmware/tunerstudio/rusefi.input
View File

@ -2475,16 +2475,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

13
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 20:08:22 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:26:08 EST 2019
pageSize = 20000
page = 1
@ -106,8 +106,8 @@ page = 1
useBiQuadAnalogFiltering= bits, U32, 76, [9:9], "false", "true"
cj125isUaDivided = bits, U32, 76, [10:10], "false", "true"
cj125isLsu49 = bits, U32, 76, [11:11], "false", "true"
etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true"
etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true"
etb_use_two_wires = bits, U32, 76, [12:12], "false", "true"
unusedHereo_wires = bits, U32, 76, [13:13], "false", "true"
showSdCardWarning = bits, U32, 76, [14:14], "false", "true"
cj125isUrDivided = bits, U32, 76, [15:15], "false", "true"
useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true"
@ -3488,16 +3488,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

13
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Mon Nov 25 01:00:42 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019
pageSize = 20000
page = 1
@ -106,8 +106,8 @@ page = 1
useBiQuadAnalogFiltering= bits, U32, 76, [9:9], "false", "true"
cj125isUaDivided = bits, U32, 76, [10:10], "false", "true"
cj125isLsu49 = bits, U32, 76, [11:11], "false", "true"
etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true"
etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true"
etb_use_two_wires = bits, U32, 76, [12:12], "false", "true"
unusedHereo_wires = bits, U32, 76, [13:13], "false", "true"
showSdCardWarning = bits, U32, 76, [14:14], "false", "true"
cj125isUrDivided = bits, U32, 76, [15:15], "false", "true"
useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true"
@ -2097,6 +2097,7 @@ menuDialog = main
# Digital outputs
subMenu = mainRelay, "Main relay"
subMenu = starterRelay, "Starter relay"
subMenu = fuelPump, "Fuel rail"
subMenu = fanSetting, "Fan"
subMenu = tachSettings, "Tachometer"
@ -2665,6 +2666,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Fan Pin Mode", fanPinMode
field = "Main Relay Pin", mainRelayPin
field = "Main Relay Mode", mainRelayPinMode
field = "Starter Relay Pin", starterRelayPin
field = "Starter Relay Mode", starterRelayPinMode
field = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
@ -3008,6 +3011,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pin", mainRelayPin
field = "Pin mode", mainRelayPinMode
dialog = starterRelay, "Starter relay output"
field = "Pin", starterRelayPin
field = "Pin mode", starterRelayPinMode
dialog = statusLeds, "Status LEDs"
field = "Running status LED", runningLedPin
field = "TS communication status LED", communicationLedPin

13
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 20:08:20 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:25:57 EST 2019
pageSize = 20000
page = 1
@ -106,8 +106,8 @@ page = 1
useBiQuadAnalogFiltering= bits, U32, 76, [9:9], "false", "true"
cj125isUaDivided = bits, U32, 76, [10:10], "false", "true"
cj125isLsu49 = bits, U32, 76, [11:11], "false", "true"
etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true"
etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true"
etb_use_two_wires = bits, U32, 76, [12:12], "false", "true"
unusedHereo_wires = bits, U32, 76, [13:13], "false", "true"
showSdCardWarning = bits, U32, 76, [14:14], "false", "true"
cj125isUrDivided = bits, U32, 76, [15:15], "false", "true"
useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true"
@ -3471,16 +3471,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

13
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 20:08:25 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:26:20 EST 2019
pageSize = 20000
page = 1
@ -106,8 +106,8 @@ page = 1
useBiQuadAnalogFiltering= bits, U32, 76, [9:9], "false", "true"
cj125isUaDivided = bits, U32, 76, [10:10], "false", "true"
cj125isLsu49 = bits, U32, 76, [11:11], "false", "true"
etb1_use_two_wires = bits, U32, 76, [12:12], "false", "true"
etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true"
etb_use_two_wires = bits, U32, 76, [12:12], "false", "true"
unusedHereo_wires = bits, U32, 76, [13:13], "false", "true"
showSdCardWarning = bits, U32, 76, [14:14], "false", "true"
cj125isUrDivided = bits, U32, 76, [15:15], "false", "true"
useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true"
@ -3484,16 +3484,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

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

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Nov 25 01:00:31 EST 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -342,13 +342,11 @@ public class Fields {
public static final int etb1_directionPin1_offset = 680;
public static final int etb1_directionPin2_offset = 681;
public static final int etb1_offset = 680;
public static final int etb1_use_two_wires_offset = 76;
public static final int etb2_controlPin1_offset = 3966;
public static final int etb2_controlPinMode_offset = 3967;
public static final int etb2_directionPin1_offset = 3964;
public static final int etb2_directionPin2_offset = 3965;
public static final int etb2_offset = 3964;
public static final int etb2_use_two_wires_offset = 76;
public static final int ETB_BIAS_CURVE_LENGTH = 8;
public static final int etb_dFactor_offset = 1744;
public static final int etb_iFactor_offset = 1740;
@ -360,6 +358,7 @@ public class Fields {
public static final int etb_offset_offset = 1748;
public static final int etb_periodMs_offset = 1750;
public static final int etb_pFactor_offset = 1736;
public static final int etb_use_two_wires_offset = 76;
public static final int etbBiasBins_offset = 3888;
public static final int etbBiasValues_offset = 3920;
public static final int etbCalibrationOnStart_offset = 1476;
@ -1261,6 +1260,7 @@ public class Fields {
public static final int unusedErrorPin_offset = 2040;
public static final int unusedFlexFuelSensor_offset = 3100;
public static final int unusedFormerWarmupAfrPid_offset = 1768;
public static final int unusedHereo_wires_offset = 76;
public static final int unusedOldWarmupAfr_offset = 744;
public static final int unusedSpiPadding3_offset = 4036;
public static final int unusedSpiPadding4_offset = 2593;
@ -1346,8 +1346,8 @@ public class Fields {
public static final Field USEBIQUADANALOGFILTERING = Field.create("USEBIQUADANALOGFILTERING", 76, FieldType.BIT, 9);
public static final Field CJ125ISUADIVIDED = Field.create("CJ125ISUADIVIDED", 76, FieldType.BIT, 10);
public static final Field CJ125ISLSU49 = Field.create("CJ125ISLSU49", 76, FieldType.BIT, 11);
public static final Field ETB1_USE_TWO_WIRES = Field.create("ETB1_USE_TWO_WIRES", 76, FieldType.BIT, 12);
public static final Field ETB2_USE_TWO_WIRES = Field.create("ETB2_USE_TWO_WIRES", 76, FieldType.BIT, 13);
public static final Field ETB_USE_TWO_WIRES = Field.create("ETB_USE_TWO_WIRES", 76, FieldType.BIT, 12);
public static final Field UNUSEDHEREO_WIRES = Field.create("UNUSEDHEREO_WIRES", 76, FieldType.BIT, 13);
public static final Field SHOWSDCARDWARNING = Field.create("SHOWSDCARDWARNING", 76, FieldType.BIT, 14);
public static final Field CJ125ISURDIVIDED = Field.create("CJ125ISURDIVIDED", 76, FieldType.BIT, 15);
public static final Field USETLE8888_HALL_MODE = Field.create("USETLE8888_HALL_MODE", 76, FieldType.BIT, 16);
@ -2157,8 +2157,8 @@ public class Fields {
USEBIQUADANALOGFILTERING,
CJ125ISUADIVIDED,
CJ125ISLSU49,
ETB1_USE_TWO_WIRES,
ETB2_USE_TWO_WIRES,
ETB_USE_TWO_WIRES,
UNUSEDHEREO_WIRES,
SHOWSDCARDWARNING,
CJ125ISURDIVIDED,
USETLE8888_HALL_MODE,