From 9d05182ae1dd219e97dba61c6713250798da8839 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 6 May 2020 14:00:08 -0400 Subject: [PATCH] magic is around the corner --- firmware/controllers/algo/rusefi_types.h | 2 +- firmware/integration/rusefi_config.txt | 9 +++++---- firmware/tunerstudio/rusefi.input | 3 ++- .../com/rusefi/config/generated/Fields.java | 20 +++++++++++-------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index a8ea33d9da..81502aa0a4 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -83,7 +83,7 @@ typedef void (*Void)(void); typedef char error_message_t[ERROR_BUFFER_SIZE]; -typedef char vehicle_name_t[VEHICLE_NAME_SIZE]; +typedef char vehicle_info_t[VEHICLE_INFO_SIZE]; typedef char le_formula_t[LE_COMMAND_LENGTH]; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e65e556398..ed25396de1 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -115,7 +115,7 @@ struct_no_prefix engine_configuration_s #define FSIO_COMMAND_COUNT 16 #define AUX_PID_COUNT 4 -#define VEHICLE_NAME_SIZE 32 +#define VEHICLE_INFO_SIZE 32 #define FUEL_RPM_COUNT 16 #define FUEL_LOAD_COUNT 16 @@ -794,7 +794,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@ ! same length used for critical and soft error messages #define ERROR_BUFFER_SIZE 120 - custom vehicle_name_t @@VEHICLE_NAME_SIZE@@ string, ASCII, @OFFSET@, @@VEHICLE_NAME_SIZE@@ + custom vehicle_info_t @@VEHICLE_INFO_SIZE@@ string, ASCII, @OFFSET@, @@VEHICLE_INFO_SIZE@@ custom error_message_t @@ERROR_BUFFER_SIZE@@ string, ASCII, @OFFSET@, @@ERROR_BUFFER_SIZE@@ custom le_formula_t @@LE_COMMAND_LENGTH@@ string, ASCII, @OFFSET@, @@LE_COMMAND_LENGTH@@ @@ -873,9 +873,10 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@ etb_io[ETB_COUNT iterate] etbIo2 - vehicle_name_t vehicleName; + vehicle_info_t engineMake; + vehicle_info_t engineCode; - int[84] unusedAtOldBoardConfigurationEnd; + int[76] unusedAtOldBoardConfigurationEnd; bit vvtDisplayInverted bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling. diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index b05aa28f21..2d9fa5f5c4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1621,7 +1621,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = baseEngineConfig, "Engine Configuration" ; field = "Engine Preset", engineType - field = "Vehicle Name", vehicleName + field = "Engine Make", engineMake + field = "Engine Code", engineCode field = "Number of Cylinders", cylindersCount field = "Engine Displacement", displacement field = "Firing Order", firingOrder 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 b3b1391ad3..6945ba9399 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 Wed May 06 08:44:47 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 12:32:31 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -360,6 +360,8 @@ public class Fields { public static final int enableVerboseCanTx_offset = 744; public static final int ENGINE_NOISE_CURVE_SIZE = 8; public static final int engineChartSize_offset = 1480; + public static final int engineCode_offset = 1128; + public static final int engineCode_offset_hex = 468; public static final int engineConfiguration_offset = 0; public static final int engineConfiguration_offset_hex = 0; public static final int engineLoadAccelEnrichmentMultiplier_offset = 2072; @@ -371,6 +373,8 @@ public class Fields { public static final int engineLoadDecelEnleanmentMultiplier_offset = 2064; public static final int engineLoadDecelEnleanmentMultiplier_offset_hex = 810; public static final int engineLoadDecelEnleanmentThreshold_offset = 2060; + public static final int engineMake_offset = 1096; + public static final int engineMake_offset_hex = 448; public static final int engineSnifferRpmThreshold_offset = 4; public static final int engineSnifferRpmThreshold_offset_hex = 4; public static final int engineType_offset = 0; @@ -1541,8 +1545,8 @@ public class Fields { public static final int unused_former_warmup_target_afr_offset_hex = 834; public static final int unusedAntilagTimeout_offset = 820; public static final int unusedAntilagTimeout_offset_hex = 334; - public static final int unusedAtOldBoardConfigurationEnd_offset = 1128; - public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 468; + public static final int unusedAtOldBoardConfigurationEnd_offset = 1160; + public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 488; public static final int unusedBit4_1476_offset = 1476; public static final int unusedBit_251_10_offset = 976; public static final int unusedBit_251_11_offset = 976; @@ -1620,9 +1624,7 @@ public class Fields { public static final int vbattAdcChannel_offset = 513; public static final int vbattAdcChannel_offset_hex = 201; public static final int vbattDividerCoeff_offset = 464; - public static final int VEHICLE_NAME_SIZE = 32; - public static final int vehicleName_offset = 1096; - public static final int vehicleName_offset_hex = 448; + public static final int VEHICLE_INFO_SIZE = 32; public static final int vehicleSpeedCoef_offset = 476; public static final int vehicleSpeedSensorInputPin_offset = 968; public static final int veLoadBins_offset = 18464; @@ -2187,7 +2189,8 @@ public class Fields { public static final Field ETBIO22_DIRECTIONPIN2 = Field.create("ETBIO22_DIRECTIONPIN2", 1093, FieldType.INT8, brain_pin_e); public static final Field ETBIO22_CONTROLPIN1 = Field.create("ETBIO22_CONTROLPIN1", 1094, FieldType.INT8, brain_pin_e); public static final Field ETBIO22_DISABLEPIN = Field.create("ETBIO22_DISABLEPIN", 1095, FieldType.INT8, brain_pin_e); - public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1096, FieldType.INT); + public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.INT); + public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.INT); public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); @@ -3156,7 +3159,8 @@ public class Fields { ETBIO22_DIRECTIONPIN2, ETBIO22_CONTROLPIN1, ETBIO22_DISABLEPIN, - VEHICLENAME, + ENGINEMAKE, + ENGINECODE, VVTDISPLAYINVERTED, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC,