diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 7fb7ee78f4..02f04383a3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 01 17:34:40 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 02 15:54:19 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2797,7 +2797,15 @@ struct engine_configuration_s { /** * offset 2713 */ - uint8_t unusedSpiPadding5[3]; + adc_channel_e auxVoltage1; + /** + * offset 2714 + */ + adc_channel_e auxVoltage2; + /** + * offset 2715 + */ + uint8_t unusedSpiPadding5; /** * offset 2716 */ @@ -3416,4 +3424,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 01 17:34:40 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 02 15:54:19 EDT 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 79d09fd05c..816db1ee87 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -255,6 +255,10 @@ #define auxValves1_offset_hex 718 #define auxValves2_offset 1817 #define auxValves2_offset_hex 719 +#define auxVoltage1_offset 2713 +#define auxVoltage1_offset_hex a99 +#define auxVoltage2_offset 2714 +#define auxVoltage2_offset_hex a9a #define BARO_CORR_SIZE 4 #define baroCorrPressureBins_offset 1544 #define baroCorrPressureBins_offset_hex 608 @@ -955,7 +959,7 @@ #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" -#define GAUGE_NAME_AIR_FLOW "air flow" +#define GAUGE_NAME_AIR_FLOW "MAF air flow" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" #define GAUGE_NAME_DEBUG_F1 "debug f1" @@ -2342,8 +2346,8 @@ #define unusedSomethingWasHere_offset_hex 971 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 -#define unusedSpiPadding5_offset 2713 -#define unusedSpiPadding5_offset_hex a99 +#define unusedSpiPadding5_offset 2715 +#define unusedSpiPadding5_offset_hex a9b #define unusedSpiPadding7_offset 4005 #define unusedSpiPadding7_offset_hex fa5 #define unusedSpiPadding8_offset 4009 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 88bc7bb60d..f49a55e09f 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 gen_config.bat integration\rusefi_config.txt Fri May 01 17:30:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:53:36 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2797,7 +2797,15 @@ struct engine_configuration_s { /** * offset 2713 */ - uint8_t unusedSpiPadding5[3]; + adc_channel_e auxVoltage1; + /** + * offset 2714 + */ + adc_channel_e auxVoltage2; + /** + * offset 2715 + */ + uint8_t unusedSpiPadding5; /** * offset 2716 */ @@ -3416,4 +3424,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 01 17:30:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:53:36 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4567df124a..2e8c7f7a91 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -255,6 +255,10 @@ #define auxValves1_offset_hex 718 #define auxValves2_offset 1817 #define auxValves2_offset_hex 719 +#define auxVoltage1_offset 2713 +#define auxVoltage1_offset_hex a99 +#define auxVoltage2_offset 2714 +#define auxVoltage2_offset_hex a9a #define BARO_CORR_SIZE 4 #define baroCorrPressureBins_offset 1544 #define baroCorrPressureBins_offset_hex 608 @@ -955,7 +959,7 @@ #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" #define GAUGE_NAME_ACCEL_Z "Acceleration: Z" #define GAUGE_NAME_AFR "Air/Fuel Ratio" -#define GAUGE_NAME_AIR_FLOW "air flow" +#define GAUGE_NAME_AIR_FLOW "MAF air flow" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" #define GAUGE_NAME_DEBUG_F1 "debug f1" @@ -2342,8 +2346,8 @@ #define unusedSomethingWasHere_offset_hex 971 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding4_offset_hex a21 -#define unusedSpiPadding5_offset 2713 -#define unusedSpiPadding5_offset_hex a99 +#define unusedSpiPadding5_offset 2715 +#define unusedSpiPadding5_offset_hex a9b #define unusedSpiPadding7_offset 4005 #define unusedSpiPadding7_offset_hex fa5 #define unusedSpiPadding8_offset 4009 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 75a1f64295..f98009eb8d 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Fri May 01 20:43:33 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:53:36 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "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" + auxVoltage2 = bits, U08, 2714, [0:7] "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" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index bafaab5842..e17e69cd65 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Fri May 01 20:43:45 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:54:09 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "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" + auxVoltage2 = bits, U08, 2714, [0:7] "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" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index f8494b14ad..3d957e81ab 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -89,7 +89,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 kineris_gen_config.bat integration/rusefi_config.txt Fri May 01 17:34:40 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 02 15:54:19 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + auxVoltage2 = bits, U08, 2714, [0:7] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" @@ -2741,10 +2743,12 @@ cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" +cmd_disable_self_stim = "w\x00\x14\x00\x0F" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" +cmd_cj125_calibrate = "w\x00\x18\x00\x00" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" @@ -3567,6 +3571,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Engine->cj125 Settings dialog = cj125Function, "CJ125 Settings (wbo decoder)" field = "Enabled", isCJ125Enabled + commandButton = "Calibrate", cmd_cj125_calibrate field = "Using 4.9 sensor?", cj125isLsu49 field = "!ECU reboot needed to apply these settings" field = "ChipSelect pin", cj125CsPin, {isCJ125Enabled == 1} @@ -4136,6 +4141,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim + commandButton = "Disable Internal Trigger Simulation", cmd_disable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index c394e58b3b..8f8e76137f 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Fri May 01 20:43:42 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:54:04 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - 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" + auxVoltage2 = bits, U08, 2714, [0:7] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - 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" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 0c851bb539..60597eb669 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Fri May 01 20:43:48 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:54:11 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + auxVoltage2 = bits, U08, 2714, [0:7] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index f7cc252220..16852280b7 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -89,7 +89,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 gen_config.bat integration\rusefi_config.txt Fri May 01 20:43:49 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:54:15 EDT 2020 pageSize = 20000 page = 1 @@ -949,7 +949,9 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:7], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -;no TS info - skipping unusedSpiPadding5 offset 2713 + auxVoltage1 = bits, U08, 2713, [0:7] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Analog Volt 12","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE","INVALID","INVALID","INVALID" + auxVoltage2 = bits, U08, 2714, [0:7] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Analog Volt 12","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE","INVALID","INVALID","INVALID" +;no TS info - skipping unusedSpiPadding5 offset 2715 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 fsioCurve2Bins = array, F32, 2844, [16], "x", 1, 0, -999, 1000.0, 3 @@ -2349,7 +2351,7 @@ gaugeCategory = Sensors - Raw entry = vehicleSpeedKph, "Vehicle Speed", float, "%.2f" entry = speedToRpmRatio, "s2rpm", float, "%.3f" entry = rpmAcceleration, "dRPM", float, "%.3f" - entry = massAirFlowValue,"air flow", float, "%.3f" + entry = massAirFlowValue,"MAF air flow", float, "%.3f" entry = chargeAirMass, "air mass", float, "%.3f" entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" entry = totalTriggerErrorCounter, "trg err",int, "%d" 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 6d14357adb..ef0be668be 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 gen_config.bat integration\rusefi_config.txt Tue Apr 28 20:10:00 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 02 15:53:36 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -155,6 +155,8 @@ public class Fields { public static final int auxValves1_offset_hex = 718; public static final int auxValves2_offset = 1817; public static final int auxValves2_offset_hex = 719; + public static final int auxVoltage1_offset = 2713; + public static final int auxVoltage2_offset = 2714; public static final int BARO_CORR_SIZE = 4; public static final int baroCorrPressureBins_offset = 1544; public static final int baroCorrPressureBins_offset_hex = 608; @@ -621,7 +623,7 @@ public class Fields { public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z"; public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; - public static final String GAUGE_NAME_AIR_FLOW = "air flow"; + public static final String GAUGE_NAME_AIR_FLOW = "MAF air flow"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature"; public static final String GAUGE_NAME_DEBUG_F1 = "debug f1"; @@ -1553,7 +1555,7 @@ public class Fields { public static final int unusedSomethingWasHere_offset = 2417; public static final int unusedSomethingWasHere_offset_hex = 971; public static final int unusedSpiPadding4_offset = 2593; - public static final int unusedSpiPadding5_offset = 2713; + public static final int unusedSpiPadding5_offset = 2715; public static final int unusedSpiPadding7_offset = 4005; public static final int unusedSpiPadding8_offset = 4009; public static final int unusuedsw_offset = 4020; @@ -2460,6 +2462,9 @@ public class Fields { public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2704, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2708, FieldType.FLOAT); public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2712, FieldType.INT8); + public static final Field AUXVOLTAGE1 = Field.create("AUXVOLTAGE1", 2713, FieldType.INT8, adc_channel_e); + public static final Field AUXVOLTAGE2 = Field.create("AUXVOLTAGE2", 2714, FieldType.INT8, adc_channel_e); + public static final Field UNUSEDSPIPADDING5 = Field.create("UNUSEDSPIPADDING5", 2715, FieldType.INT8); public static final Field UNUSEDFLEXFUELSENSOR = Field.create("UNUSEDFLEXFUELSENSOR", 3100, FieldType.INT8); public static final Field TEST557PIN = Field.create("TEST557PIN", 3101, FieldType.INT8, brain_pin_e); public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 3102, FieldType.INT8, pin_output_mode_e); @@ -3413,6 +3418,9 @@ public class Fields { OILPRESSURE_V2, OILPRESSURE_VALUE2, ACCELEROMETERSPIDEVICE, + AUXVOLTAGE1, + AUXVOLTAGE2, + UNUSEDSPIPADDING5, UNUSEDFLEXFUELSENSOR, TEST557PIN, STEPPERDIRECTIONPINMODE,