diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 23f92ec5f3..4e557da49d 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1424,7 +1424,12 @@ void validateConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { for (int i = 0;i < CLT_CURVE_SIZE;i++) { engineConfiguration->cltIdleRpmBins[i] = fixNegativeZero(engineConfiguration->cltIdleRpmBins[i]); } - + // having zeros in unsued fields is important for REO CRC match + engineConfiguration->unusedAt516 = 0; + engineConfiguration->unusedAt712 = 0; + engineConfiguration->unusedAt716 = 0; + engineConfiguration->unusedAt720 = 0; + engineConfiguration->unusedAt724 = 0; } void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_SUFFIX) { diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 3b07eca7fe..d0d82b6689 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 Sun Jun 14 17:00:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1005,7 +1005,7 @@ struct engine_configuration_s { /** * offset 516 */ - int unusedValueHere; + int unusedAt516; /** * offset 520 */ @@ -1320,7 +1320,19 @@ struct engine_configuration_s { /** * offset 712 */ - int unusedAt712[4]; + int unusedAt712; + /** + * offset 716 + */ + int unusedAt716; + /** + * offset 720 + */ + int unusedAt720; + /** + * offset 724 + */ + int unusedAt724; /** * Secondary TTL channel baud rate * offset 728 @@ -1708,6 +1720,7 @@ struct engine_configuration_s { offset 976 bit 1 */ bool todoClutchDownPinInverted : 1; /** + * If enabled we use two H-bridges to drive stepper idle air valve offset 976 bit 2 */ bool useHbridges : 1; /** @@ -1794,10 +1807,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_280_30 : 1; + bool unusedBit_283_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_280_31 : 1; + bool unusedBit_283_31 : 1; /** * offset 980 */ @@ -3508,4 +3521,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 Sun Jun 14 17:00:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 66d134600c..8281735c94 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1333,7 +1333,11 @@ #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 #define unused_former_warmup_target_afr_offset 2112 +#define unusedAt516_offset 516 #define unusedAt712_offset 712 +#define unusedAt716_offset 716 +#define unusedAt720_offset 720 +#define unusedAt724_offset 724 #define unusedAtOldBoardConfigurationEnd_offset 1200 #define unusedBit4_1476_offset 1476 #define unusedBit_251_11_offset 976 @@ -1355,8 +1359,8 @@ #define unusedBit_251_27_offset 976 #define unusedBit_251_28_offset 976 #define unusedBit_251_29_offset 976 -#define unusedBit_280_30_offset 976 -#define unusedBit_280_31_offset 976 +#define unusedBit_283_30_offset 976 +#define unusedBit_283_31_offset 976 #define unusedBit_34_31_offset 76 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 761 @@ -1367,7 +1371,6 @@ #define unusedSpiPadding5_offset 2715 #define unusedSpiPadding7_offset 4005 #define unusedSpiPadding8_offset 4009 -#define unusedValueHere_offset 516 #define unusuedsw_offset 4020 #define unusuedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 776245ebbe..2b71a41421 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -520,7 +520,7 @@ adc_channel_e vbattAdcChannel;+This is the processor input pin that the battery adc_channel_e fuelLevelSensor;+This is the processor pin that your fuel level sensor in connected to. This is a non standard input so will need to be user defined. adc_channel_e tps2_1AdcChannel;Second throttle body position sensor, single channel so far\nset_analog_input_pin tps2 X - int unusedValueHere; + int unusedAt516; int sensorChartFrequency;;"index", 1, 0, 0, 300, 0 ; size 4 struct trigger_config_s @brief Trigger wheel(s) configuration @@ -670,7 +670,10 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas pin_input_mode_e throttlePedalUpPinMode; uint8_t unused711; - int[4] unusedAt712; + int unusedAt712; + int unusedAt716; + int unusedAt720; + int unusedAt724; uint32_t tunerStudioSerialSpeed;Secondary TTL channel baud rate;"BPs", 1, 0, 0,1000000, 0 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 beeb5d93dd..2cb2313c05 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.sh integration/rusefi_config.txt Wed Jun 17 16:44:43 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jun 19 00:15:35 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1295,7 +1295,11 @@ public class Fields { public static final int unused_1484_bit_30_offset = 1476; public static final int unused_1484_bit_31_offset = 1476; public static final int unused_former_warmup_target_afr_offset = 2112; + public static final int unusedAt516_offset = 516; public static final int unusedAt712_offset = 712; + public static final int unusedAt716_offset = 716; + public static final int unusedAt720_offset = 720; + public static final int unusedAt724_offset = 724; public static final int unusedAtOldBoardConfigurationEnd_offset = 1200; public static final int unusedBit4_1476_offset = 1476; public static final int unusedBit_251_11_offset = 976; @@ -1317,8 +1321,8 @@ public class Fields { public static final int unusedBit_251_27_offset = 976; public static final int unusedBit_251_28_offset = 976; public static final int unusedBit_251_29_offset = 976; - public static final int unusedBit_280_30_offset = 976; - public static final int unusedBit_280_31_offset = 976; + public static final int unusedBit_283_30_offset = 976; + public static final int unusedBit_283_31_offset = 976; public static final int unusedBit_34_31_offset = 76; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHere_offset = 761; @@ -1329,7 +1333,6 @@ public class Fields { 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 unusedValueHere_offset = 516; public static final int unusuedsw_offset = 4020; public static final int unusuedvref_offset = 4016; public static final int useAdvanceCorrectionsForCranking_offset = 1476; @@ -1494,7 +1497,7 @@ public class Fields { public static final Field VBATTADCCHANNEL = Field.create("VBATTADCCHANNEL", 513, FieldType.INT8, adc_channel_e); public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 514, FieldType.INT8, adc_channel_e); public static final Field TPS2_1ADCCHANNEL = Field.create("TPS2_1ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); - public static final Field UNUSEDVALUEHERE = Field.create("UNUSEDVALUEHERE", 516, FieldType.INT); + public static final Field UNUSEDAT516 = Field.create("UNUSEDAT516", 516, FieldType.INT); public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT); public static final String[] trigger_type_e = {"custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "trg50", "INVALID"}; public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 524, FieldType.INT, trigger_type_e); @@ -1647,6 +1650,10 @@ public class Fields { public static final Field CANRXPIN = Field.create("CANRXPIN", 709, FieldType.INT8, brain_pin_e); public static final Field THROTTLEPEDALUPPINMODE = Field.create("THROTTLEPEDALUPPINMODE", 710, FieldType.INT8); public static final Field UNUSED711 = Field.create("UNUSED711", 711, FieldType.INT8); + public static final Field UNUSEDAT712 = Field.create("UNUSEDAT712", 712, FieldType.INT); + public static final Field UNUSEDAT716 = Field.create("UNUSEDAT716", 716, FieldType.INT); + public static final Field UNUSEDAT720 = Field.create("UNUSEDAT720", 720, FieldType.INT); + public static final Field UNUSEDAT724 = Field.create("UNUSEDAT724", 724, FieldType.INT); public static final Field TUNERSTUDIOSERIALSPEED = Field.create("TUNERSTUDIOSERIALSPEED", 728, FieldType.INT); public static final Field COMPRESSIONRATIO = Field.create("COMPRESSIONRATIO", 732, FieldType.FLOAT); public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 736, FieldType.INT8, brain_pin_e); @@ -1862,8 +1869,8 @@ public class Fields { public static final Field UNUSEDBIT_251_27 = Field.create("UNUSEDBIT_251_27", 976, FieldType.BIT, 27); public static final Field UNUSEDBIT_251_28 = Field.create("UNUSEDBIT_251_28", 976, FieldType.BIT, 28); public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29); - public static final Field UNUSEDBIT_280_30 = Field.create("UNUSEDBIT_280_30", 976, FieldType.BIT, 30); - public static final Field UNUSEDBIT_280_31 = Field.create("UNUSEDBIT_280_31", 976, FieldType.BIT, 31); + public static final Field UNUSEDBIT_283_30 = Field.create("UNUSEDBIT_283_30", 976, FieldType.BIT, 30); + public static final Field UNUSEDBIT_283_31 = Field.create("UNUSEDBIT_283_31", 976, FieldType.BIT, 31); public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 980, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_DIRECTIONPIN2 = Field.create("ETBIO1_DIRECTIONPIN2", 981, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_CONTROLPIN1 = Field.create("ETBIO1_CONTROLPIN1", 982, FieldType.INT8, brain_pin_e); @@ -2485,7 +2492,7 @@ public class Fields { VBATTADCCHANNEL, FUELLEVELSENSOR, TPS2_1ADCCHANNEL, - UNUSEDVALUEHERE, + UNUSEDAT516, SENSORCHARTFREQUENCY, TRIGGER_TYPE, TRIGGER_TODOREMOVEMEONEDAY0, @@ -2631,6 +2638,10 @@ public class Fields { CANRXPIN, THROTTLEPEDALUPPINMODE, UNUSED711, + UNUSEDAT712, + UNUSEDAT716, + UNUSEDAT720, + UNUSEDAT724, TUNERSTUDIOSERIALSPEED, COMPRESSIONRATIO, TRIGGERSIMULATORPINS1, @@ -2844,8 +2855,8 @@ public class Fields { UNUSEDBIT_251_27, UNUSEDBIT_251_28, UNUSEDBIT_251_29, - UNUSEDBIT_280_30, - UNUSEDBIT_280_31, + UNUSEDBIT_283_30, + UNUSEDBIT_283_31, ETBIO1_DIRECTIONPIN1, ETBIO1_DIRECTIONPIN2, ETBIO1_CONTROLPIN1,