Skip to content

Commit

Permalink
#549
Browse files Browse the repository at this point in the history
  • Loading branch information
rusefi committed Jan 24, 2018
1 parent 57a1d77 commit acd934d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
7 changes: 4 additions & 3 deletions firmware/controllers/algo/engine_configuration_generated_structures.h
View file
@@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt 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_
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions firmware/controllers/algo/rusefi_generated.h
View file
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions firmware/integration/rusefi_config.txt
View file
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions firmware/tunerstudio/rusefi.ini
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions firmware/tunerstudio/rusefi.input
View file
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions java_console/models/src/com/rusefi/config/Fields.java
View file
@@ -1,6 +1,6 @@
package com.rusefi.config;

// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt 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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit acd934d

Please sign in to comment.