From e39f77aa9e226e22588872e52e1f025df02e50ec Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 14 Apr 2019 18:12:15 -0400
Subject: [PATCH] SPI progress

---
 .../controllers/algo/auto_generated_enums.cpp |  6 +--
 ...ngine_configuration_generated_structures.h | 48 +++++++++++++++++--
 firmware/controllers/algo/rusefi_enums.h      |  9 +---
 firmware/controllers/algo/rusefi_generated.h  | 28 +++++++++--
 firmware/flash_erase407.bat                   |  2 +-
 firmware/integration/rusefi_config.txt        | 20 ++++++--
 firmware/tunerstudio/rusefi.ini               | 34 ++++++++-----
 .../models/src/com/rusefi/config/Fields.java  | 40 ++++++++++------
 8 files changed, 136 insertions(+), 51 deletions(-)

diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index 4274e811ee..5535c54672 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -1,6 +1,6 @@
 // auto-generated from.\controllers/algo/rusefi_enums.h
 // by enum2string.jar tool
-// on Sat Apr 13 10:34:52 EDT 2019
+// on Sun Apr 14 11:21:22 EDT 2019
 // see also gen_config_and_enums.bat
 
 
@@ -451,8 +451,6 @@ case Force_4_bytes_size_cranking_ignition_mode:
 }
 const char *getUart_device_e(uart_device_e value){
 switch(value) {
-case Force_4_bytes_size_uart_device:
-  return "Force_4_bytes_size_uart_device";
 case UART_DEVICE_1:
   return "UART_DEVICE_1";
 case UART_DEVICE_2:
@@ -481,8 +479,6 @@ case _5MHz:
 }
 const char *getSpi_device_e(spi_device_e value){
 switch(value) {
-case Force_4_bytes_size_spi_device:
-  return "Force_4_bytes_size_spi_device";
 case SPI_DEVICE_1:
   return "SPI_DEVICE_1";
 case SPI_DEVICE_2:
diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index 8495a8402b..989844c71b 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 Sat Apr 13 10:44:04 EDT 2019
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 14 11:23:20 EDT 2019
 // begin
 #ifndef ENGINE_CONFIGURATION_GENERATED_H_
 #define ENGINE_CONFIGURATION_GENERATED_H_
@@ -549,6 +549,10 @@ typedef struct {
 	 * offset 76
 	 */
 	spi_device_e digitalPotentiometerSpiDevice;
+	/**
+	 * offset 77
+	 */
+	uint8_t unusedSpiPadding9[3];
 	/**
 	 * offset 80
 	 */
@@ -736,7 +740,7 @@ typedef struct {
 	bool useTPSBasedVeTable : 1;
 	/**
 	offset 144 bit 26 */
-	bool unused_board_984_26 : 1;
+	bool is_enabled_spi_4 : 1;
 	/**
 	offset 144 bit 27 */
 	bool unused_board_984_27 : 1;
@@ -795,10 +799,18 @@ typedef struct {
 	 * offset 204
 	 */
 	spi_device_e max31855spiDevice;
+	/**
+	 * offset 205
+	 */
+	uint8_t unusedSpiPadding2[3];
 	/**
 	 * offset 208
 	 */
 	uart_device_e consoleUartDevice;
+	/**
+	 * offset 209
+	 */
+	uint8_t unuseduartPadding1[3];
 	/**
 	 * offset 212
 	 */
@@ -1320,6 +1332,10 @@ typedef struct {
 	 * offset 540
 	 */
 	spi_device_e hip9011SpiDevice;
+	/**
+	 * offset 541
+	 */
+	uint8_t unusedSpiPadding1[3];
 	/**
 	 * set global_fuel_correction X
 	 * offset 544
@@ -1343,7 +1359,7 @@ typedef struct {
 	/**
 	 * offset 557
 	 */
-	uint8_t alignMaf[3];
+	uint8_t unusedAlignMaf[3];
 	/**
 	 * offset 560
 	 */
@@ -2006,6 +2022,10 @@ typedef struct {
 	 * offset 2284
 	 */
 	spi_device_e cj125SpiDevice;
+	/**
+	 * offset 2285
+	 */
+	uint8_t unusedSpiPadding3[3];
 	/**
 	 * Narrow Band WBO Approximation
 	 * offset 2288
@@ -2110,6 +2130,10 @@ typedef struct {
 	 * offset 2616
 	 */
 	spi_device_e sdCardSpiDevice;
+	/**
+	 * offset 2617
+	 */
+	uint8_t unusedSpiPadding4[3];
 	/**
 	 * offset 2620
 	 */
@@ -2184,6 +2208,10 @@ typedef struct {
 	 * offset 2736
 	 */
 	spi_device_e accelerometerSpiDevice;
+	/**
+	 * offset 2737
+	 */
+	uint8_t unusedSpiPadding5[3];
 	/**
 	 * offset 2740
 	 */
@@ -2400,14 +2428,26 @@ typedef struct {
 	 * offset 4024
 	 */
 	spi_device_e tle8888spiDevice;
+	/**
+	 * offset 4025
+	 */
+	uint8_t unusedSpiPadding6[3];
 	/**
 	 * offset 4028
 	 */
 	spi_device_e tle6240spiDevice;
+	/**
+	 * offset 4029
+	 */
+	uint8_t unusedSpiPadding7[3];
 	/**
 	 * offset 4032
 	 */
 	spi_device_e mc33972spiDevice;
+	/**
+	 * offset 4033
+	 */
+	uint8_t unusedSpiPadding8[3];
 	/**
 	 * offset 4036
 	 */
@@ -2658,4 +2698,4 @@ typedef struct {
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Apr 13 10:44:04 EDT 2019
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 14 11:23:20 EDT 2019
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index f52c1a5135..b4808aeb6a 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -541,14 +541,12 @@ typedef enum {
 	Force_4_bytes_size_cranking_ignition_mode = ENUM_32_BITS,
 } cranking_ignition_mode_e;
 
-typedef enum {
+typedef enum __attribute__ ((__packed__)) {
 	UART_NONE = 0,
 	UART_DEVICE_1 = 1,
 	UART_DEVICE_2 = 2,
 	UART_DEVICE_3 = 3,
 	UART_DEVICE_4 = 4,
-// todo: make this a one byte enum
-	Force_4_bytes_size_uart_device = ENUM_32_BITS,
 } uart_device_e;
 
 typedef enum __attribute__ ((__packed__)) {
@@ -558,15 +556,12 @@ typedef enum __attribute__ ((__packed__)) {
 	_150KHz
 } spi_speed_e;
 
-typedef enum {
+typedef enum __attribute__ ((__packed__)) {
 	SPI_NONE = 0,
 	SPI_DEVICE_1 = 1,
 	SPI_DEVICE_2 = 2,
 	SPI_DEVICE_3 = 3,
 	SPI_DEVICE_4 = 4,
-
-	// todo: make this a one byte enum
-	Force_4_bytes_size_spi_device = ENUM_32_BITS,
 } spi_device_e;
 
 
diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h
index f831410906..da038ed808 100644
--- a/firmware/controllers/algo/rusefi_generated.h
+++ b/firmware/controllers/algo/rusefi_generated.h
@@ -53,8 +53,6 @@
 #define afterCrankingIACtaperDuration_offset_hex 808
 #define alFIn_offset 1540
 #define alFIn_offset_hex 604
-#define alignMaf_offset 557
-#define alignMaf_offset_hex 22d
 #define alternatorControl_dFactor_offset 1744
 #define alternatorControl_dFactor_offset_hex 6d0
 #define alternatorControl_iFactor_offset 1740
@@ -1194,6 +1192,8 @@
 #define is_enabled_spi_2_offset_hex 2e8
 #define is_enabled_spi_3_offset 744
 #define is_enabled_spi_3_offset_hex 2e8
+#define is_enabled_spi_4_offset 744
+#define is_enabled_spi_4_offset_hex 2e8
 #define isAlternatorControlEnabled_offset 1464
 #define isAlternatorControlEnabled_offset_hex 5b8
 #define isCJ125Enabled_offset 744
@@ -1738,8 +1738,6 @@
 #define unused_bit_1472_29_offset_hex 5b8
 #define unused_bit_1472_30_offset 1464
 #define unused_bit_1472_30_offset_hex 5b8
-#define unused_board_984_26_offset 744
-#define unused_board_984_26_offset_hex 2e8
 #define unused_board_984_27_offset 744
 #define unused_board_984_27_offset_hex 2e8
 #define unused_board_984_28_offset 744
@@ -1748,6 +1746,8 @@
 #define unused_board_984_29_offset_hex 2e8
 #define unused_board_984_30_offset 744
 #define unused_board_984_30_offset_hex 2e8
+#define unusedAlignMaf_offset 557
+#define unusedAlignMaf_offset_hex 22d
 #define unusedAnotherOne_offset 744
 #define unusedAnotherOne_offset_hex 2e8
 #define unusedAtBoardConfigurationEnd_offset 972
@@ -1760,10 +1760,30 @@
 #define unusedjoy_offset_hex 3af
 #define unusedMa2_offset 711
 #define unusedMa2_offset_hex 2c7
+#define unusedSpiPadding1_offset 541
+#define unusedSpiPadding1_offset_hex 21d
+#define unusedSpiPadding2_offset 805
+#define unusedSpiPadding2_offset_hex 325
+#define unusedSpiPadding3_offset 2285
+#define unusedSpiPadding3_offset_hex 8ed
+#define unusedSpiPadding4_offset 2617
+#define unusedSpiPadding4_offset_hex a39
+#define unusedSpiPadding5_offset 2737
+#define unusedSpiPadding5_offset_hex ab1
+#define unusedSpiPadding6_offset 4025
+#define unusedSpiPadding6_offset_hex fb9
+#define unusedSpiPadding7_offset 4029
+#define unusedSpiPadding7_offset_hex fbd
+#define unusedSpiPadding8_offset 4033
+#define unusedSpiPadding8_offset_hex fc1
+#define unusedSpiPadding9_offset 677
+#define unusedSpiPadding9_offset_hex 2a5
 #define unusedt_offset 581
 #define unusedt_offset_hex 245
 #define unusedTest55_offset 3131
 #define unusedTest55_offset_hex c3b
+#define unuseduartPadding1_offset 809
+#define unuseduartPadding1_offset_hex 329
 #define unuseSpi3_offset 2630
 #define unuseSpi3_offset_hex a46
 #define unusuedsw_offset 1489
diff --git a/firmware/flash_erase407.bat b/firmware/flash_erase407.bat
index beeadce331..c3f32b2df3 100644
--- a/firmware/flash_erase407.bat
+++ b/firmware/flash_erase407.bat
@@ -1,7 +1,7 @@
 rem st-link_cli -c SWD ur -ME
 rem 0x100000 would erase both code and configuration
 rem use 0x080000 if you want to erase only configuratio
-echo I am flash_erase.bat
+echo I am flash_erase407.bat
 
 rem weird, it used to be much nicer with openocd 0.8.0, file location was not broken?
 rem maybe https://sourceforge.net/p/openocd/tickets/105/ ?
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 00d1a1637f..fb6bfe4d9c 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -431,8 +431,9 @@ end_struct
 
 trigger_config_s trigger;
 
-custom spi_device_e 4 bits,U32,   @OFFSET@, [0:1], "Off", "SPI1", "SPI2", "SPI3" 
+custom spi_device_e 1 bits,U32,   @OFFSET@, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" 
 	spi_device_e hip9011SpiDevice;
+	uint8_t[3] unusedSpiPadding1;
 	
 	
 float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,       0,  1000.0,        2
@@ -440,7 +441,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	float adcVcc;;         "volts",    1,    0.0,       0,    4.0,        3
 	float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking
 	adc_channel_e mafAdcChannel;See hasMafSensor
-	uint8_t[3] alignMaf;
+	uint8_t[3] unusedAlignMaf;
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
@@ -522,6 +523,7 @@ brain_pin_e clutchDownPin;some cars have a switch to indicate that clutch pedal
 
 	
 spi_device_e digitalPotentiometerSpiDevice;Digital Potentiometer is used by stock ECU stimulation code
+	uint8_t[3] unusedSpiPadding9;
 
 custom adc_channel_mode_e 4 bits,    U32,   @OFFSET@, [0:1], "Off", "Slow", "Fast", "INVALID" 
 
@@ -589,7 +591,7 @@ bit is_enabled_spi_2
 	bit useNoiselessTriggerDecoder
 	bit useIdleTimingPidControl
 	bit useTPSBasedVeTable
-	bit unused_board_984_26
+	bit is_enabled_spi_4
 	bit unused_board_984_27
 	bit unused_board_984_28
 	bit unused_board_984_29
@@ -611,10 +613,13 @@ pin_output_mode_e hip9011IntHoldPinMode;
 	brain_pin_e[EGT_CHANNEL_COUNT iterate] max31855_cs;
 
 	spi_device_e max31855spiDevice;
+	uint8_t[3] unusedSpiPadding2;
 
 
-custom uart_device_e 4 bits,U32,   @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3" 
+custom uart_device_e 1 bits,U32,   @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3" 
 	uart_device_e consoleUartDevice;
+		uint8_t[3] unuseduartPadding1;
+	
 	int mapMinBufferLength;;"count",        1,     0,  0,    24,  0
 	int16_t idlePidDeactivationTpsThreshold;;"%",        1,     0,  0,    100.0,  0
 	int16_t stepperParkingExtraSteps;;"%",        1,     0,  0,    3000.0,  0
@@ -888,6 +893,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult",      1,     0,   0.0,    300,
 	int alternatorPwmFrequency;;"Hz",        1,     0,  0,    3000.0,  0
 	mass_storage_e storageMode;
 	spi_device_e cj125SpiDevice;
+	uint8_t[3] unusedSpiPadding3;
 
 	float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygenBins;Narrow Band WBO Approximation;"V",        1,     0,   -10.0,    10.0,  3
 	float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygen;;"ratio",      1,     0,      -40.0,    40.0,   2
@@ -918,6 +924,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult",      1,     0,   0.0,    300,
 	float idlePidActivationTime;;"seconds",        1,     0,  0,    60,  1
 
 	spi_device_e sdCardSpiDevice;
+	uint8_t[3] unusedSpiPadding4;
+
 	pin_mode_e spi1SckMode;
 	pin_mode_e spi1MosiMode;
 	pin_mode_e spi1MisoMode;
@@ -944,6 +952,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult",      1,     0,   0.0,    300,
 	oil_pressure_config_s oilPressure;
 
 	spi_device_e accelerometerSpiDevice;
+	uint8_t[3] unusedSpiPadding5;
 	float[FSIO_CURVE_16] fsioCurve1Bins;;"x",        1,     0,   -999,    1000.0,  3
 	float[FSIO_CURVE_16] fsioCurve1;;"y",      1,     0,      -999,    1000.0,   3
 	float[FSIO_CURVE_16] fsioCurve2Bins;;"x",        1,     0,   -999,    1000.0,  3
@@ -1010,8 +1019,11 @@ tChargeMode_e tChargeMode;
 	float tpsAccelFractionDivisor;+A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions;"coef",        1,     0,  0,    100,  2
 
 	spi_device_e tle8888spiDevice;
+	uint8_t[3] unusedSpiPadding6;
 	spi_device_e tle6240spiDevice;
+	uint8_t[3] unusedSpiPadding7;
 	spi_device_e mc33972spiDevice;
+	uint8_t[3] unusedSpiPadding8;
 
 	int[611] mainUnusedEnd;
 	
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index f078e87bab..e191e0939d 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -68,7 +68,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 Sat Apr 13 10:44:04 EDT 2019
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 14 11:23:20 EDT 2019
 
 pageSize            = 20000
 page = 1
@@ -190,12 +190,13 @@ page = 1
 	trigger_useOnlyFirstChannel= bits,    U32,   	528, [2:2], "false", "true"
 	trigger_customTotalToothCount		= scalar, S32,	532,	"number", 1, 0.0, 0, 500.0, 0
 	trigger_customSkippedToothCount		= scalar, S32,	536,	"number", 1, 0.0, 0, 500.0, 0
-	hip9011SpiDevice			 = bits,U32, 540, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	hip9011SpiDevice			 = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding1 offset 541
 	globalFuelCorrection			= scalar, F32,	544,	"coef", 1, 0.0, 0, 1000.0, 2
 	adcVcc							= scalar, F32,	548,	 "volts", 1, 0.0, 0, 4.0, 3
 ;no TS info - skipping maxKnockSubDeg offset 552
 	mafAdcChannel				 = bits, U08, 556, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping alignMaf offset 557
+;no TS info - skipping unusedAlignMaf offset 557
 	afr_hwChannel				 = bits, U08, 560, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 ;no TS info - skipping afr_alignAf offset 561
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -270,7 +271,8 @@ page = 1
 	wboHeaterPin				 = bits, U08, 673, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	cj125CsPin					 = bits, U08, 674, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 ;no TS info - skipping unusedEtbM offset 675
-	digitalPotentiometerSpiDevice	 = bits,U32, 676, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	digitalPotentiometerSpiDevice	 = bits,U32, 676, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding9 offset 677
 	etb1_directionPin1			 = bits, U08, 680, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	etb1_directionPin2			 = bits, U08, 681, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	etb1_controlPin1			 = bits, U08, 682, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -331,7 +333,7 @@ page = 1
 	useNoiselessTriggerDecoder= bits,    U32,   	744, [23:23], "false", "true"
 	useIdleTimingPidControl	= bits,    U32,   	744, [24:24], "false", "true"
 	useTPSBasedVeTable		= bits,    U32,   	744, [25:25], "false", "true"
-	unused_board_984_26		= bits,    U32,   	744, [26:26], "false", "true"
+	is_enabled_spi_4		= bits,    U32,   	744, [26:26], "false", "true"
 	unused_board_984_27		= bits,    U32,   	744, [27:27], "false", "true"
 	unused_board_984_28		= bits,    U32,   	744, [28:28], "false", "true"
 	unused_board_984_29		= bits,    U32,   	744, [29:29], "false", "true"
@@ -386,8 +388,10 @@ page = 1
 	max31855_cs6				 = bits, U08, 801, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	max31855_cs7				 = bits, U08, 802, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	max31855_cs8				 = bits, U08, 803, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-	max31855spiDevice			 = bits,U32, 804, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	max31855spiDevice			 = bits,U32, 804, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding2 offset 805
 	consoleUartDevice			 = bits,U32, 808, [0:1], "Off", "UART1", "UART2", "UART3"
+;no TS info - skipping unuseduartPadding1 offset 809
 	mapMinBufferLength				= scalar, S32,	812,	"count", 1, 0, 0, 24, 0
 	idlePidDeactivationTpsThreshold		= scalar, S16,	816,	"%", 1, 0, 0, 100.0, 0
 	stepperParkingExtraSteps		= scalar, S16,	818,	"%", 1, 0, 0, 3000.0, 0
@@ -671,7 +675,8 @@ page = 1
 	auxPidFrequency4			 = scalar, U16, 2274, "Hz", 1, 0, 0, 3000, 0
 	alternatorPwmFrequency			= scalar, S32,	2276,	"Hz", 1, 0, 0, 3000.0, 0
 	storageMode					 = bits, U32, 2280, [0:1], "Auto", "Always", "Never"
-	cj125SpiDevice				 = bits,U32, 2284, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	cj125SpiDevice				 = bits,U32, 2284, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding3 offset 2285
 	narrowToWideOxygenBins			= array, F32,	2288,	[8],	"V", 1, 0, -10.0, 10.0, 3
 	narrowToWideOxygen				= array, F32,	2320,	[8],	"ratio", 1, 0, -40.0, 40.0, 2
 	vvtMode						 = bits, U32, 2352, [0:2], "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
@@ -732,7 +737,8 @@ page = 1
 	timing_offset_cylinder11	 = scalar, F32, 2604, "Val", 1, 0, -20000000, 20000000, 1
 	timing_offset_cylinder12	 = scalar, F32, 2608, "Val", 1, 0, -20000000, 20000000, 1
 	idlePidActivationTime			= scalar, F32,	2612,	"seconds", 1, 0, 0, 60, 1
-	sdCardSpiDevice				 = bits,U32, 2616, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	sdCardSpiDevice				 = bits,U32, 2616, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding4 offset 2617
 	spi1SckMode					 = bits, U08, 2620, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
 	spi1MosiMode				 = bits, U08, 2621, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
 	spi1MisoMode				 = bits, U08, 2622, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
@@ -782,7 +788,8 @@ page = 1
 	oilPressure_value1				= scalar, F32,	2724,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2728,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value2				= scalar, F32,	2732,	 "kPa", 1, 0.0, 0, 1000.0, 2
-	accelerometerSpiDevice		 = bits,U32, 2736, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	accelerometerSpiDevice		 = bits,U32, 2736, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding5 offset 2737
 	fsioCurve1Bins					= array, F32,	2740,	[16],	"x", 1, 0, -999, 1000.0, 3
 	fsioCurve1						= array, F32,	2804,	[16],	"y", 1, 0, -999, 1000.0, 3
 	fsioCurve2Bins					= array, F32,	2868,	[16],	"x", 1, 0, -999, 1000.0, 3
@@ -847,9 +854,12 @@ page = 1
 	idlePidFalloffDeltaRpm			= scalar, S16,	4016,	"RPM", 1, 0, 0, 1000, 0
 	tpsAccelFractionPeriod			= scalar, S16,	4018,	"cycles", 1, 0, 0, 500, 0
 	tpsAccelFractionDivisor			= scalar, F32,	4020,	"coef", 1, 0, 0, 100, 2
-	tle8888spiDevice			 = bits,U32, 4024, [0:1], "Off", "SPI1", "SPI2", "SPI3"
-	tle6240spiDevice			 = bits,U32, 4028, [0:1], "Off", "SPI1", "SPI2", "SPI3"
-	mc33972spiDevice			 = bits,U32, 4032, [0:1], "Off", "SPI1", "SPI2", "SPI3"
+	tle8888spiDevice			 = bits,U32, 4024, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding6 offset 4025
+	tle6240spiDevice			 = bits,U32, 4028, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding7 offset 4029
+	mc33972spiDevice			 = bits,U32, 4032, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4"
+;no TS info - skipping unusedSpiPadding8 offset 4033
 ;no TS info - skipping mainUnusedEnd offset 4036
 	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
 	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java
index e717338678..daa227f719 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 Sat Apr 13 10:44:04 EDT 2019
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 14 11:23:20 EDT 2019
 public class Fields {
 	public static final int accelerometerSpiDevice_offset = 2736;
 	public static final int acCutoffHighRpm_offset = 1498;
@@ -36,7 +36,6 @@ public class Fields {
 	public static final int afterCrankingIACtaperDuration_offset_hex = 808;
 	public static final int alFIn_offset = 1540;
 	public static final int alFIn_offset_hex = 604;
-	public static final int alignMaf_offset = 557;
 	public static final int alternatorControl_dFactor_offset = 1744;
 	public static final int alternatorControl_iFactor_offset = 1740;
 	public static final int alternatorControl_maxValue_offset = 1754;
@@ -792,6 +791,7 @@ public class Fields {
 	public static final int is_enabled_spi_1_offset = 744;
 	public static final int is_enabled_spi_2_offset = 744;
 	public static final int is_enabled_spi_3_offset = 744;
+	public static final int is_enabled_spi_4_offset = 744;
 	public static final int isAlternatorControlEnabled_offset = 1464;
 	public static final int isCJ125Enabled_offset = 744;
 	public static final int isCylinderCleanupEnabled_offset = 1476;
@@ -1119,20 +1119,32 @@ public class Fields {
 	public static final int unused_1484_bit_21_offset = 1476;
 	public static final int unused_bit_1472_29_offset = 1464;
 	public static final int unused_bit_1472_30_offset = 1464;
-	public static final int unused_board_984_26_offset = 744;
 	public static final int unused_board_984_27_offset = 744;
 	public static final int unused_board_984_28_offset = 744;
 	public static final int unused_board_984_29_offset = 744;
 	public static final int unused_board_984_30_offset = 744;
+	public static final int unusedAlignMaf_offset = 557;
 	public static final int unusedAnotherOne_offset = 744;
 	public static final int unusedAtBoardConfigurationEnd_offset = 972;
 	public static final int unusedEtbM_offset = 675;
 	public static final int unusedh_offset = 1469;
 	public static final int unusedjoy_offset = 943;
 	public static final int unusedMa2_offset = 711;
+	public static final int unusedSpiPadding1_offset = 541;
+	public static final int unusedSpiPadding2_offset = 805;
+	public static final int unusedSpiPadding2_offset_hex = 325;
+	public static final int unusedSpiPadding3_offset = 2285;
+	public static final int unusedSpiPadding4_offset = 2617;
+	public static final int unusedSpiPadding5_offset = 2737;
+	public static final int unusedSpiPadding6_offset = 4025;
+	public static final int unusedSpiPadding7_offset = 4029;
+	public static final int unusedSpiPadding8_offset = 4033;
+	public static final int unusedSpiPadding9_offset = 677;
 	public static final int unusedt_offset = 581;
 	public static final int unusedt_offset_hex = 245;
 	public static final int unusedTest55_offset = 3131;
+	public static final int unuseduartPadding1_offset = 809;
+	public static final int unuseduartPadding1_offset_hex = 329;
 	public static final int unuseSpi3_offset = 2630;
 	public static final int unusuedsw_offset = 1489;
 	public static final int unusuedvref_offset = 1505;
@@ -1316,7 +1328,7 @@ public class Fields {
 	public static final Field TRIGGER_USEONLYFIRSTCHANNEL = Field.create("TRIGGER_USEONLYFIRSTCHANNEL", 528, FieldType.BIT, 2);
 	public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 532, FieldType.INT);
 	public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 536, FieldType.INT);
-	public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 540, FieldType.INT);
+	public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 540, FieldType.INT8);
 	public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 544, FieldType.FLOAT);
 	public static final Field ADCVCC = Field.create("ADCVCC", 548, FieldType.FLOAT);
 	public static final Field MAXKNOCKSUBDEG = Field.create("MAXKNOCKSUBDEG", 552, FieldType.FLOAT);
@@ -1395,7 +1407,7 @@ public class Fields {
 	public static final Field WBOHEATERPIN = Field.create("WBOHEATERPIN", 673, FieldType.INT8, brain_pin_e);
 	public static final Field CJ125CSPIN = Field.create("CJ125CSPIN", 674, FieldType.INT8, brain_pin_e);
 	public static final Field UNUSEDETBM = Field.create("UNUSEDETBM", 675, FieldType.INT8);
-	public static final Field DIGITALPOTENTIOMETERSPIDEVICE = Field.create("DIGITALPOTENTIOMETERSPIDEVICE", 676, FieldType.INT);
+	public static final Field DIGITALPOTENTIOMETERSPIDEVICE = Field.create("DIGITALPOTENTIOMETERSPIDEVICE", 676, FieldType.INT8);
 	public static final Field ETB1_DIRECTIONPIN1 = Field.create("ETB1_DIRECTIONPIN1", 680, FieldType.INT8, brain_pin_e);
 	public static final Field ETB1_DIRECTIONPIN2 = Field.create("ETB1_DIRECTIONPIN2", 681, FieldType.INT8, brain_pin_e);
 	public static final Field ETB1_CONTROLPIN1 = Field.create("ETB1_CONTROLPIN1", 682, FieldType.INT8, brain_pin_e);
@@ -1458,7 +1470,7 @@ public class Fields {
 	public static final Field USENOISELESSTRIGGERDECODER = Field.create("USENOISELESSTRIGGERDECODER", 744, FieldType.BIT, 23);
 	public static final Field USEIDLETIMINGPIDCONTROL = Field.create("USEIDLETIMINGPIDCONTROL", 744, FieldType.BIT, 24);
 	public static final Field USETPSBASEDVETABLE = Field.create("USETPSBASEDVETABLE", 744, FieldType.BIT, 25);
-	public static final Field UNUSED_BOARD_984_26 = Field.create("UNUSED_BOARD_984_26", 744, FieldType.BIT, 26);
+	public static final Field IS_ENABLED_SPI_4 = Field.create("IS_ENABLED_SPI_4", 744, FieldType.BIT, 26);
 	public static final Field UNUSED_BOARD_984_27 = Field.create("UNUSED_BOARD_984_27", 744, FieldType.BIT, 27);
 	public static final Field UNUSED_BOARD_984_28 = Field.create("UNUSED_BOARD_984_28", 744, FieldType.BIT, 28);
 	public static final Field UNUSED_BOARD_984_29 = Field.create("UNUSED_BOARD_984_29", 744, FieldType.BIT, 29);
@@ -1512,8 +1524,8 @@ public class Fields {
 	public static final Field MAX31855_CS6 = Field.create("MAX31855_CS6", 801, FieldType.INT8, brain_pin_e);
 	public static final Field MAX31855_CS7 = Field.create("MAX31855_CS7", 802, FieldType.INT8, brain_pin_e);
 	public static final Field MAX31855_CS8 = Field.create("MAX31855_CS8", 803, FieldType.INT8, brain_pin_e);
-	public static final Field MAX31855SPIDEVICE = Field.create("MAX31855SPIDEVICE", 804, FieldType.INT);
-	public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 808, FieldType.INT);
+	public static final Field MAX31855SPIDEVICE = Field.create("MAX31855SPIDEVICE", 804, FieldType.INT8);
+	public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 808, FieldType.INT8);
 	public static final Field MAPMINBUFFERLENGTH = Field.create("MAPMINBUFFERLENGTH", 812, FieldType.INT);
 	public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT16);
 	public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT16);
@@ -1783,7 +1795,7 @@ public class Fields {
 	public static final Field ALTERNATORPWMFREQUENCY = Field.create("ALTERNATORPWMFREQUENCY", 2276, FieldType.INT);
 	public static final String[] mass_storage_e = {"Auto", "Always", "Never"};
 	public static final Field STORAGEMODE = Field.create("STORAGEMODE", 2280, FieldType.INT, mass_storage_e);
-	public static final Field CJ125SPIDEVICE = Field.create("CJ125SPIDEVICE", 2284, FieldType.INT);
+	public static final Field CJ125SPIDEVICE = Field.create("CJ125SPIDEVICE", 2284, FieldType.INT8);
 	public static final String[] vvt_mode_e = {"First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"};
 	public static final Field VVTMODE = Field.create("VVTMODE", 2352, FieldType.INT, vvt_mode_e);
 	public static final Field BIQUAD_A0 = Field.create("BIQUAD_A0", 2356, FieldType.FLOAT);
@@ -1839,7 +1851,7 @@ public class Fields {
 	public static final Field TIMING_OFFSET_CYLINDER11 = Field.create("TIMING_OFFSET_CYLINDER11", 2604, FieldType.INT);
 	public static final Field TIMING_OFFSET_CYLINDER12 = Field.create("TIMING_OFFSET_CYLINDER12", 2608, FieldType.INT);
 	public static final Field IDLEPIDACTIVATIONTIME = Field.create("IDLEPIDACTIVATIONTIME", 2612, FieldType.FLOAT);
-	public static final Field SDCARDSPIDEVICE = Field.create("SDCARDSPIDEVICE", 2616, FieldType.INT);
+	public static final Field SDCARDSPIDEVICE = Field.create("SDCARDSPIDEVICE", 2616, FieldType.INT8);
 	public static final String[] pin_mode_e = {"default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"};
 	public static final Field SPI1SCKMODE = Field.create("SPI1SCKMODE", 2620, FieldType.INT8, pin_mode_e);
 	public static final Field SPI1MOSIMODE = Field.create("SPI1MOSIMODE", 2621, FieldType.INT8, pin_mode_e);
@@ -1888,7 +1900,7 @@ public class Fields {
 	public static final Field OILPRESSURE_VALUE1 = Field.create("OILPRESSURE_VALUE1", 2724, FieldType.FLOAT);
 	public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2728, FieldType.FLOAT);
 	public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2732, FieldType.FLOAT);
-	public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2736, FieldType.INT);
+	public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2736, FieldType.INT8);
 	public static final Field FLEXFUELSENSOR = Field.create("FLEXFUELSENSOR", 3124, FieldType.INT8, brain_input_pin_e);
 	public static final Field TEST557PIN = Field.create("TEST557PIN", 3125, FieldType.INT8, brain_pin_e);
 	public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 3126, FieldType.INT8, pin_output_mode_e);
@@ -1939,9 +1951,9 @@ public class Fields {
 	public static final Field IDLEPIDFALLOFFDELTARPM = Field.create("IDLEPIDFALLOFFDELTARPM", 4016, FieldType.INT16);
 	public static final Field TPSACCELFRACTIONPERIOD = Field.create("TPSACCELFRACTIONPERIOD", 4018, FieldType.INT16);
 	public static final Field TPSACCELFRACTIONDIVISOR = Field.create("TPSACCELFRACTIONDIVISOR", 4020, FieldType.FLOAT);
-	public static final Field TLE8888SPIDEVICE = Field.create("TLE8888SPIDEVICE", 4024, FieldType.INT);
-	public static final Field TLE6240SPIDEVICE = Field.create("TLE6240SPIDEVICE", 4028, FieldType.INT);
-	public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4032, FieldType.INT);
+	public static final Field TLE8888SPIDEVICE = Field.create("TLE8888SPIDEVICE", 4024, FieldType.INT8);
+	public static final Field TLE6240SPIDEVICE = Field.create("TLE6240SPIDEVICE", 4028, FieldType.INT8);
+	public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4032, FieldType.INT8);
 	public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
 	public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
 	public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);