diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5219604056..4b1158e892 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:41:46 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1361,7 +1361,15 @@ typedef struct { /** * offset 541 */ - uint8_t unusedSpiPadding1[3]; + adc_channel_e high_fuel_pressure_sensor_1; + /** + * offset 542 + */ + adc_channel_e high_fuel_pressure_sensor_2; + /** + * offset 543 + */ + uint8_t unusedSpiPadding1; /** * set global_fuel_correction X * offset 544 @@ -2744,4 +2752,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:41:46 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index ad3742dced..64a2a76b76 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -952,6 +952,10 @@ #define HD44780height_offset_hex 1fc #define HD44780width_offset 504 #define HD44780width_offset_hex 1f8 +#define high_fuel_pressure_sensor_1_offset 541 +#define high_fuel_pressure_sensor_1_offset_hex 21d +#define high_fuel_pressure_sensor_2_offset 542 +#define high_fuel_pressure_sensor_2_offset_hex 21e #define hip9011CsPin_offset 753 #define hip9011CsPin_offset_hex 2f1 #define hip9011CsPinMode_offset 703 @@ -1786,8 +1790,8 @@ #define unusedjoy_offset_hex 3af #define unusedMa2_offset 711 #define unusedMa2_offset_hex 2c7 -#define unusedSpiPadding1_offset 541 -#define unusedSpiPadding1_offset_hex 21d +#define unusedSpiPadding1_offset 543 +#define unusedSpiPadding1_offset_hex 21f #define unusedSpiPadding2_offset 805 #define unusedSpiPadding2_offset_hex 325 #define unusedSpiPadding3_offset 2285 diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index c41b403b75..8c8101a0dc 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -499,6 +499,8 @@ static void configureInputs(void) { addChannel("AFR", engineConfiguration->afr.hwChannel, ADC_SLOW); addChannel("OilP", engineConfiguration->oilPressure.hwChannel, ADC_SLOW); addChannel("AC", engineConfiguration->acSwitchAdc, ADC_SLOW); + addChannel("HFP1", engineConfiguration->high_fuel_pressure_sensor_1, ADC_SLOW); + addChannel("HFP2", engineConfiguration->high_fuel_pressure_sensor_2, ADC_SLOW); if (CONFIGB(isCJ125Enabled)) { addChannel("cj125ur", engineConfiguration->cj125ur, ADC_SLOW); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c2905d5cd7..5a92196dbb 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -435,7 +435,9 @@ trigger_config_s trigger; custom spi_device_e 1 bits,U32, @OFFSET@, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" spi_device_e hip9011SpiDevice; - uint8_t[3] unusedSpiPadding1; + adc_channel_e high_fuel_pressure_sensor_1; + adc_channel_e high_fuel_pressure_sensor_2; + uint8_t[1] unusedSpiPadding1; float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, 0, 1000.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3856e534c9..2267d6856f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -72,7 +72,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 Sat May 25 13:42:47 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 pageSize = 20000 page = 1 @@ -197,7 +197,9 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding1 offset 541 + high_fuel_pressure_sensor_1 = bits, U08, 541, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + high_fuel_pressure_sensor_2 = bits, U08, 542, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unusedSpiPadding1 offset 543 globalFuelCorrection = scalar, F32, 544, "coef", 1, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1, 0.0, 0, 4.0, 3 ;no TS info - skipping maxKnockSubDeg offset 552 @@ -2472,6 +2474,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = allPins1_1 field = mc33816_cs, mc33816_cs field = mc33816_rstb, mc33816_rstb + field = high_fuel_pressure_sensor_1, high_fuel_pressure_sensor_1 + field = high_fuel_pressure_sensor_2, high_fuel_pressure_sensor_2 field = mc33816_driven, mc33816_driven field = mc33816spiDevice, mc33816spiDevice field = "Warning Led", warningLedPin diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index e5aec787e5..1ea89af209 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1540,6 +1540,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = allPins1_1 field = mc33816_cs, mc33816_cs field = mc33816_rstb, mc33816_rstb + field = high_fuel_pressure_sensor_1, high_fuel_pressure_sensor_1 + field = high_fuel_pressure_sensor_2, high_fuel_pressure_sensor_2 field = mc33816_driven, mc33816_driven field = mc33816spiDevice, mc33816spiDevice field = "Warning Led", warningLedPin diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index f09c192168..39ad80fb15 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:42:47 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -627,6 +627,8 @@ public class Fields { public static final int HD44780_rs_offset = 650; public static final int HD44780height_offset = 508; public static final int HD44780width_offset = 504; + public static final int high_fuel_pressure_sensor_1_offset = 541; + public static final int high_fuel_pressure_sensor_2_offset = 542; public static final int hip9011CsPin_offset = 753; public static final int hip9011CsPinMode_offset = 703; public static final int hip9011Gain_offset = 3976; @@ -1147,7 +1149,7 @@ public class Fields { public static final int unusedh_offset = 1469; public static final int unusedjoy_offset = 943; public static final int unusedMa2_offset = 711; - public static final int unusedSpiPadding1_offset = 541; + public static final int unusedSpiPadding1_offset = 543; public static final int unusedSpiPadding2_offset = 805; public static final int unusedSpiPadding2_offset_hex = 325; public static final int unusedSpiPadding3_offset = 2285; @@ -1347,6 +1349,9 @@ public class Fields { public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 532, FieldType.INT); public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 536, FieldType.INT); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 540, FieldType.INT8); + public static final Field HIGH_FUEL_PRESSURE_SENSOR_1 = Field.create("HIGH_FUEL_PRESSURE_SENSOR_1", 541, FieldType.INT8, adc_channel_e); + public static final Field HIGH_FUEL_PRESSURE_SENSOR_2 = Field.create("HIGH_FUEL_PRESSURE_SENSOR_2", 542, FieldType.INT8, adc_channel_e); + public static final Field UNUSEDSPIPADDING1 = Field.create("UNUSEDSPIPADDING1", 543, FieldType.INT8); public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 544, FieldType.FLOAT); public static final Field ADCVCC = Field.create("ADCVCC", 548, FieldType.FLOAT); public static final Field MAXKNOCKSUBDEG = Field.create("MAXKNOCKSUBDEG", 552, FieldType.FLOAT);