From b2dece526919338f388ed3d430ad6777988df0e7 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 30 Jun 2019 14:28:47 -0400 Subject: [PATCH] undoing wrong fix & better fix for #805 also generator logging improvements This reverts commit f07f96599be36c66a204e2f8b0ca19f9f9ef9a3c. --- .../boards/prometheus/board_configuration.cpp | 2 +- .../subaru-ej20gn/board_configuration.cpp | 2 +- firmware/config/engines/bmw_e34.cpp | 2 +- .../config/engines/chevrolet_camaro_4.cpp | 2 +- .../config/engines/citroenBerlingoTU3JP.cpp | 2 +- firmware/config/engines/custom_engine.cpp | 6 ++--- firmware/config/engines/dodge_neon.cpp | 4 +-- .../config/engines/ford_1995_inline_6.cpp | 2 +- firmware/config/engines/ford_aspire.cpp | 2 +- firmware/config/engines/ford_festiva.cpp | 2 +- firmware/config/engines/honda_600.cpp | 2 +- firmware/config/engines/honda_accord.cpp | 2 +- firmware/config/engines/mazda_miata.cpp | 6 ++--- firmware/config/engines/mazda_miata_1_6.cpp | 2 +- firmware/config/engines/mazda_miata_nb.cpp | 2 +- firmware/config/engines/me7pnp.cpp | 2 +- firmware/config/engines/rover_v8.cpp | 2 +- firmware/config/engines/sachs.cpp | 2 +- firmware/console/status_loop.cpp | 2 +- .../controllers/actuators/lcd_controller.cpp | 2 +- firmware/controllers/engine_controller.cpp | 6 ++--- ...ngine_configuration_generated_structures.h | 12 ++++----- .../controllers/generated/rusefi_generated.h | 4 +-- firmware/controllers/sensors/tps.cpp | 10 +++---- firmware/controllers/settings.cpp | 4 +-- firmware/hw_layer/adc_inputs.cpp | 2 +- firmware/hw_layer/hardware.cpp | 4 +-- firmware/integration/rusefi_config.txt | 13 +++------- firmware/tunerstudio/rusefi.ini | 26 +++++++++---------- firmware/tunerstudio/rusefi.input | 22 ++++++++-------- firmware/tunerstudio/rusefi_frankenso.ini | 26 +++++++++---------- firmware/tunerstudio/rusefi_microrusefi.ini | 26 +++++++++---------- firmware/tunerstudio/rusefi_prometheus.ini | 26 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 10 +++---- .../com/rusefi/ldmp/generated/TpsMeta.java | 2 +- .../src/com/rusefi/ConfigDefinition.java | 2 ++ .../com/rusefi/output/CHeaderConsumer.java | 3 ++- .../src/com/rusefi/util/SystemOut.java | 5 ++++ 38 files changed, 128 insertions(+), 125 deletions(-) diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 2e8f7372b1..522fee8ff4 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -137,7 +137,7 @@ void setBoardConfigurationOverrides(void) { setSerialConfigurationOverrides(); engineConfiguration->vbattAdcChannel = EFI_ADC_13; - engineConfiguration->tpsADC = is469 ? EFI_ADC_7 : EFI_ADC_14; + engineConfiguration->tps1_1AdcChannel = is469 ? EFI_ADC_7 : EFI_ADC_14; engineConfiguration->map.sensor.hwChannel = is469 ? EFI_ADC_8 : EFI_ADC_15; engineConfiguration->clt.adcChannel = EFI_ADC_3; engineConfiguration->iat.adcChannel = EFI_ADC_4; diff --git a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp index e45c05051f..9a5bc10d6c 100644 --- a/firmware/config/boards/subaru-ej20gn/board_configuration.cpp +++ b/firmware/config/boards/subaru-ej20gn/board_configuration.cpp @@ -89,7 +89,7 @@ void setBoardConfigurationOverrides(void) { setSerialConfigurationOverrides(); engineConfiguration->vbattAdcChannel = EFI_ADC_6; - engineConfiguration->tpsADC = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; engineConfiguration->map.sensor.hwChannel = EFI_ADC_14; engineConfiguration->clt.adcChannel = EFI_ADC_8; /* not yet */ diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index dfa98b6e58..6a9f083338 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -86,7 +86,7 @@ void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->vbattDividerCoeff = 5.33; engineConfiguration->vbattAdcChannel = EFI_ADC_15; // PC5 - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; boardConfiguration->triggerInputPins[0] = GPIOA_5; diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index 875d53a1b8..fa4d36ab3e 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -40,7 +40,7 @@ void setCamaro4(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->mafAdcChannel = EFI_ADC_NONE; - engineConfiguration->tpsADC = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // todo: move this into trigger definition // set global_trigger_offset_angle 230 diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 04e3f2e2e6..faf9c3d4b6 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -177,7 +177,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * TPS */ - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->tpsMax = 102; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 825; // convert 12to10 bit (ADC/4) /** diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 0000e3b6d6..c2490ba5a9 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -103,7 +103,7 @@ void setCustomEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * Frankenso analog #11 PC5 ADC15 * Frankenso analog #12 PC4 ADC14 VBatt */ - engineConfiguration->tpsADC = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; @@ -302,7 +302,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->etb.maxValue = 200; #endif /* EFI_ELECTRONIC_THROTTLE_BODY */ - engineConfiguration->tpsADC = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_9; // PB1 engineConfiguration->debugMode = DBG_ELECTRONIC_THROTTLE_PID; @@ -393,7 +393,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { boardConfiguration->fuelPumpPin = TLE8888_PIN_20; - engineConfiguration->tpsADC = EFI_ADC_3; // PA3 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // PA7 // engineConfiguration->etb.pFactor = 1.07; diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 09c151eb90..dd11b25ad4 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -401,13 +401,13 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // rev 0.1 green board // engineConfiguration->map.sensor.hwChannel = EFI_ADC_6; // PA6 -// engineConfiguration->tpsADC = EFI_ADC_15; // PC5 +// engineConfiguration->tps1_1AdcChannel = EFI_ADC_15; // PC5 /** * TPS */ - engineConfiguration->tpsADC = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4) diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index 3cc813a28a..cf0b3c4311 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -69,7 +69,7 @@ void setFordInline6(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // input channel 10 is PC3, that's ADC13 // input channel 12 is PC1, that's ADC11 - engineConfiguration->tpsADC = EFI_ADC_4; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_4; engineConfiguration->iat.adcChannel = EFI_ADC_2; engineConfiguration->clt.adcChannel = EFI_ADC_1; engineConfiguration->afr.hwChannel = EFI_ADC_11; diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index 63805cd9e4..9600086c22 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -147,7 +147,7 @@ void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // Frankenstein analog input #12: adc - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->vbattAdcChannel = EFI_ADC_0; engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index d6a507bcdb..4ba51eb87e 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -216,7 +216,7 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4) - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->clt.adcChannel = EFI_ADC_12; diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp index ad5c5681b9..1ed6b9767d 100644 --- a/firmware/config/engines/honda_600.cpp +++ b/firmware/config/engines/honda_600.cpp @@ -109,7 +109,7 @@ void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * Frankenso analog #11 PC5 ADC15 * Frankenso analog #12 PC4 ADC14 VBatt */ - engineConfiguration->tpsADC = EFI_ADC_2; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index c53e73c88c..fae6eb3711 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -132,7 +132,7 @@ static void setHondaAccordConfigurationCommon(DECLARE_CONFIG_PARAMETER_SIGNATURE /** * TPS D11/W11 blue wire */ - engineConfiguration->tpsADC = EFI_ADC_1; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_1; /** diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index c29dbd0a1c..b406f12407 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -198,7 +198,7 @@ void common079721_2351(engine_configuration_s *engineConfiguration, board_config // Frankenstein analog input #11: adc // Frankenstein analog input #12: adc engineConfiguration->mafAdcChannel = EFI_ADC_1; - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->clt.adcChannel = EFI_ADC_11; } @@ -302,7 +302,7 @@ static void setMiata1994_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) { commonFrankensoAnalogInputs(engineConfiguration); - engineConfiguration->tpsADC = EFI_ADC_2; // PA2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; // PA2 engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->clt.adcChannel = EFI_ADC_12; @@ -393,7 +393,7 @@ void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->clt.adcChannel = EFI_ADC_11; - engineConfiguration->tpsADC = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3 boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 10f232e72c..1e52cd87e4 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -272,6 +272,6 @@ void setMiataNA6_VAF_Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * Stage 0 we only have OEM TPS switch */ - engineConfiguration->tpsADC = EFI_ADC_NONE; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE; // todo: MAF-based ignition table? } diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp index 904953e104..2f0564729e 100644 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ b/firmware/config/engines/mazda_miata_nb.cpp @@ -38,7 +38,7 @@ void setMazdaMiataNb1EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setThermistorConfiguration(&engineConfiguration->iat, -10, 160310, 60, 7700, 120.00, 1180); engineConfiguration->iat.config.bias_resistor = 2700; - engineConfiguration->tpsADC = EFI_ADC_3; // 15 is the old value + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // 15 is the old value engineConfiguration->vbattAdcChannel = EFI_ADC_0; // 1 is the old value // engineConfiguration->map.channel = 1; engineConfiguration->mafAdcChannel = EFI_ADC_1; diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index efe450654c..9510218eed 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -51,7 +51,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { setCommonNTCSensor(&engineConfiguration->iat); engineConfiguration->iat.config.bias_resistor = 2700; engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; - //engineConfiguration->tpsADC = PF3; TODO: ADC channel 3 + //engineConfiguration->tps1_1AdcChannel = PF3; TODO: ADC channel 3 engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; engineConfiguration->clt.adcChannel = EFI_ADC_6; //engineConfiguration->iat.adcChannel = PF4; TODO: ADC channel 3 diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index 87c0636f26..cd9daa3798 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -106,7 +106,7 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setCommonNTCSensor(&engineConfiguration->iat); engineConfiguration->iat.config.bias_resistor = 2700; - engineConfiguration->tpsADC = EFI_ADC_3; //Frankenstein: inp2 + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; //Frankenstein: inp2 engineConfiguration->vbattAdcChannel = EFI_ADC_0; //Frankenstein: inp5 engineConfiguration->clt.adcChannel = EFI_ADC_11; engineConfiguration->iat.adcChannel = EFI_ADC_13; diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp index 999a3feecc..438af42225 100644 --- a/firmware/config/engines/sachs.cpp +++ b/firmware/config/engines/sachs.cpp @@ -49,7 +49,7 @@ void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // Frankenstein analog input #11: PC4 adc14 // Frankenstein analog input #12: PC5 adc15 - engineConfiguration->tpsADC = EFI_ADC_3; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; engineConfiguration->vbattAdcChannel = EFI_ADC_NONE; /** diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index b868d3a6bb..d1e8bf5056 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -841,7 +841,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ #endif /* EFI_CAN_SUPPORT */ case DBG_ANALOG_INPUTS: tsOutputChannels->debugFloatField1 = (engineConfiguration->vbattAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("vbatt", engineConfiguration->vbattAdcChannel) : 0.0f; - tsOutputChannels->debugFloatField2 = (engineConfiguration->tpsADC != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tpsADC) : 0.0f; + tsOutputChannels->debugFloatField2 = (engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE) ? getVoltageDivided("tps", engineConfiguration->tps1_1AdcChannel) : 0.0f; tsOutputChannels->debugFloatField3 = (engineConfiguration->mafAdcChannel != EFI_ADC_NONE) ? getVoltageDivided("maf", engineConfiguration->mafAdcChannel) : 0.0f; tsOutputChannels->debugFloatField4 = (engineConfiguration->map.sensor.hwChannel != EFI_ADC_NONE) ? getVoltageDivided("map", engineConfiguration->map.sensor.hwChannel) : 0.0f; tsOutputChannels->debugFloatField5 = (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) ? getVoltageDivided("clt", engineConfiguration->clt.adcChannel) : 0.0f; diff --git a/firmware/controllers/actuators/lcd_controller.cpp b/firmware/controllers/actuators/lcd_controller.cpp index 3c2511f3a5..06373e3b88 100644 --- a/firmware/controllers/actuators/lcd_controller.cpp +++ b/firmware/controllers/actuators/lcd_controller.cpp @@ -246,7 +246,7 @@ static void showLine(lcd_line_e line, int screenY) { lcdPrintf(getIgnition_mode_e(engineConfiguration->ignitionMode)); return; case LL_TPS: - getPinNameByAdcChannel("tps", engineConfiguration->tpsADC, buffer); + getPinNameByAdcChannel("tps", engineConfiguration->tps1_1AdcChannel, buffer); lcdPrintf("Throttle %s %.2f%%", buffer, getTPS()); return; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 571abfdafa..c54738fb16 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -386,7 +386,7 @@ static void printAnalogInfo(void) { printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel); printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor); - printAnalogChannelInfo("TPS", engineConfiguration->tpsADC); + printAnalogChannelInfo("TPS", engineConfiguration->tps1_1AdcChannel); printAnalogChannelInfo("pPS", engineConfiguration->throttlePedalPositionAdcChannel); if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) { printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel); @@ -589,7 +589,7 @@ void setMockAfrVoltage(float voltage) { } void setMockTpsVoltage(float voltage) { - setMockVoltage(engineConfiguration->tpsADC, voltage); + setMockVoltage(engineConfiguration->tps1_1AdcChannel, voltage); } void setMockMapVoltage(float voltage) { @@ -810,6 +810,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190625; + return 20190630; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 2ea5e1578a..a6eaad229f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 26 19:39:50 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:06:54 EDT 2019 // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H #define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1137,14 +1137,14 @@ struct engine_configuration_s { /** * Closed throttle. todo: extract these two fields into a structure * todo: we need two sets of TPS parameters - modern ETBs have two sensors - * See also tpsADC + * See also tps1_1AdcChannel * set tps_min X * offset 80 */ int16_t tpsMin; /** * Full throttle. tpsMax value as 10 bit ADC value. Not Voltage! - * See also tpsADC + * See also tps1_1AdcChannel * set tps_max X * offset 82 */ @@ -1371,7 +1371,7 @@ struct engine_configuration_s { * First TPS, single channel so far. See aslo pedalPositionAdcChannel * offset 512 */ - adc_channel_e tpsADC; + adc_channel_e tps1_1AdcChannel; /** * offset 513 */ @@ -1444,7 +1444,7 @@ struct engine_configuration_s { /** * Electronic throttle pedal position input * Single channel so far - * See also tpsADC + * See also tps1_1AdcChannel * offset 580 */ adc_channel_e throttlePedalPositionAdcChannel; @@ -2827,4 +2827,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 Wed Jun 26 19:39:50 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:06:54 EDT 2019 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 12cab5424c..9cebce120b 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1699,6 +1699,8 @@ #define tle8888spiDevice_offset_hex fb8 #define TOTAL_CONFIG_SIZE 20000 #define TOTAL_CONFIG_SIZE_hex 4e20 +#define tps1_1AdcChannel_offset 512 +#define tps1_1AdcChannel_offset_hex 200 #define tps2_1AdcChannel_offset 515 #define tps2_1AdcChannel_offset_hex 203 #define TPS_TPS_ACCEL_TABLE 8 @@ -1710,8 +1712,6 @@ #define tpsAccelFractionPeriod_offset_hex fb2 #define tpsAccelLength_offset 2064 #define tpsAccelLength_offset_hex 810 -#define tpsADC_offset 512 -#define tpsADC_offset_hex 200 #define tpsDecelEnleanmentMultiplier_offset 2104 #define tpsDecelEnleanmentMultiplier_offset_hex 838 #define tpsDecelEnleanmentThreshold_offset 2100 diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index 6131ce3765..f41cb12813 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -90,7 +90,7 @@ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) { engine->engineState.DISPLAY_FIELD(tpsVoltageMCU) = adcToVolts(adc); #endif DISPLAY_TEXT(Volts); - DISPLAY_TEXT(from_pin) DISPLAY(DISPLAY_CONFIG(tpsADC)) + DISPLAY_TEXT(from_pin) DISPLAY(DISPLAY_CONFIG(tps1_1AdcChannel)) DISPLAY_TEXT(EOL); DISPLAY_TEXT(Analog_ECU_reads); @@ -131,7 +131,7 @@ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) { * Return voltage on TPS AND channel * */ float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - return getVoltageDivided("tps", engineConfiguration->tpsADC); + return getVoltageDivided("tps", engineConfiguration->tps1_1AdcChannel); } /* @@ -145,11 +145,11 @@ int getTPS12bitAdc(DECLARE_ENGINE_PARAMETER_SIGNATURE) { return engine->mockTpsAdcValue; } #endif - if (engineConfiguration->tpsADC == EFI_ADC_NONE) + if (engineConfiguration->tps1_1AdcChannel == EFI_ADC_NONE) return -1; #if EFI_PROD_CODE - return getAdcValue("tps10", engineConfiguration->tpsADC); + return getAdcValue("tps10", engineConfiguration->tps1_1AdcChannel); // return tpsFastAdc / 4; #else return 0; @@ -213,7 +213,7 @@ percent_t getPedalPosition(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - return engineConfiguration->tpsADC != EFI_ADC_NONE; + return engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE; } percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) { diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 8ac693c0ec..6296772bd4 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -417,7 +417,7 @@ void printTPSInfo(void) { static char pinNameBuffer[16]; scheduleMsg(&logger, "tps min (closed) %d/max (full) %d v=%.2f @%s", engineConfiguration->tpsMin, engineConfiguration->tpsMax, - getTPSVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), getPinNameByAdcChannel("tps", engineConfiguration->tpsADC, pinNameBuffer)); + getTPSVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), getPinNameByAdcChannel("tps", engineConfiguration->tps1_1AdcChannel, pinNameBuffer)); #endif /* EFI_PROD_CODE */ scheduleMsg(&logger, "current 10bit=%d value=%.2f rate=%.2f", getTPS10bitAdc(), getTPS(PASS_ENGINE_PARAMETER_SIGNATURE), getTpsRateOfChange()); @@ -791,7 +791,7 @@ static void setAnalogInputPin(const char *sensorStr, const char *pinName) { engineConfiguration->iat.adcChannel = channel; scheduleMsg(&logger, "setting IAT to %s/%d", pinName, channel); } else if (strEqual("tps", sensorStr)) { - engineConfiguration->tpsADC = channel; + engineConfiguration->tps1_1AdcChannel = channel; scheduleMsg(&logger, "setting TPS to %s/%d", pinName, channel); } incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 91d323bbb3..338307f7a2 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -501,7 +501,7 @@ static void configureInputs(void) { addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST); addChannel("baro", engineConfiguration->baroSensor.hwChannel, ADC_SLOW); - addChannel("TPS", engineConfiguration->tpsADC, ADC_FAST); + addChannel("TPS", engineConfiguration->tps1_1AdcChannel, ADC_FAST); addChannel("fuel", engineConfiguration->fuelLevelSensor, ADC_SLOW); addChannel("pPS", engineConfiguration->throttlePedalPositionAdcChannel, ADC_SLOW); addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW); diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 7078a3f65a..8ca4fce208 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -231,8 +231,8 @@ static void calcFastAdcIndexes(void) { hipSampleIndex = engineConfiguration->hipOutputChannel == EFI_ADC_NONE ? -1 : fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->hipOutputChannel]; - if (engineConfiguration->tpsADC != EFI_ADC_NONE) { - tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tpsADC]; + if (engineConfiguration->tps1_1AdcChannel != EFI_ADC_NONE) { + tpsSampleIndex = fastAdc.internalAdcIndexByHardwareIndex[engineConfiguration->tps1_1AdcChannel]; } else { tpsSampleIndex = TPS_IS_SLOW; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 4925c0101e..ba2a5c3b73 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -315,8 +315,8 @@ bit issue_294_30; bit issue_294_31; -int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors\nSee also tpsADC\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 -int16_t tpsMax;Full throttle. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tpsADC\nset tps_max X;"ADC", 1, 0, 0, 1023, 0 +int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors\nSee also tps1_1AdcChannel\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 +int16_t tpsMax;Full throttle. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps_max X;"ADC", 1, 0, 0, 1023, 0 int16_t tpsErrorDetectionTooLow;+TPS error detection, what TPS % value is unrealistically low;"%", 1, 0, -40, 200, 0 int16_t tpsErrorDetectionTooHigh;+TPS error detection, what TPS % value is unrealistically high;"%", 1, 0, -40, 200, 0 @@ -418,12 +418,7 @@ log_format_e logFormat; int HD44780width;;"index", 1, 0, 0, 300, 0 int HD44780height;;"index", 1, 0, 0, 300, 0 -! -! TunerStudio has that nice 'Calibrate TPS' standart dialog which users LOVE! -! So, we have to use 'tpsADC' magic field name for first TPS first channel -! https://github.com/rusefi/rusefi/issues/805 -! - adc_channel_e tpsADC;First TPS, single channel so far. See aslo pedalPositionAdcChannel + adc_channel_e tps1_1AdcChannel;First TPS, single channel so far. See aslo pedalPositionAdcChannel adc_channel_e vbattAdcChannel; adc_channel_e fuelLevelSensor; adc_channel_e tps2_1AdcChannel;Second throttle body position sensor, single channel so far @@ -476,7 +471,7 @@ end_struct afr_sensor_s afr -adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSingle channel so far\nSee also tpsADC +adc_channel_e throttlePedalPositionAdcChannel;Electronic throttle pedal position input\nSingle channel so far\nSee also tps1_1AdcChannel brain_pin_e tle6240_cs; pin_output_mode_e tle6240_csPinMode; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 2c1eabf3a0..6214a491f6 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -82,7 +82,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 Fri Jun 28 17:53:06 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:05:19 EDT 2019 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tpsADC = bits, U08, 512, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vbattAdcChannel = bits, U08, 513, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" fuelLevelSensor = bits, U08, 514, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2_1AdcChannel = bits, U08, 515, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1154,7 +1154,7 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; @@ -1764,7 +1764,7 @@ gaugeCategory = Debug debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0 - + gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 @@ -1783,13 +1783,13 @@ gaugeCategory = Sensors - Basic VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - + gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 accelerationXGauge = accelerationX, "Acceleration: X", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, "Acceleration: Y", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 - atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 + atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 @@ -1830,7 +1830,7 @@ gaugeCategory = Fueling gaugeCategory = Throttle Body (incl. ETB) pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1 - tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -2041,7 +2041,7 @@ gaugeCategory = Throttle Body (incl. ETB) entry = ind_fan, "radiator fan",int,"%d" -; tpsADC1 = U16, "ADC", +; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -2519,10 +2519,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" - field = "Throttle1 position sensor", tpsADC + field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16} - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16} + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} dialog = pedalSensor, "Accelerator pedal" field = "Accelerator position sensor", throttlePedalPositionAdcChannel @@ -2553,7 +2553,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS1 ADC input", tpsADC + field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel @@ -3483,7 +3483,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine commandButton = "Reset ECU", cmd_reset_controller - + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index bad6416cd8..57b4589dbb 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -183,7 +183,7 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; @@ -793,7 +793,7 @@ gaugeCategory = Debug debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0 - + gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 @@ -812,13 +812,13 @@ gaugeCategory = Sensors - Basic VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - + gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 accelerationXGauge = accelerationX, @@GAUGE_NAME_ACCEL_X@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, @@GAUGE_NAME_ACCEL_Y@@, "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 - atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 + atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, @@GAUGE_NAME_ECU_TEMPERATURE@@, "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 @@ -859,7 +859,7 @@ gaugeCategory = Fueling gaugeCategory = Throttle Body (incl. ETB) pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1 - tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -1070,7 +1070,7 @@ gaugeCategory = Throttle Body (incl. ETB) entry = ind_fan, "radiator fan",int,"%d" -; tpsADC1 = U16, "ADC", +; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -1548,10 +1548,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" - field = "Throttle1 position sensor", tpsADC + field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16} - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16} + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} dialog = pedalSensor, "Accelerator pedal" field = "Accelerator position sensor", throttlePedalPositionAdcChannel @@ -1582,7 +1582,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS1 ADC input", tpsADC + field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel @@ -2512,7 +2512,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine commandButton = "Reset ECU", cmd_reset_controller - + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 88305ed162..09ae08621c 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -82,7 +82,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 Fri Jun 28 17:53:10 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:05:24 EDT 2019 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tpsADC = bits, U08, 512, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE","INVALID","INVALID","INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE","INVALID","INVALID","INVALID" vbattAdcChannel = bits, U08, 513, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE","INVALID","INVALID","INVALID" fuelLevelSensor = bits, U08, 514, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE","INVALID","INVALID","INVALID" tps2_1AdcChannel = bits, U08, 515, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE","INVALID","INVALID","INVALID" @@ -1154,7 +1154,7 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; @@ -1764,7 +1764,7 @@ gaugeCategory = Debug debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0 - + gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 @@ -1783,13 +1783,13 @@ gaugeCategory = Sensors - Basic VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - + gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 accelerationXGauge = accelerationX, "Acceleration: X", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, "Acceleration: Y", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 - atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 + atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 @@ -1830,7 +1830,7 @@ gaugeCategory = Fueling gaugeCategory = Throttle Body (incl. ETB) pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1 - tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -2041,7 +2041,7 @@ gaugeCategory = Throttle Body (incl. ETB) entry = ind_fan, "radiator fan",int,"%d" -; tpsADC1 = U16, "ADC", +; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -2519,10 +2519,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" - field = "Throttle1 position sensor", tpsADC + field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16} - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16} + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} dialog = pedalSensor, "Accelerator pedal" field = "Accelerator position sensor", throttlePedalPositionAdcChannel @@ -2553,7 +2553,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS1 ADC input", tpsADC + field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel @@ -3483,7 +3483,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine commandButton = "Reset ECU", cmd_reset_controller - + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index d8cfb4a4f9..12aebe353d 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -82,7 +82,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 Fri Jun 28 17:53:08 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:05:21 EDT 2019 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tpsADC = bits, U08, 512, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","19 - AN volt 10","INVALID","32 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN-VOLT-1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE","INVALID","INVALID","INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","19 - AN volt 10","INVALID","32 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN-VOLT-1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE","INVALID","INVALID","INVALID" vbattAdcChannel = bits, U08, 513, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","19 - AN volt 10","INVALID","32 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN-VOLT-1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE","INVALID","INVALID","INVALID" fuelLevelSensor = bits, U08, 514, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","19 - AN volt 10","INVALID","32 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN-VOLT-1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE","INVALID","INVALID","INVALID" tps2_1AdcChannel = bits, U08, 515, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","19 - AN volt 10","INVALID","32 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN-VOLT-1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE","INVALID","INVALID","INVALID" @@ -1154,7 +1154,7 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; @@ -1764,7 +1764,7 @@ gaugeCategory = Debug debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0 - + gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 @@ -1783,13 +1783,13 @@ gaugeCategory = Sensors - Basic VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - + gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 accelerationXGauge = accelerationX, "Acceleration: X", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, "Acceleration: Y", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 - atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 + atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 @@ -1830,7 +1830,7 @@ gaugeCategory = Fueling gaugeCategory = Throttle Body (incl. ETB) pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1 - tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -2041,7 +2041,7 @@ gaugeCategory = Throttle Body (incl. ETB) entry = ind_fan, "radiator fan",int,"%d" -; tpsADC1 = U16, "ADC", +; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -2512,10 +2512,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" - field = "Throttle1 position sensor", tpsADC + field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16} - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16} + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} dialog = pedalSensor, "Accelerator pedal" field = "Accelerator position sensor", throttlePedalPositionAdcChannel @@ -2546,7 +2546,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS1 ADC input", tpsADC + field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel @@ -3467,7 +3467,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine commandButton = "Reset ECU", cmd_reset_controller - + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index c27433356d..b89e9d5bba 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -82,7 +82,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 Fri Jun 28 17:53:13 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:05:26 EDT 2019 pageSize = 20000 page = 1 @@ -194,7 +194,7 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tpsADC = bits, U08, 512, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" vbattAdcChannel = bits, U08, 513, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" fuelLevelSensor = bits, U08, 514, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" tps2_1AdcChannel = bits, U08, 515, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" @@ -1154,7 +1154,7 @@ fileVersion = { 20171101 } engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm VBatt = scalar, F32, 28, "V", 1, 0.0 ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) - tpsADC1 = scalar, U16, 32, "ADC", 1, 0.0; + tpsADC = scalar, U16, 32, "ADC", 1, 0.0; tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0; baroPressure = scalar, F32, 36, "pres", 1, 0.0; MAPValue = scalar, F32, 40, "MAP", 1, 0.0; @@ -1764,7 +1764,7 @@ gaugeCategory = Debug debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField4Gauge = debugIntField4, "debug i4", "%", 0, 100, 0, 0, 100, 100, 0, 0 debugIntField5Gauge = debugIntField5, "debug i5", "%", 0, 100, 0, 0, 100, 100, 0, 0 - + gaugeCategory = Sensors - Basic RPMGauge = RPMValue, "RPM - engine speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 @@ -1783,13 +1783,13 @@ gaugeCategory = Sensors - Basic VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - + gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 accelerationXGauge = accelerationX, "Acceleration: X", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 accelerationYGauge = accelerationY, "Acceleration: Y", "acc", -11, 11, 1.0, 1.2, 100, 100, 3, 1 - atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 + atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 @@ -1830,7 +1830,7 @@ gaugeCategory = Fueling gaugeCategory = Throttle Body (incl. ETB) pedalPositionGauge = pedalPosition, "Throttle pedal position", "%", 0, 120, 0, 0, 100, 100, 1, 1 - tpsADCGauge = tpsADC1, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 + tpsADCGauge = tpsADC, "tps1 ADC", "ADC", 0, 1024, 0, 0, 0, 0, 0, 0 TPSGauge = TPSValue, "Throttle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 etbTargetGauge = etbTarget, "ETB position target", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -2041,7 +2041,7 @@ gaugeCategory = Throttle Body (incl. ETB) entry = ind_fan, "radiator fan",int,"%d" -; tpsADC1 = U16, "ADC", +; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", ; crankingFuel = F32, "ms", @@ -2515,10 +2515,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" - field = "Throttle1 position sensor", tpsADC + field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tpsADC != 16} - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tpsADC != 16} + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} dialog = pedalSensor, "Accelerator pedal" field = "Accelerator position sensor", throttlePedalPositionAdcChannel @@ -2549,7 +2549,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel field = "vBatt ADC input", vbattAdcChannel - field = "TPS1 ADC input", tpsADC + field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel field = "AFR ADC input", afr_hwChannel @@ -3479,7 +3479,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine commandButton = "Reset ECU", cmd_reset_controller - + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index ac7917b17a..ddf7bf9a3e 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -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 Wed Jun 26 19:39:50 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 30 14:05:19 EDT 2019 import com.rusefi.config.*; @@ -1093,6 +1093,8 @@ public class Fields { public static final int tle8888_csPinMode_offset = 3130; public static final int tle8888spiDevice_offset = 4024; public static final int TOTAL_CONFIG_SIZE = 20000; + public static final int tps1_1AdcChannel_offset = 512; + public static final int tps1_1AdcChannel_offset_hex = 200; public static final int tps2_1AdcChannel_offset = 515; public static final int tps2_1AdcChannel_offset_hex = 203; public static final int TPS_TPS_ACCEL_TABLE = 8; @@ -1102,8 +1104,6 @@ public class Fields { public static final int tpsAccelFractionPeriod_offset = 4018; public static final int tpsAccelLength_offset = 2064; public static final int tpsAccelLength_offset_hex = 810; - public static final int tpsADC_offset = 512; - public static final int tpsADC_offset_hex = 200; public static final int tpsDecelEnleanmentMultiplier_offset = 2104; public static final int tpsDecelEnleanmentMultiplier_offset_hex = 838; public static final int tpsDecelEnleanmentThreshold_offset = 2100; @@ -1354,7 +1354,7 @@ public class Fields { public static final Field BYFIRMWAREVERSION = Field.create("BYFIRMWAREVERSION", 500, FieldType.INT); public static final Field HD44780WIDTH = Field.create("HD44780WIDTH", 504, FieldType.INT); public static final Field HD44780HEIGHT = Field.create("HD44780HEIGHT", 508, FieldType.INT); - public static final Field TPSADC = Field.create("TPSADC", 512, FieldType.INT8, adc_channel_e); + public static final Field TPS1_1ADCCHANNEL = Field.create("TPS1_1ADCCHANNEL", 512, FieldType.INT8, adc_channel_e); public static final Field VBATTADCCHANNEL = Field.create("VBATTADCCHANNEL", 513, FieldType.INT8, adc_channel_e); public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 514, FieldType.INT8, adc_channel_e); public static final Field TPS2_1ADCCHANNEL = Field.create("TPS2_1ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); @@ -2140,7 +2140,7 @@ public class Fields { BYFIRMWAREVERSION, HD44780WIDTH, HD44780HEIGHT, - TPSADC, + TPS1_1ADCCHANNEL, VBATTADCCHANNEL, FUELLEVELSENSOR, TPS2_1ADCCHANNEL, diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java b/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java index 55d81fd7ea..f2d1a7c538 100644 --- a/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java +++ b/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java @@ -14,7 +14,7 @@ public class TpsMeta { new FieldRequest("tpsVoltageMCU"), new TextRequest("Volts"), new TextRequest("from_pin"), - new ConfigRequest("tpsADC"), + new ConfigRequest("tps1_1AdcChannel"), new TextRequest("EOL"), new TextRequest("Analog_ECU_reads"), new FieldRequest("tpsVoltageBoard"), diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index e6bf80dc06..7f744831d2 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -47,8 +47,10 @@ public class ConfigDefinition { } catch (Throwable e) { SystemOut.println(e); e.printStackTrace(); + SystemOut.close(); System.exit(-1); } + SystemOut.close(); } private static void doJob(String[] args) throws IOException { diff --git a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java index f7d4e73727..79a8401b83 100644 --- a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java @@ -81,7 +81,8 @@ public class CHeaderConsumer implements ConfigurationConsumer { @Override public void endFile() throws IOException { - cHeader.write(VariableRegistry.INSTANCE.getDefinesSection()); + if (withC_Defines) + cHeader.write(VariableRegistry.INSTANCE.getDefinesSection()); cHeader.write(content.toString()); cHeader.write("#endif" + EOL); cHeader.write("// end" + EOL); diff --git a/java_tools/enum_to_string/src/com/rusefi/util/SystemOut.java b/java_tools/enum_to_string/src/com/rusefi/util/SystemOut.java index 1c7a19eefe..820b8d963b 100644 --- a/java_tools/enum_to_string/src/com/rusefi/util/SystemOut.java +++ b/java_tools/enum_to_string/src/com/rusefi/util/SystemOut.java @@ -44,4 +44,9 @@ public class SystemOut { public static void println(Object object) { println(object == null ? "(null)" : object.toString()); } + + public static void close() { + logFile.close(); + logFile = null; + } }