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

'warninigLedPin' typo and minor TS progress

This commit is contained in:
rusEfi 2019-04-28 23:04:52 -04:00
parent b8fd48a78f
commit 8138d137fe
11 changed files with 174 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ void setBoardConfigurationOverrides(void) {
setSerialConfigurationOverrides();
engineConfiguration->runningLedPin = GPIOB_0; //green LED
engineConfiguration->warninigLedPin = GPIO_UNASSIGNED;
engineConfiguration->warningLedPin = GPIO_UNASSIGNED;
#if 0
engineConfiguration->vbattAdcChannel = EFI_ADC_13;
engineConfiguration->adcVcc = ADC_VCC;

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

@ -44,7 +44,7 @@ void setBoardConfigurationOverrides(void) {
setSerialConfigurationOverrides();
engineConfiguration->runningLedPin = GPIOB_0; //green LED
engineConfiguration->warninigLedPin = GPIO_UNASSIGNED;
engineConfiguration->warningLedPin = GPIO_UNASSIGNED;
#if 0
engineConfiguration->vbattAdcChannel = EFI_ADC_13;
engineConfiguration->adcVcc = ADC_VCC;

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

@ -172,7 +172,7 @@ void setBoardConfigurationOverrides(void) {
engineConfiguration->communicationLedPin = GPIO_UNASSIGNED;// GPIOA_13; // yellow LED
engineConfiguration->runningLedPin = GPIOA_13; //GPIOA_13; // yellow LED
engineConfiguration->fatalErrorPin = GPIOA_13;
engineConfiguration->warninigLedPin = GPIO_UNASSIGNED;
engineConfiguration->warningLedPin = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[0] = is469 ? GPIOA_5 : GPIOA_5;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;

2
firmware/console/status_loop.cpp
View File

@ -550,7 +550,7 @@ static void initStatusLeds(void) {
// we initialize this here so that we can blink it on start-up
enginePins.checkEnginePin.initPin("MalfunctionIndicator", CONFIGB(malfunctionIndicatorPin), &CONFIGB(malfunctionIndicatorPinMode));
enginePins.warningLedPin.initPin("led: warning status", engineConfiguration->warninigLedPin);
enginePins.warningLedPin.initPin("led: warning status", engineConfiguration->warningLedPin);
enginePins.runningLedPin.initPin("led: running status", engineConfiguration->runningLedPin);
}

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

@ -446,7 +446,7 @@ void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#else
engineConfiguration->fatalErrorPin = GPIOD_14;
#endif /* EFI_FATAL_ERROR_PIN */
engineConfiguration->warninigLedPin = GPIOD_13;
engineConfiguration->warningLedPin = GPIOD_13;
#ifdef EFI_COMMUNICATION_PIN
engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN;

6
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 Fri Apr 26 11:52:57 EDT 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 28 23:03:20 EDT 2019
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1860,7 +1860,7 @@ typedef struct {
/**
* offset 2061
*/
brain_pin_e warninigLedPin;
brain_pin_e warningLedPin;
/**
* offset 2062
*/
@ -2716,4 +2716,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Apr 26 11:52:57 EDT 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 28 23:03:20 EDT 2019

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

@ -1906,10 +1906,10 @@
#define warmupTargetAfr_offset_hex 854
#define warmupTargetAfrBins_offset 2116
#define warmupTargetAfrBins_offset_hex 844
#define warningLedPin_offset 2061
#define warningLedPin_offset_hex 80d
#define warningPeriod_offset 1502
#define warningPeriod_offset_hex 5de
#define warninigLedPin_offset 2061
#define warninigLedPin_offset_hex 80d
#define wboHeaterPin_offset 673
#define wboHeaterPin_offset_hex 2a1
#define wwaeBeta_offset 1828

2
firmware/integration/rusefi_config.txt
View File

@ -843,7 +843,7 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:6], @@pin_mode_e_enum@@
int16_t iacByTpsTaper;Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value;"percent", 1, 0, 0, 500, 0
brain_pin_e fatalErrorPin;RED led on Discovery by default.
brain_pin_e warninigLedPin;
brain_pin_e warningLedPin;
brain_pin_e unused1234234;
brain_pin_e LIS302DLCsPin;

146
firmware/tunerstudio/rusefi.ini
View File

@ -68,7 +68,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 Fri Apr 26 11:52:57 EDT 2019
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 28 23:03:20 EDT 2019
pageSize = 20000
page = 1
@ -630,7 +630,7 @@ page = 1
afterCrankingIACtaperDuration = scalar, S16, 2056, "cycles", 1, 0, 0, 5000, 0
iacByTpsTaper = scalar, S16, 2058, "percent", 1, 0, 0, 500, 0
fatalErrorPin = bits, U08, 2060, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
warninigLedPin = bits, U08, 2061, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
warningLedPin = bits, U08, 2061, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
unused1234234 = bits, U08, 2062, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
LIS302DLCsPin = bits, U08, 2063, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
tpsAccelLength = scalar, S32, 2064, "cycles", 1, 0, 1, 200, 0
@ -1707,7 +1707,7 @@ gaugeCategory = Debug
debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0
debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0
timeSecondsGauge = timeSeconds, "Uptime", "sec", 0, 100, 0, 0, 100, 100, 0, 0
gaugeCategory = Sensors
RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0
#if CELSIUS
@ -2107,7 +2107,8 @@ menuDialog = main
subMenu = connection, "Connection"
subMenu = ioTest, "Bench Test & Commands"
subMenu = engineTypeDialog, "Popular vehicles"
subMenu = allPins, "Full pinout"
subMenu = allPins1, "Full pinout 1/2"
subMenu = allPins2, "Full pinout 2/2"
[ControllerCommands]
; commandName = command1, command2, commandn...
@ -2436,17 +2437,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
panel = mainSensorInputs, Center
panel = otherSensorInputs, East
dialog = allPins1
field = "TLE8888 CS", tle8888_cs
field = "TLE8888 SPI", tle8888spiDevice
field = "tle6240_cs", tle6240_cs
field = "tle6240 SPI", tle6240spiDevice
field = "mc33972_cs", mc33972_cs
field = "mc33972 SPI", mc33972spiDevice
field = "warninig Led", warninigLedPin
field = "fatal Error Led", fatalErrorPin
field = "MAP ADC input", map_sensor_hwChannel
field = "frequencyReportingMapInputPin", frequencyReportingMapInputPin
dialog = allPinsSensors, "Sensors"
field = "CLT ADC input", clt_adcChannel
field = "IAT ADC input", iat_adcChannel
field = "vBatt ADC input", vbattAdcChannel
@ -2454,24 +2445,30 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "TPS2 ADC input", tps2AdcChannel
field = "MAF ADC input", mafAdcChannel
field = "AFR ADC input", afr_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
field = "Throttle pedal Position Channel", throttlePedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
field = "MAP ADC input", map_sensor_hwChannel
field = "FrequencyReportingMapInputPin", frequencyReportingMapInputPin
field = "FuelLevelSensor", fuelLevelSensor
field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin
field = "clutchUpPin", clutchUpPin
field = "brakePedalPin", brakePedalPin
field = "A/C Switch", acSwitchAdc
field = "servo#1", servoOutputPins1
field = "servo#2", servoOutputPins2
field = "servo#3", servoOutputPins3
field = "servo#4", servoOutputPins4
field = "servo#5", servoOutputPins5
dialog = allPins2
dialog = allPins1_1
field = "Warning Led", warningLedPin
field = "Fatal Error Led", fatalErrorPin
field = "tle6240_cs", tle6240_cs
field = "tle6240 SPI", tle6240spiDevice
field = "mc33972_cs", mc33972_cs
field = "mc33972 SPI", mc33972spiDevice
panel = allPinsSensors
field = "Throttle pedal Position Channel", throttlePedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
dialog = allPins1_2
field = "Tachometer output Pin", tachOutputPin
field = "Dizzy out Pin", dizzySparkOutputPin
field = "O2 heater pin", o2heaterPin
@ -2500,8 +2497,10 @@ 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 = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
dialog = allPins3
dialog = allPins2_1
field = "Injection Pin 1", injectionPins1
field = "Injection Pin 2", injectionPins2
field = "Injection Pin 3", injectionPins3
@ -2514,8 +2513,26 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Injection Pin 10 ", injectionPins10
field = "Injection Pin 11 ", injectionPins11
field = "Injection Pin 12 ", injectionPins12
field = "Ignition Pin 1", ignitionPins1
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
field = "FSIO dig inp #10", fsioDigitalInputs10
field = "FSIO dig inp #11", fsioDigitalInputs11
field = "FSIO dig inp #12", fsioDigitalInputs12
field = "FSIO dig inp #13", fsioDigitalInputs13
field = "FSIO dig inp #14", fsioDigitalInputs14
field = "FSIO dig inp #15", fsioDigitalInputs15
field = "FSIO dig inp #16", fsioDigitalInputs16
dialog = allPins2_2
field = "Ignition Pin 1", ignitionPins1
field = "Ignition Pin 2", ignitionPins2
field = "Ignition Pin 3", ignitionPins3
field = "Ignition Pin 4", ignitionPins4
@ -2527,17 +2544,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Ignition Pin 10", ignitionPins10
field = "Ignition Pin 11", ignitionPins11
field = "Ignition Pin 12", ignitionPins12
dialog = allPins4
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
field = "output #1", fsioOutputPins1
field = "output #2", fsioOutputPins2
field = "output #3", fsioOutputPins3
@ -2554,10 +2560,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "output #14", fsioOutputPins14
field = "output #15", fsioOutputPins15
field = "output #16", fsioOutputPins16
field = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
dialog = allPins5
dialog = allPins1_3
field = "FSIO ADC #1", fsioAdc1
field = "FSIO ADC #2", fsioAdc2
field = "FSIO ADC #3", fsioAdc3
@ -2584,20 +2588,28 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "TLE8888 Chip Select", tle8888_cs
field = "TLE8888 CS Mode", tle8888_csPinMode
field = "TLE 8888 spi", tle8888spiDevice
field = "servo#1", servoOutputPins1
field = "servo#2", servoOutputPins2
field = "servo#3", servoOutputPins3
field = "servo#4", servoOutputPins4
field = "servo#5", servoOutputPins5
dialog = allPins1_2, "", xAxis
panel = allPins1
panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis
dialog = allPins1_1_and_2, "", xAxis
panel = allPins1_1
panel = allPins1_2
panel = allPins3_4
panel = allPins5
dialog = allPins1, "All Pins 1/2", xAxis
panel = allPins1_1_and_2
panel = allPins1_3
dialog = allPins2_1_and_2, "", xAxis
panel = allPins2_1
panel = allPins2_2
dialog = allPins2, "All Pins 2/2", xAxis
panel = allPins2_1_and_2
; Sensors->CLT Sensor Settings
dialog = clt_thermistor, "CLT Sensor Settings"
@ -3235,7 +3247,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
text = "More about electronic throttle body on the web"
webHelp = "https://rusefi.com/s/etb"
help = tpsTpsHelp, "Acceleration Enrichment"
help = tpsTpsHelp, "Acceleration Enrichment"
text = "More about Tps To Tps acceleration on the web"
webHelp = "https://rusefi.com/s/tpstps"
@ -3251,6 +3263,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
topicHelp = "veTableDialogHelp"
panel = veTableMap, South
dialog = etbPidDialog, "PID settings"
field = "pFactor", etb_pFactor, {throttlePedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {throttlePedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {throttlePedalPositionAdcChannel != 16}
field = "offset", etb_offset, {throttlePedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {throttlePedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {throttlePedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {throttlePedalPositionAdcChannel != 16}
field = "iTermMin", etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
field = "iTermMax", etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
dialog = etbDialogLeft
field = "https://rusefi.com/s/etb"
field = "Detailed status in console", isVerboseETB
@ -3266,16 +3290,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
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 = "pFactor", etb_pFactor, {throttlePedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {throttlePedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {throttlePedalPositionAdcChannel != 16}
field = "offset", etb_offset, {throttlePedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {throttlePedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {throttlePedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {throttlePedalPositionAdcChannel != 16}
field = "iTermMin", etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
field = "iTermMax", etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
field = "etbDeadband", etbDeadband, {throttlePedalPositionAdcChannel != 16}
panel = etbPidDialog
dialog = etbDialogRight
field = "!https://rusefi.com/s/debugmode"
@ -3295,7 +3311,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
panel = etbDialogLeft, West
panel = etbDialogRight, East
dialog = testSpark, "Spark"
commandButton = "Spark #1", cmd_test_spk1
commandButton = "Spark #2", cmd_test_spk2

142
firmware/tunerstudio/rusefi.input
View File

@ -781,7 +781,7 @@ gaugeCategory = Debug
debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0
debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0
timeSecondsGauge = timeSeconds, "Uptime", "sec", 0, 100, 0, 0, 100, 100, 0, 0
gaugeCategory = Sensors
RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0
#if CELSIUS
@ -1181,7 +1181,8 @@ menuDialog = main
subMenu = connection, "Connection"
subMenu = ioTest, "Bench Test & Commands"
subMenu = engineTypeDialog, "Popular vehicles"
subMenu = allPins, "Full pinout"
subMenu = allPins1, "Full pinout 1/2"
subMenu = allPins2, "Full pinout 2/2"
[ControllerCommands]
; commandName = command1, command2, commandn...
@ -1510,17 +1511,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
panel = mainSensorInputs, Center
panel = otherSensorInputs, East
dialog = allPins1
field = "TLE8888 CS", tle8888_cs
field = "TLE8888 SPI", tle8888spiDevice
field = "tle6240_cs", tle6240_cs
field = "tle6240 SPI", tle6240spiDevice
field = "mc33972_cs", mc33972_cs
field = "mc33972 SPI", mc33972spiDevice
field = "warninig Led", warninigLedPin
field = "fatal Error Led", fatalErrorPin
field = "MAP ADC input", map_sensor_hwChannel
field = "frequencyReportingMapInputPin", frequencyReportingMapInputPin
dialog = allPinsSensors, "Sensors"
field = "CLT ADC input", clt_adcChannel
field = "IAT ADC input", iat_adcChannel
field = "vBatt ADC input", vbattAdcChannel
@ -1528,24 +1519,30 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "TPS2 ADC input", tps2AdcChannel
field = "MAF ADC input", mafAdcChannel
field = "AFR ADC input", afr_hwChannel
field = "fuelLevelSensor", fuelLevelSensor
field = "Baro ADC input", baroSensor_hwChannel
field = "Throttle pedal Position Channel", throttlePedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
field = "MAP ADC input", map_sensor_hwChannel
field = "FrequencyReportingMapInputPin", frequencyReportingMapInputPin
field = "FuelLevelSensor", fuelLevelSensor
field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin
field = "clutchUpPin", clutchUpPin
field = "brakePedalPin", brakePedalPin
field = "A/C Switch", acSwitchAdc
field = "servo#1", servoOutputPins1
field = "servo#2", servoOutputPins2
field = "servo#3", servoOutputPins3
field = "servo#4", servoOutputPins4
field = "servo#5", servoOutputPins5
dialog = allPins2
dialog = allPins1_1
field = "Warning Led", warningLedPin
field = "Fatal Error Led", fatalErrorPin
field = "tle6240_cs", tle6240_cs
field = "tle6240 SPI", tle6240spiDevice
field = "mc33972_cs", mc33972_cs
field = "mc33972 SPI", mc33972spiDevice
panel = allPinsSensors
field = "Throttle pedal Position Channel", throttlePedalPositionAdcChannel
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
dialog = allPins1_2
field = "Tachometer output Pin", tachOutputPin
field = "Dizzy out Pin", dizzySparkOutputPin
field = "O2 heater pin", o2heaterPin
@ -1574,8 +1571,10 @@ 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 = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
dialog = allPins3
dialog = allPins2_1
field = "Injection Pin 1", injectionPins1
field = "Injection Pin 2", injectionPins2
field = "Injection Pin 3", injectionPins3
@ -1588,8 +1587,26 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Injection Pin 10 ", injectionPins10
field = "Injection Pin 11 ", injectionPins11
field = "Injection Pin 12 ", injectionPins12
field = "Ignition Pin 1", ignitionPins1
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
field = "FSIO dig inp #10", fsioDigitalInputs10
field = "FSIO dig inp #11", fsioDigitalInputs11
field = "FSIO dig inp #12", fsioDigitalInputs12
field = "FSIO dig inp #13", fsioDigitalInputs13
field = "FSIO dig inp #14", fsioDigitalInputs14
field = "FSIO dig inp #15", fsioDigitalInputs15
field = "FSIO dig inp #16", fsioDigitalInputs16
dialog = allPins2_2
field = "Ignition Pin 1", ignitionPins1
field = "Ignition Pin 2", ignitionPins2
field = "Ignition Pin 3", ignitionPins3
field = "Ignition Pin 4", ignitionPins4
@ -1601,17 +1618,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Ignition Pin 10", ignitionPins10
field = "Ignition Pin 11", ignitionPins11
field = "Ignition Pin 12", ignitionPins12
dialog = allPins4
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
field = "output #1", fsioOutputPins1
field = "output #2", fsioOutputPins2
field = "output #3", fsioOutputPins3
@ -1628,10 +1634,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "output #14", fsioOutputPins14
field = "output #15", fsioOutputPins15
field = "output #16", fsioOutputPins16
field = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
dialog = allPins5
dialog = allPins1_3
field = "FSIO ADC #1", fsioAdc1
field = "FSIO ADC #2", fsioAdc2
field = "FSIO ADC #3", fsioAdc3
@ -1658,20 +1662,28 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "TLE8888 Chip Select", tle8888_cs
field = "TLE8888 CS Mode", tle8888_csPinMode
field = "TLE 8888 spi", tle8888spiDevice
field = "servo#1", servoOutputPins1
field = "servo#2", servoOutputPins2
field = "servo#3", servoOutputPins3
field = "servo#4", servoOutputPins4
field = "servo#5", servoOutputPins5
dialog = allPins1_2, "", xAxis
panel = allPins1
panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis
dialog = allPins1_1_and_2, "", xAxis
panel = allPins1_1
panel = allPins1_2
panel = allPins3_4
panel = allPins5
dialog = allPins1, "All Pins 1/2", xAxis
panel = allPins1_1_and_2
panel = allPins1_3
dialog = allPins2_1_and_2, "", xAxis
panel = allPins2_1
panel = allPins2_2
dialog = allPins2, "All Pins 2/2", xAxis
panel = allPins2_1_and_2
; Sensors->CLT Sensor Settings
dialog = clt_thermistor, "CLT Sensor Settings"
@ -2309,7 +2321,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
text = "More about electronic throttle body on the web"
webHelp = "https://rusefi.com/s/etb"
help = tpsTpsHelp, "Acceleration Enrichment"
help = tpsTpsHelp, "Acceleration Enrichment"
text = "More about Tps To Tps acceleration on the web"
webHelp = "https://rusefi.com/s/tpstps"
@ -2325,6 +2337,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
topicHelp = "veTableDialogHelp"
panel = veTableMap, South
dialog = etbPidDialog, "PID settings"
field = "pFactor", etb_pFactor, {throttlePedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {throttlePedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {throttlePedalPositionAdcChannel != 16}
field = "offset", etb_offset, {throttlePedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {throttlePedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {throttlePedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {throttlePedalPositionAdcChannel != 16}
field = "iTermMin", etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
field = "iTermMax", etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
dialog = etbDialogLeft
field = "https://rusefi.com/s/etb"
field = "Detailed status in console", isVerboseETB
@ -2340,16 +2364,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
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 = "pFactor", etb_pFactor, {throttlePedalPositionAdcChannel != 16}
field = "iFactor", etb_iFactor, {throttlePedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {throttlePedalPositionAdcChannel != 16}
field = "offset", etb_offset, {throttlePedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {throttlePedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {throttlePedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {throttlePedalPositionAdcChannel != 16}
field = "iTermMin", etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
field = "iTermMax", etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
field = "etbDeadband", etbDeadband, {throttlePedalPositionAdcChannel != 16}
panel = etbPidDialog
dialog = etbDialogRight
field = "!https://rusefi.com/s/debugmode"
@ -2369,7 +2385,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
panel = etbDialogLeft, West
panel = etbDialogRight, East
dialog = testSpark, "Spark"
commandButton = "Spark #1", cmd_test_spk1
commandButton = "Spark #2", cmd_test_spk2

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 Fri Apr 26 11:52:57 EDT 2019
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 28 23:03:20 EDT 2019
public class Fields {
public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498;
@ -1220,8 +1220,8 @@ public class Fields {
public static final int warmupTargetAfr_offset_hex = 854;
public static final int warmupTargetAfrBins_offset = 2116;
public static final int warmupTargetAfrBins_offset_hex = 844;
public static final int warningLedPin_offset = 2061;
public static final int warningPeriod_offset = 1502;
public static final int warninigLedPin_offset = 2061;
public static final int wboHeaterPin_offset = 673;
public static final int wwaeBeta_offset = 1828;
public static final int wwaeBeta_offset_hex = 724;
@ -1761,7 +1761,7 @@ public class Fields {
public static final Field AFTERCRANKINGIACTAPERDURATION = Field.create("AFTERCRANKINGIACTAPERDURATION", 2056, FieldType.INT16);
public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 2058, FieldType.INT16);
public static final Field FATALERRORPIN = Field.create("FATALERRORPIN", 2060, FieldType.INT8, brain_pin_e);
public static final Field WARNINIGLEDPIN = Field.create("WARNINIGLEDPIN", 2061, FieldType.INT8, brain_pin_e);
public static final Field WARNINGLEDPIN = Field.create("WARNINGLEDPIN", 2061, FieldType.INT8, brain_pin_e);
public static final Field UNUSED1234234 = Field.create("UNUSED1234234", 2062, FieldType.INT8, brain_pin_e);
public static final Field LIS302DLCSPIN = Field.create("LIS302DLCSPIN", 2063, FieldType.INT8, brain_pin_e);
public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2064, FieldType.INT);