Merge remote-tracking branch 'origin/master' into master

firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h

@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Feb 09 04:49:37 UTC 2021
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Feb 09 05:26:35 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1057,6 +1057,10 @@ struct engine_configuration_s {
 	 * offset 556
 	 */
 	brain_input_pin_e camInputs[CAM_INPUTS_COUNT];
+	/**
+	 * offset 560
+	 */
+	uint8_t camInputsPadding[CAM_INPUTS_COUNT_padding];
 	/**
 	 * offset 560
 	 */
@@ -1857,10 +1861,10 @@ struct engine_configuration_s {
 	bool unusedBit_251_29 : 1;
 	/**
 	offset 976 bit 30 */
-	bool unusedBit_288_30 : 1;
+	bool unusedBit_289_30 : 1;
 	/**
 	offset 976 bit 31 */
-	bool unusedBit_288_31 : 1;
+	bool unusedBit_289_31 : 1;
 	/**
 	 * offset 980
 	 */
@@ -2700,76 +2704,76 @@ struct engine_configuration_s {
 	bool unused1130 : 1;
 	/**
 	offset 2116 bit 8 */
-	bool unusedBit_489_8 : 1;
+	bool unusedBit_490_8 : 1;
 	/**
 	offset 2116 bit 9 */
-	bool unusedBit_489_9 : 1;
+	bool unusedBit_490_9 : 1;
 	/**
 	offset 2116 bit 10 */
-	bool unusedBit_489_10 : 1;
+	bool unusedBit_490_10 : 1;
 	/**
 	offset 2116 bit 11 */
-	bool unusedBit_489_11 : 1;
+	bool unusedBit_490_11 : 1;
 	/**
 	offset 2116 bit 12 */
-	bool unusedBit_489_12 : 1;
+	bool unusedBit_490_12 : 1;
 	/**
 	offset 2116 bit 13 */
-	bool unusedBit_489_13 : 1;
+	bool unusedBit_490_13 : 1;
 	/**
 	offset 2116 bit 14 */
-	bool unusedBit_489_14 : 1;
+	bool unusedBit_490_14 : 1;
 	/**
 	offset 2116 bit 15 */
-	bool unusedBit_489_15 : 1;
+	bool unusedBit_490_15 : 1;
 	/**
 	offset 2116 bit 16 */
-	bool unusedBit_489_16 : 1;
+	bool unusedBit_490_16 : 1;
 	/**
 	offset 2116 bit 17 */
-	bool unusedBit_489_17 : 1;
+	bool unusedBit_490_17 : 1;
 	/**
 	offset 2116 bit 18 */
-	bool unusedBit_489_18 : 1;
+	bool unusedBit_490_18 : 1;
 	/**
 	offset 2116 bit 19 */
-	bool unusedBit_489_19 : 1;
+	bool unusedBit_490_19 : 1;
 	/**
 	offset 2116 bit 20 */
-	bool unusedBit_489_20 : 1;
+	bool unusedBit_490_20 : 1;
 	/**
 	offset 2116 bit 21 */
-	bool unusedBit_489_21 : 1;
+	bool unusedBit_490_21 : 1;
 	/**
 	offset 2116 bit 22 */
-	bool unusedBit_489_22 : 1;
+	bool unusedBit_490_22 : 1;
 	/**
 	offset 2116 bit 23 */
-	bool unusedBit_489_23 : 1;
+	bool unusedBit_490_23 : 1;
 	/**
 	offset 2116 bit 24 */
-	bool unusedBit_489_24 : 1;
+	bool unusedBit_490_24 : 1;
 	/**
 	offset 2116 bit 25 */
-	bool unusedBit_489_25 : 1;
+	bool unusedBit_490_25 : 1;
 	/**
 	offset 2116 bit 26 */
-	bool unusedBit_489_26 : 1;
+	bool unusedBit_490_26 : 1;
 	/**
 	offset 2116 bit 27 */
-	bool unusedBit_489_27 : 1;
+	bool unusedBit_490_27 : 1;
 	/**
 	offset 2116 bit 28 */
-	bool unusedBit_489_28 : 1;
+	bool unusedBit_490_28 : 1;
 	/**
 	offset 2116 bit 29 */
-	bool unusedBit_489_29 : 1;
+	bool unusedBit_490_29 : 1;
 	/**
 	offset 2116 bit 30 */
-	bool unusedBit_489_30 : 1;
+	bool unusedBit_490_30 : 1;
 	/**
 	offset 2116 bit 31 */
-	bool unusedBit_489_31 : 1;
+	bool unusedBit_490_31 : 1;
 	/**
 	 * set can_mode X
 	 * offset 2120
@@ -2919,6 +2923,10 @@ struct engine_configuration_s {
 	 * offset 2328
 	 */
 	vvt_mode_e vvtMode[CAMS_PER_BANK];
+	/**
+	 * offset 2330
+	 */
+	uint8_t vvtModePadding[CAMS_PER_BANK_padding];
 	/**
 	 * offset 2330
 	 */
@@ -3807,4 +3815,4 @@ struct persistent_config_s {
 typedef struct persistent_config_s persistent_config_s;
 
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Feb 09 04:49:37 UTC 2021
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Feb 09 05:26:35 UTC 2021

firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h

@@ -182,11 +182,14 @@
 #define brakePedalPinMode_offset 2611
 #define byFirmwareVersion_offset 500
 #define CAM_INPUTS_COUNT 4
+#define CAM_INPUTS_COUNT_padding 0
 #define camInputs1_offset 556
 #define camInputs2_offset 557
 #define camInputs3_offset 558
 #define camInputs4_offset 559
+#define camInputsPadding_offset 560
 #define CAMS_PER_BANK 2
+#define CAMS_PER_BANK_padding 0
 #define can2BaudRate_offset 2110
 #define can2NbcType_offset 2120
 #define can2ReadEnabled_offset 2116
@@ -1260,7 +1263,7 @@
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD hellen_cypress
 #define SIGNATURE_DATE 2021.02.09
-#define SIGNATURE_HASH 590976367
+#define SIGNATURE_HASH 3626257989
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1594,7 +1597,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2021.02.09.hellen_cypress.590976367"
+#define TS_SIGNATURE "rusEFI 2021.02.09.hellen_cypress.3626257989"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't' // 0x74
@@ -1685,33 +1688,33 @@
 #define unusedAuxVoltage2_TODO_332_offset 2714
 #define unusedBit4_1476_offset 1476
 #define unusedBit_251_29_offset 976
-#define unusedBit_288_30_offset 976
-#define unusedBit_288_31_offset 976
+#define unusedBit_289_30_offset 976
+#define unusedBit_289_31_offset 976
 #define unusedBit_34_31_offset 76
-#define unusedBit_489_10_offset 2116
-#define unusedBit_489_11_offset 2116
-#define unusedBit_489_12_offset 2116
-#define unusedBit_489_13_offset 2116
-#define unusedBit_489_14_offset 2116
-#define unusedBit_489_15_offset 2116
-#define unusedBit_489_16_offset 2116
-#define unusedBit_489_17_offset 2116
-#define unusedBit_489_18_offset 2116
-#define unusedBit_489_19_offset 2116
-#define unusedBit_489_20_offset 2116
-#define unusedBit_489_21_offset 2116
-#define unusedBit_489_22_offset 2116
-#define unusedBit_489_23_offset 2116
-#define unusedBit_489_24_offset 2116
-#define unusedBit_489_25_offset 2116
-#define unusedBit_489_26_offset 2116
-#define unusedBit_489_27_offset 2116
-#define unusedBit_489_28_offset 2116
-#define unusedBit_489_29_offset 2116
-#define unusedBit_489_30_offset 2116
-#define unusedBit_489_31_offset 2116
-#define unusedBit_489_8_offset 2116
-#define unusedBit_489_9_offset 2116
+#define unusedBit_490_10_offset 2116
+#define unusedBit_490_11_offset 2116
+#define unusedBit_490_12_offset 2116
+#define unusedBit_490_13_offset 2116
+#define unusedBit_490_14_offset 2116
+#define unusedBit_490_15_offset 2116
+#define unusedBit_490_16_offset 2116
+#define unusedBit_490_17_offset 2116
+#define unusedBit_490_18_offset 2116
+#define unusedBit_490_19_offset 2116
+#define unusedBit_490_20_offset 2116
+#define unusedBit_490_21_offset 2116
+#define unusedBit_490_22_offset 2116
+#define unusedBit_490_23_offset 2116
+#define unusedBit_490_24_offset 2116
+#define unusedBit_490_25_offset 2116
+#define unusedBit_490_26_offset 2116
+#define unusedBit_490_27_offset 2116
+#define unusedBit_490_28_offset 2116
+#define unusedBit_490_29_offset 2116
+#define unusedBit_490_30_offset 2116
+#define unusedBit_490_31_offset 2116
+#define unusedBit_490_8_offset 2116
+#define unusedBit_490_9_offset 2116
 #define unusedHereWeHave_offset 1464
 #define unusedOldBiquad_offset 2330
 #define unusedSpiPadding4_offset 2593
@@ -1781,6 +1784,7 @@
 #define vvtCamSensorUseRise_offset 744
 #define vvtMode1_offset 2328
 #define vvtMode2_offset 2329
+#define vvtModePadding_offset 2330
 #define vvtOffset_offset 2052
 #define warning_message_offset 6000
 #define warningLedPin_offset 2041

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 kinetis_gen_config.bat integration/rusefi_config.txt Tue Feb 09 04:49:35 UTC 2021
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Feb 09 05:26:34 UTC 2021
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -1060,43 +1060,42 @@ struct engine_configuration_s {
 	/**
 	 * offset 557
 	 */
+	uint8_t camInputsPadding[CAM_INPUTS_COUNT_padding];
+	/**
+	 * offset 560
+	 */
 	afr_sensor_s afr;
 	/**
 	 * Electronic throttle pedal position first channel
 	 * See throttlePedalPositionSecondAdcChannel for second channel
 	 * See also tps1_1AdcChannel
 	 * set_analog_input_pin pps X
 	 * See throttlePedalUpVoltage and throttlePedalWOTVoltage
-	 * offset 577
+	 * offset 580
 	 */
 	adc_channel_e throttlePedalPositionAdcChannel;
 	/**
-	 * offset 578
+	 * offset 581
 	 */
 	brain_pin_e tle6240_cs;
 	/**
-	 * offset 579
+	 * offset 582
 	 */
 	pin_output_mode_e tle6240_csPinMode;
 	/**
 	 * Throttle Pedal not pressed switch - used on some older vehicles like early Mazda Miata
-	 * offset 580
+	 * offset 583
 	 */
 	switch_input_pin_e throttlePedalUpPin;
 	/**
 	 * @see hasBaroSensor
-	 * offset 581
+	 * offset 584
 	 */
 	air_pressure_sensor_config_s baroSensor;
 	/**
-	 * offset 597
+	 * offset 600
 	 */
 	idle_hardware_s idle;
-	/**
-	 * need 4 byte alignment
-	 * offset 605
-	 */
-	uint8_t alignmentFill_at_605[3];
 	/**
 	 * value between 0 and 100 used in Manual mode
 	 * offset 608
@@ -2927,12 +2926,11 @@ struct engine_configuration_s {
 	/**
 	 * offset 2329
 	 */
-	uint8_t unusedOldBiquad[22];
+	uint8_t vvtModePadding[CAMS_PER_BANK_padding];
 	/**
-	 * need 4 byte alignment
-	 * offset 2351
+	 * offset 2330
 	 */
-	uint8_t alignmentFill_at_2351[1];
+	uint8_t unusedOldBiquad[22];
 	/**
 	 * CLT-based timing correction
 	 * offset 2352
@@ -3817,4 +3815,4 @@ struct persistent_config_s {
 typedef struct persistent_config_s persistent_config_s;
 
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Feb 09 04:49:35 UTC 2021
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Feb 09 05:26:34 UTC 2021