diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 2242a8a131..96ef2b4fda 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 Mon Jan 22 23:24:40 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 24 08:58:08 EST 2018 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -634,8 +634,9 @@ typedef struct { offset 376 bit 17 */ bool vvtCamSensorUseRise : 1; /** + * Useful for individual intakes offset 376 bit 18 */ - bool unused_board_984_18 : 1; + bool measureMapOnlyInOneCylinder : 1; /** offset 376 bit 19 */ bool unused_board_984_19 : 1; @@ -2325,4 +2326,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 22 23:24:40 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 24 08:58:08 EST 2018 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 252b3cb67c..90d1545d2c 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -578,8 +578,8 @@ #define isCJ125Enabled_offset_hex 3d8 #define vvtCamSensorUseRise_offset 984 #define vvtCamSensorUseRise_offset_hex 3d8 -#define unused_board_984_18_offset 984 -#define unused_board_984_18_offset_hex 3d8 +#define measureMapOnlyInOneCylinder_offset 984 +#define measureMapOnlyInOneCylinder_offset_hex 3d8 #define unused_board_984_19_offset 984 #define unused_board_984_19_offset_hex 3d8 #define unused_board_984_20_offset 984 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5d3bb48c81..f8027584d0 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -186,9 +186,9 @@ end_struct struct MAP_sensor_config_s @brief MAP averaging configuration float[MAP_ANGLE_SIZE] samplingAngleBins;;"", 1, 0, 0.0, 18000, 2 -float[MAP_ANGLE_SIZE] samplingAngle;@brief MAP averaging sampling start angle, by RPM;"deg", 1, 0, -180, 180, 2 +float[MAP_ANGLE_SIZE] samplingAngle;@brief MAP averaging sampling start angle, by RPM;"deg", 1, 0, -720, 720, 2 float[MAP_WINDOW_SIZE] samplingWindowBins;;"", 1, 0, 0.0, 18000, 2 -float[MAP_WINDOW_SIZE] samplingWindow;@brief MAP averaging angle duration, by RPM;"deg", 1, 0, 0, 180, 2 +float[MAP_WINDOW_SIZE] samplingWindow;@brief MAP averaging angle duration, by RPM;"deg", 1, 0, -720, 720, 2 air_pressure_sensor_config_s sensor end_struct @@ -542,7 +542,7 @@ bit is_enabled_spi_2 bit onOffAlternatorLogic; bit isCJ125Enabled bit vvtCamSensorUseRise;+Use rise or fall signal front - bit unused_board_984_18 + bit measureMapOnlyInOneCylinder;+Useful for individual intakes bit unused_board_984_19 bit unused_board_984_20 bit unused_board_984_21 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 183bc34c53..0b4862e19d 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,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 Mon Jan 22 23:24:40 EST 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 24 08:58:08 EST 2018 pageSize = 20000 page = 1 @@ -112,9 +112,9 @@ page = 1 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1, 0, 0, 200, 1 crankingChargeAngle = scalar, F32, 104, "deg", 1, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1, 0, 0.0, 18000, 2 - map_samplingAngle = array, F32, 140, [8], "deg", 1, 0, -180, 180, 2 + map_samplingAngle = array, F32, 140, [8], "deg", 1, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1, 0, 0.0, 18000, 2 - map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, 0, 180, 2 + map_samplingWindow = array, F32, 204, [8], "deg", 1, 0, -720, 720, 2 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 map_sensor_type = bits, U32, 244, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "INVALID" @@ -308,7 +308,7 @@ page = 1 onOffAlternatorLogic = bits, U32, 984, [15:15], "false", "true" isCJ125Enabled = bits, U32, 984, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 984, [17:17], "false", "true" - unused_board_984_18 = bits, U32, 984, [18:18], "false", "true" + measureMapOnlyInOneCylinder= bits, U32, 984, [18:18], "false", "true" unused_board_984_19 = bits, U32, 984, [19:19], "false", "true" unused_board_984_20 = bits, U32, 984, [20:20], "false", "true" unused_board_984_21 = bits, U32, 984, [21:21], "false", "true" @@ -864,6 +864,7 @@ page = 1 trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin." vvtCamSensorUseRise = "Use rise or fall signal front" + measureMapOnlyInOneCylinder = "Useful for individual intakes" sensorChartMode = "rusEfi console Sensor Sniffer mode" isInjectionEnabled = "enable injection" isIgnitionEnabled = "enable ignition" @@ -2259,6 +2260,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} field = "Use minimal value of", mapMinBufferLength + field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder dialog = mapSensorFDlg, "Frequency Sensor Settings", xAxis field = "pin", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 7f65092cce..c5624ad682 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1442,6 +1442,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} field = "Use minimal value of", mapMinBufferLength + field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder dialog = mapSensorFDlg, "Frequency Sensor Settings", xAxis field = "pin", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 9fba814da2..d2f465690b 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 Mon Jan 22 23:24:40 EST 2018 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jan 24 08:54:20 EST 2018 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -398,7 +398,7 @@ public class Fields { public static final int onOffAlternatorLogic_offset = 984; public static final int isCJ125Enabled_offset = 984; public static final int vvtCamSensorUseRise_offset = 984; - public static final int unused_board_984_18_offset = 984; + public static final int measureMapOnlyInOneCylinder_offset = 984; public static final int unused_board_984_19_offset = 984; public static final int unused_board_984_20_offset = 984; public static final int unused_board_984_21_offset = 984; @@ -1391,7 +1391,7 @@ public class Fields { public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 984, FieldType.BIT, 15); public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 984, FieldType.BIT, 16); public static final Field VVTCAMSENSORUSERISE = Field.create("VVTCAMSENSORUSERISE", 984, FieldType.BIT, 17); - public static final Field UNUSED_BOARD_984_18 = Field.create("UNUSED_BOARD_984_18", 984, FieldType.BIT, 18); + public static final Field MEASUREMAPONLYINONECYLINDER = Field.create("MEASUREMAPONLYINONECYLINDER", 984, FieldType.BIT, 18); public static final Field UNUSED_BOARD_984_19 = Field.create("UNUSED_BOARD_984_19", 984, FieldType.BIT, 19); public static final Field UNUSED_BOARD_984_20 = Field.create("UNUSED_BOARD_984_20", 984, FieldType.BIT, 20); public static final Field UNUSED_BOARD_984_21 = Field.create("UNUSED_BOARD_984_21", 984, FieldType.BIT, 21);