diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp
index 0acd5c4d7c..92ec34ba5f 100644
--- a/firmware/config/boards/subaru_eg33/board_configuration.cpp
+++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp
@@ -48,23 +48,37 @@ void setBoardDefaultConfiguration(void) {
 
 	/* Battery voltage */
 	engineConfiguration->vbattAdcChannel = EFI_ADC_6;
+	/* Vbat divider: 10K + 1K */
+	engineConfiguration->vbattDividerCoeff = (1.0 + 10.0) / 1.0;
+
 	/* Throttle position */
 	engineConfiguration->tps1_1AdcChannel = EFI_ADC_12;
+
 	/* MAP: stock car dows not have MAP
 	 * but EFI_ADC_10 is reserved for this purpose */
 	engineConfiguration->map.sensor.hwChannel = EFI_ADC_NONE;
+
 	/* MAF */
 	engineConfiguration->mafAdcChannel = EFI_ADC_3;
+
 	/* coolant t */
 	engineConfiguration->clt.adcChannel = EFI_ADC_14;
-	/* not yet */
+	/* 1K pull-up plus 20K pull-down to get ~4.75V when no sensor connected */
+	engineConfiguration->clt.config.bias_resistor = 1000;
+
+	/* No IAT sensor on stock engine */
 	engineConfiguration->iat.adcChannel = EFI_ADC_NONE;
-	/* narrow */
+	//sengineConfiguration->iat.config.bias_resistor = 2700;
+
+	/* TODO: add both narrow sensors */
 	engineConfiguration->afr.hwChannel = EFI_ADC_NONE;
 
 	engineConfiguration->adcVcc = ADC_VCC;
 
+	/* No barro */
 	engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
+
+	/* No pedal position */
 	engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_NONE;
 
 	/* Injectors */
@@ -79,20 +93,15 @@ void setBoardDefaultConfiguration(void) {
 
 	/* Ignition */
 	engineConfiguration->ignitionPins[1 - 1] = MC33810_0_GD_0;
-	engineConfiguration->ignitionPins[2 - 1] = MC33810_1_GD_1;
+	engineConfiguration->ignitionPins[2 - 1] = MC33810_1_GD_2;
 	engineConfiguration->ignitionPins[3 - 1] = MC33810_0_GD_1;
-	engineConfiguration->ignitionPins[4 - 1] = MC33810_1_GD_0;
+	engineConfiguration->ignitionPins[4 - 1] = MC33810_1_GD_3;
 	engineConfiguration->ignitionPins[5 - 1] = MC33810_0_GD_3;
-	engineConfiguration->ignitionPins[6 - 1] = MC33810_1_GD_2;
+	engineConfiguration->ignitionPins[6 - 1] = MC33810_1_GD_1;
 	engineConfiguration->ignitionPins[7 - 1] = MC33810_0_GD_2;
-	engineConfiguration->ignitionPins[8 - 1] = MC33810_1_GD_3;
+	engineConfiguration->ignitionPins[8 - 1] = MC33810_1_GD_0;
 	//engineConfiguration->ignitionPinMode = OM_INVERTED;
 
-	// Vbat divider: 10K + 1K
-	engineConfiguration->vbattDividerCoeff = (1.0 + 10.0) / 1.0;
-	//engineConfiguration->clt.config.bias_resistor = 2700;
-	//sengineConfiguration->iat.config.bias_resistor = 2700;
-
 	// Idle configuration
 	engineConfiguration->useStepperIdle = false;
 	engineConfiguration->isDoubleSolenoidIdle = true;
@@ -121,23 +130,18 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->mc33972_cs = GPIOE_10;	/* SPI4_NSS2 */
 	engineConfiguration->mc33972_csPinMode = OM_DEFAULT;
 
-	/* TLE6240 - OUT3, also PG2 */
+	/* TLE6240 - OUT3, also PG2 through 3.3V-> 5.0V level translator - not installed */
 	engineConfiguration->tachOutputPin = TLE6240_PIN_2;
 	engineConfiguration->tachOutputPinMode = OM_DEFAULT;
+
 	/* spi driven - TLE6240 - OUT5 */
-#if 1
 	engineConfiguration->fuelPumpPin = TLE6240_PIN_5;
 	engineConfiguration->fuelPumpPinMode = OM_DEFAULT;
+
 	/* self shutdown? */
 	engineConfiguration->mainRelayPin = GPIOH_7;
 	engineConfiguration->mainRelayPinMode = OM_DEFAULT;
-#else
-	engineConfiguration->fuelPumpPin = GPIO_UNASSIGNED;
-	engineConfiguration->fuelPumpPinMode = OM_DEFAULT;
-	/* self shutdown? */
-	engineConfiguration->mainRelayPin = TLE6240_PIN_5;
-	engineConfiguration->mainRelayPinMode = OM_DEFAULT;
-#endif
+
 	/* spi driven - TLE6240 - OUT1, OUT2 */
 	engineConfiguration->fanPin = TLE6240_PIN_1;
 	engineConfiguration->fanPinMode = OM_DEFAULT;
@@ -148,11 +152,10 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->malfunctionIndicatorPin = TLE6240_PIN_7;
 	engineConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
 
-	// starter block
-	/* Starter signal connected through MC33972 - SG11 */
+	/* Starter input signal connected through MC33972 - SG11 */
 	//setFsio(0, (GPIOB_1), STARTER_RELAY_LOGIC PASS_CONFIG_PARAMETER_SUFFIX);
 
-	// not used
+	/* not used */
 	engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE;
 	engineConfiguration->displayMode = DM_NONE;
 	engineConfiguration->HD44780_rs = GPIO_UNASSIGNED;
@@ -167,8 +170,7 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED;
 	engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
 
-	/////////////////////////////////////////////////////////
-
+	/* SPIs */
 	engineConfiguration->is_enabled_spi_1 = true;
 	engineConfiguration->is_enabled_spi_2 = false;
 	engineConfiguration->is_enabled_spi_3 = true;
@@ -188,7 +190,10 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->spi3sckPin = GPIOC_10;
 	engineConfiguration->spi3SckMode = PO_DEFAULT;
 
+	/* TODO: add settings for SPI4 */
+
 	/* Knock sensor */
+	/* Interface settings */
 	engineConfiguration->hip9011SpiDevice = SPI_DEVICE_4;
 	engineConfiguration->hip9011CsPin = GPIOE_11;	/* SPI4_NSS1 */
 	engineConfiguration->hip9011CsPinMode = OM_OPENDRAIN;
@@ -198,8 +203,7 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->isHip9011Enabled = true;
 	/* this board has TPIC8101, that supports advanced mode */
 	engineConfiguration->useTpicAdvancedMode = true;
-
-
+	/* Chip settings */
 	engineConfiguration->hip9011PrescalerAndSDO = (0x6 << 1); //HIP_16MHZ_PRESCALER;
 	engineConfiguration->hip9011Gain = 1.0;
 	engineConfiguration->knockBandCustom = 0.0;
@@ -215,17 +219,27 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->knockBankCyl5 = 0;
 	engineConfiguration->knockBankCyl6 = 1;
 
-#if 0
-	engineConfiguration->cj125SpiDevice = SPI_DEVICE_3;
-	engineConfiguration->cj125ua = EFI_ADC_9;
-	engineConfiguration->cj125ur = EFI_ADC_12;
-	engineConfiguration->cj125CsPin = GPIOA_15;
-	engineConfiguration->cj125CsPinMode = OM_OPENDRAIN;
-	engineConfiguration->wboHeaterPin = GPIOC_13;
-	engineConfiguration->o2heaterPin = GPIOC_13;
-#endif
+	/* Cylinder to bank mapping */
+	engineConfiguration->cylinderBankSelect[1 - 1] = 0;
+	engineConfiguration->cylinderBankSelect[2 - 1] = 1;
+	engineConfiguration->cylinderBankSelect[3 - 1] = 0;
+	engineConfiguration->cylinderBankSelect[4 - 1] = 1;
+	engineConfiguration->cylinderBankSelect[5 - 1] = 0;
+	engineConfiguration->cylinderBankSelect[6 - 1] = 1;
+
+	/* Misc settings */
+	engineConfiguration->acSwitch = MC33972_PIN_22;
+	engineConfiguration->acSwitchMode = PI_DEFAULT;
+
+	/* This board also has AC clutch output: */
+	engineConfiguration->acRelayPin = TLE6240_PIN_15;
+	engineConfiguration->acCutoffLowRpm = 400;
+	engineConfiguration->acCutoffHighRpm = 3000;
+	engineConfiguration->acIdleRpmBump = 200;
+
 	engineConfiguration->isCJ125Enabled = false;
 
+	/* CAN */
 	engineConfiguration->canTxPin = GPIOD_1;
 	engineConfiguration->canRxPin = GPIOD_0;
 
diff --git a/firmware/config/boards/subaru_eg33/config/gen_config.sh b/firmware/config/boards/subaru_eg33/config/gen_config.sh
index 8e63d5c637..0d8dbbe017 100755
--- a/firmware/config/boards/subaru_eg33/config/gen_config.sh
+++ b/firmware/config/boards/subaru_eg33/config/gen_config.sh
@@ -5,15 +5,11 @@
 BOARDNAME=subaru_eg33
 SHORT_BOARDNAME=${BOARDNAME}_f7
 BOARD_DIR=config/boards/${BOARDNAME}
-BUILD_DIR=build_${BOARDNAME}
 
 bash gen_signature.sh ${SHORT_BOARDNAME}
 
-mkdir -p ${BUILD_DIR}
-
 java \
  -DSystemOut.name=gen_config_subaru_eg33 \
- -Drusefi.generator.lazyfile.enabled=true \
  -jar ../java_tools/ConfigDefinition.jar \
  -definition integration/rusefi_config.txt \
  -cache ${SHORT_BOARDNAME} \
@@ -29,9 +25,8 @@ java \
  -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
  -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
  -enumInputFile controllers/algo/rusefi_enums.h \
- -enumInputFile controllers/algo/rusefi_hw_enums.h \
- -board {BOARDNAME} \
- -prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
+ -enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h \
+ -board ${BOARDNAME} \
  -prepend config/boards/${BOARDNAME}/prepend.txt
 
 [ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARDNAME}"; exit 1; }
diff --git a/firmware/config/boards/subaru_eg33/connectors/A-B59.yaml b/firmware/config/boards/subaru_eg33/connectors/A-B59.yaml
new file mode 100644
index 0000000000..5e09c2fb88
--- /dev/null
+++ b/firmware/config/boards/subaru_eg33/connectors/A-B59.yaml
@@ -0,0 +1,127 @@
+# 22-pin connector
+
+pins:
+  - pin: 1
+    id: MC33810_0_OUT_2
+    class: outputs
+    function: Injector 5
+    ts_name: A01 - Injector 5
+    type: inj
+
+  - pin: 2
+    function: 12V supply from Main Relay
+    type: 12V
+    color: black
+
+  - pin: 3
+    id: EFI_ADC_14
+    class: analog_inputs
+    function: CLT sensor
+    ts_name: A03 - Coolant t Ain
+    type: at
+
+  - pin: 4
+    id: EFI_ADC_9
+    class: analog_inputs
+    function: CLT sensor
+    ts_name: A04 - EGR t Ain
+    type: at
+
+  - pin: 5
+    id: EFI_ADC_8
+    class: analog_inputs
+    function: Narrow AFR Bank 2
+    ts_name: A06 - Oxyg 2 Ain
+    type: av
+
+  - pin: 6
+    id: EFI_ADC_15
+    class: analog_inputs
+    function: Narrow AFR Bank 1
+    ts_name: A06 - Oxyg 1 Ain
+    type: av
+
+  - pin: 7
+    id: GPIOH_12
+    class: event_inputs
+    function: Cam VR+
+    ts_name: A07 - Cam VR+
+    type: vr
+
+  - pin: 8
+    id: GPIOE_9
+    class: event_inputs
+    function: Crank 2 VR+
+    ts_name: A08 - Crank 2 VR+
+    type: vr
+
+  - pin: 9
+    function: Cam and Crank 2 VR sensor GND
+    type: sgnd
+
+  - pin: 10
+    function: Cam and Crank 2 VR sensors shield
+    type: sgnd
+
+  - pin: 11
+    function: Power GND
+    type: pgnd
+
+  - pin: 12
+    id: MC33810_1_OUT_2
+    class: outputs
+    function: Injector 6
+    ts_name: A12 - Injector 6
+    type: inj
+
+  - pin: 13
+    function: 12V supply from Main Relay
+    type: 12V
+
+  - pin: 14
+    function: Ground (Body)
+    type: pgnd
+
+  - pin: 15
+    function: Backup 12V supply (always on)
+    type: 12V
+
+  - pin: 16
+    id: EFI_ADC3_10
+    class: analog_inputs
+    function: Atm Pressure Sensor
+    ts_name: A16 - Atm Pressure Sensor Ain
+    type: av
+
+  - pin: 17
+    function: AFR sensors shield
+    type: sgnd
+
+  - pin: 18
+    id: EFI_ADC_11
+    class: analog_inputs
+    function: AUX0 Ain
+    ts_name: A18 - AUX0 Ain
+    type: av
+
+  - pin: 19
+    id: MC33972_PIN_22
+    class: switch_inputs
+    function: AC Ctrl Din
+    ts_name: A19 - AC Ctrl Din
+    type: av
+
+  - pin: 20
+    id: MC33972_PIN_21
+    class: switch_inputs
+    function: Torque Ctrl Din
+    ts_name: A20 - Torque Ctrl Din
+    type: av
+
+  - pin: 11
+    function: Sensors GND
+    type: sgnd
+
+  - pin: 22
+    function: Power GND
+    type: pgnd
diff --git a/firmware/config/boards/subaru_eg33/connectors/B-B60.yaml b/firmware/config/boards/subaru_eg33/connectors/B-B60.yaml
new file mode 100644
index 0000000000..ed3b41a13b
--- /dev/null
+++ b/firmware/config/boards/subaru_eg33/connectors/B-B60.yaml
@@ -0,0 +1,76 @@
+# 12 pin connector
+
+pins:
+  - pin: 1
+    color:
+    function: TPS sensor GND
+    type: sgnd
+
+  - pin: 2
+    id: EFI_ADC_12
+    class: analog_inputs
+    function: TPS Ain
+    ts_name: B02 - TPS Ain
+    type: av
+
+  - pin: 3
+    function: "TPS Analog supply (+5)"
+    type: 5v
+
+  - pin: 4
+    function: "MAP Supply (+12)"
+    type: 5v
+
+  - pin: 5
+    id: EFI_ADC_3
+    class: analog_inputs
+    function: MAF Ain
+    ts_name: B05 - MAF Ain
+    type: av
+
+  - pin: 6
+    color:
+    function: MAF sensor GND
+    type: sgnd
+
+  - pin: 7
+    id: GPIO_UNASSIGNED
+    class: switch_inputs
+    function: Power Steering Switch
+    ts_name: B07 - Power Steering Switch
+    type: av
+
+  - pin: 8
+    id: TLE6240_PIN_15
+    class: outputs
+    function: AC clutch
+    ts_name: B08 - AC clutch
+    type: gp_low
+
+  - pin: 9
+    id: MC33972_PIN_20
+    class: switch_inputs
+    function: P pos Din
+    ts_name: B09 - P pos Din
+    type: av
+
+  - pin: 10
+    id: MC33972_PIN_19
+    class: switch_inputs
+    function: N pos Din
+    ts_name: B10 - N pos Din
+    type: av
+
+  - pin: 11
+    id: GPIOD_14
+    class: event_inputs
+    function: Speed Din
+    ts_name: B11 - Speed Din
+    type: din
+
+  - pin: 12
+    id: MC33972_PIN_17
+    class: switch_inputs
+    function: IGN Din
+    ts_name: B12 - IGN Din
+    type: av
diff --git a/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml b/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml
new file mode 100644
index 0000000000..7123aa7d98
--- /dev/null
+++ b/firmware/config/boards/subaru_eg33/connectors/C-B61.yaml
@@ -0,0 +1,86 @@
+#16 pin connector
+
+pins:
+  - pin: 1
+    id: GPIOH_10
+    class: event_inputs
+    function: Crank 1 VR+
+    ts_name: A08 - Crank 1 VR+
+    type: vr
+
+  - pin: 2
+    function: Crank 1 VR sensors GND
+    type: sgnd
+
+  - pin: 3
+    function: Crank 1 VR sensors shield
+    type: sgnd
+
+  - pin: 4
+    function: Knock sensors shield
+    type: sgnd
+
+  - pin: 5
+    function: Knock input 1
+
+  - pin: 6
+    function: Knock input 1
+
+  - pin: 7
+    function: SSM Tx (5V UART)
+
+  - pin: 8
+    function: SSM Rx (5V UART)
+
+  - pin: 9
+    id: MC33972_PIN_16
+    class: switch_inputs
+    function: Air Condition request Din
+    ts_name: C09 - Air Condition request Din
+    type: av
+
+  - pin: 10
+    id: MC33972_PIN_5
+    class: switch_inputs
+    function: Starter Din
+    ts_name: C10 - Starter Din
+    type: av
+
+  - pin: 11
+    function: "Opt Supply (+12)"
+    type: 5v
+
+  - pin: 12
+    id: MC33972_PIN_6
+    class: switch_inputs
+    function: Memory SW Din
+    ts_name: C12 - Memory SW Din
+    type: av
+
+  - pin: 13
+    id: MC33972_PIN_7
+    class: switch_inputs
+    function: Test SW Din
+    ts_name: C13 - Test SW Din
+    type: av
+
+  - pin: 14
+    id: TLE6240_PIN_4
+    class: outputs
+    function: FPump modulator (low = high flow)
+    ts_name: C14 - FPump modulator
+    type: gp_low
+
+  - pin: 15
+    id: TLE6240_PIN_8
+    class: outputs
+    function: AUX1 OD out
+    ts_name: C15 - AUX1 OD out
+    type: gp_low
+
+  - pin: 16
+    id: TLE6240_PIN_3
+    class: outputs
+    function: Tacho out
+    ts_name: C16 - Tacho out
+    type: gp_low
diff --git a/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml b/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml
new file mode 100644
index 0000000000..4a378feb5b
--- /dev/null
+++ b/firmware/config/boards/subaru_eg33/connectors/D-B62.yaml
@@ -0,0 +1,173 @@
+#26 pin connector
+
+pins:
+
+  - pin: 1
+    id: TLE6240_PIN_12
+    class: outputs
+    function: IDLE close
+    ts_name: D01 - IDLE close
+    type: gp_low
+
+  - pin: 2
+    id: TLE6240_PIN_11
+    class: outputs
+    function: IDLE open
+    ts_name: D02 - IDLE open
+    type: gp_low
+
+  - pin: 3
+    id: TLE6240_PIN_2
+    class: outputs
+    function: FAN 2 relay
+    ts_name: D03 - FAN 2 relay
+    type: gp_low
+
+  - pin: 4
+    id: MC33972_PIN_8
+    class: switch_inputs
+    function: California ID Din
+    ts_name: D04 - California ID Din
+    type: av
+
+  - pin: 5
+    id: GPIOH_7
+    class: outputs
+    function: Self Shutdown
+    ts_name: D05 - Self Shutdown
+    type: gp_high
+
+  - pin: 6
+    id: TLE6240_PIN_10
+    class: outputs
+    function: Absorber purge valve
+    ts_name: D06 - Absorber purge valve
+    type: gp_low
+
+  - pin: 7
+    id: MC33810_0_GD_0
+    class: outputs
+    function: Ignition 1
+    ts_name: D07 - Ignition 1
+    type: ign
+
+  - pin: 8
+    id: MC33810_1_GD_2
+    class: outputs
+    function: Ignition 2
+    ts_name: D08 - Ignition 2
+    type: ign
+
+  - pin: 9
+    id: MC33810_0_GD_1
+    class: outputs
+    function: Ignition 3
+    ts_name: D09 - Ignition 3
+    type: ign
+
+  - pin: 10
+    id: MC33810_1_GD_3
+    class: outputs
+    function: Ignition 4
+    ts_name: D10 - Ignition 4
+    type: ign
+
+  - pin: 11
+    id: MC33810_0_OUT_1
+    class: outputs
+    function: Injector 3
+    ts_name: D11 - Injector 3
+    type: inj
+
+  - pin: 12
+    id: MC33810_1_OUT_0
+    class: outputs
+    function: Injector 2
+    ts_name: D12 - Injector 2
+    type: inj
+
+  - pin: 13
+    id: MC33810_0_OUT_0
+    class: outputs
+    function: Injector 1
+    ts_name: D13 - Injector 1
+    type: inj
+
+  - pin: 14
+    function: Power GND
+    type: pgnd
+
+  - pin: 15
+    function: Ignition GND
+    type: pgnd
+
+  - pin: 16
+    id: MC33810_1_GD_1
+    class: outputs
+    function: Ignition 6
+    ts_name: D10 - Ignition 6
+    type: ign
+
+  - pin: 17
+    id: TLE6240_PIN_1
+    class: outputs
+    function: FAN 1 relay
+    ts_name: D17 - FAN 1 relay
+    type: gp_low
+
+  - pin: 18
+    id: TLE6240_PIN_9
+    class: outputs
+    function: Auxillary air valve
+    ts_name: D18 - Auxillary air valve
+    type: gp_low
+
+  - pin: 19
+    id: TLE6240_PIN_7
+    class: outputs
+    function: Check Engine indicator
+    ts_name: D19 - Check Engine indicator
+    type: gp_low
+
+  - pin: 20
+    id: TLE6240_PIN_16
+    class: outputs
+    function: Inertia-Resonance Super-Charger control
+    ts_name: D20 - Inertia-Resonance Super-Charger control
+    type: gp_low
+
+  - pin: 21
+    id: MC33810_0_GD_3
+    class: outputs
+    function: Ignition 5
+    ts_name: D21 - Ignition 5
+    type: ign
+
+  - pin: 22
+    id: TLE6240_PIN_6
+    class: outputs
+    function: EGR control
+    ts_name: D22 - EGR control
+    type: gp_low
+
+  - pin: 23
+    id: TLE6240_PIN_5
+    class: outputs
+    function: Fuel Pump relay
+    ts_name: D23 - Fuel Pump relay
+    type: gp_low
+
+  - pin: 24
+    function: Injector GND
+    type: pgnd
+
+  - pin: 25
+    function: Injector GND
+    type: pgnd
+
+  - pin: 26
+    id: MC33810_1_OUT_1
+    class: outputs
+    function: Injector 4
+    ts_name: D26 - Injector 4
+    type: inj
diff --git a/firmware/config/boards/subaru_eg33/mapping.yaml b/firmware/config/boards/subaru_eg33/mapping.yaml
deleted file mode 100644
index e2ee2d3771..0000000000
--- a/firmware/config/boards/subaru_eg33/mapping.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-outputs:
-  # MCU
-  GPIOH_7: "    - Self Shutdown"
-  # TLE6240
-  TLE6240_PIN_1:   "D17 - FAN 1"
-  TLE6240_PIN_2:   "D03 - FAN 2"
-  TLE6240_PIN_3:   "C16 - Tacho out"
-  TLE6240_PIN_4:   "C14 - FPump modulator"
-  TLE6240_PIN_5:   "D23 - FPump relay"
-  TLE6240_PIN_6:   "D22 - EGR control"
-  TLE6240_PIN_7:   "D19 - CE indicator"
-  TLE6240_PIN_8:   "C15 - AUX1 out"
-  TLE6240_PIN_9:   "D18 - Auxillary air valve"
-  TLE6240_PIN_10:  "D06 - Absorber purge"
-  TLE6240_PIN_11:  "D02 - IDLE open"
-  TLE6240_PIN_12:  "D01 - IDLE close"
-  TLE6240_PIN_13:  "XP2 - AUX0 out"
-  TLE6240_PIN_14:  "XP2 - AUX1 out"
-  TLE6240_PIN_15:  "B08 - AC clutch"
-  TLE6240_PIN_16:  "D20 - Charge valve"
-  # MC33810s
-  MC33810_0_PIN_1: "D13 - INJ 1"
-  MC33810_0_PIN_2: "D11 - INJ 3"
-  MC33810_0_PIN_3: "A01 - INJ 5"
-  MC33810_0_PIN_4: "XP2 - INJ 7"
-  MC33810_0_PIN_5: "D07 - IGN 1"
-  MC33810_0_PIN_6: "D09 - IGN 3"
-  MC33810_0_PIN_7: "XP2 - IGN 7 (HP)"
-  MC33810_0_PIN_8: "D21 - IGN 5"
-  MC33810_1_PIN_1: "D12 - INJ 2"
-  MC33810_1_PIN_2: "D26 - INJ 4"
-  MC33810_1_PIN_3: "A12 - INJ 6"
-  MC33810_1_PIN_4: "XP6 - INJ 8"
-  MC33810_1_PIN_5: "XP6 - IGN 8 (HP)"
-  MC33810_1_PIN_6: "D16 - IGN 6"
-  MC33810_1_PIN_7: "D08 - IGN 2"
-  MC33810_1_PIN_8: "D10 - IGN 4"
-
-switch_inputs:
-  MC33972_PIN_1:  "TP  - SP1 Din"
-  MC33972_PIN_2:  "TP  - SP2 Din"
-  MC33972_PIN_3:  "TP  - SP3 Din"
-  MC33972_PIN_5:  "C10 - Starter Din"
-  MC33972_PIN_6:  "C12 - Memory SW Din"
-  MC33972_PIN_7:  "C13 - Test SW Din"
-  MC33972_PIN_8:  "D04 - California ID Din"
-  MC33972_PIN_16: "C09 - Air Condition request Din"
-  MC33972_PIN_17: "B12 - IGN Din"
-  MC33972_PIN_19: "B10 - N pos Din"
-  MC33972_PIN_20: "B09 - P pos Din"
-  MC33972_PIN_21: "A20 - Torque Ctrl Din"
-  MC33972_PIN_22: "A19 - AC Ctrl Din"
-
-event_inputs:
-  GPIOH_10: "C01 - Crank #1"
-  GPIOE_9:  "A08 - Crank #2"
-  GPIOH_12: "A07 - Cam"
-  GPIOD_14: "B11 - Speed Din (GPIO)"
-  MC33972_PIN_18: "B11 - Speed Din (MC33972)"
-
-analog_inputs:
-  EFI_ADC_0:  "TP  - AIN 0"
-  EFI_ADC_1:  "int - IGN1 current"
-  EFI_ADC_2:  "int - IGN2 current"
-  EFI_ADC_3:  "B05 - MAF Ain"
-#  EFI_ADC_4:  "n.u."
-  EFI_ADC_6:  "A02 - Battery Ain"
-  EFI_ADC_7:  "int - Knock"
-  EFI_ADC_8:  "A05 - Oxyg #2 Ain"
-  EFI_ADC_9:  "A04 - EGR t Ait"
-  EFI_ADC_10: "--- - Atm P Ain"
-  EFI_ADC_11: "A18 - AUX0 Ain"
-  EFI_ADC_12: "B02 - TPS Ain"
-  EFI_ADC_13: "int - MC33972 DIN"
-  EFI_ADC_14: "A03 - Coolant t Ain"
-  EFI_ADC_15: "A06 - Oxyg #1 Ain"
-#  EFI_ADC3_4:  "XP2 - OPT0"
-#  EFI_ADC3_5:  "n.u."
-#  EFI_ADC3_6:  "n.u."
-#  EFI_ADC3_7:  "n.u."
-#  EFI_ADC3_8:  "n.u."
-#  EFI_ADC3_9:  "XP6 - OPT3"
-#  EFI_ADC3_14: "XP6 - OPT2"
-#  EFI_ADC3_15: "XP2 - OPT1"
-#  MC33972_PIN_4:  "A03 - Coolant t Ain"
-#  MC33972_PIN_9:  "A04 - EGR t Ain"
-#  MC33972_PIN_10: "A06 - Oxyg #1"
-#  MC33972_PIN_11: "A05 - Oxyg #2"
-#  MC33972_PIN_12: "--- - Atm P Ain"
-#  MC33972_PIN_13: "A18 - AUX0 Ain"
-#  MC33972_PIN_14: "B02 - TPS Ain"
-#  MC33972_PIN_15: "B05 - MAF Ain"
\ No newline at end of file
diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp
index 25fce83a58..8dd43a0a7e 100644
--- a/firmware/config/engines/subaru.cpp
+++ b/firmware/config/engines/subaru.cpp
@@ -100,9 +100,9 @@ void setSubaruEG33Defaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	engineConfiguration->canReadEnabled = true;
 	engineConfiguration->canWriteEnabled = false;
 
-	/* Reversed: fully closed - 4.7V, fully opened - 0.9 */
-	engineConfiguration->tpsMin = convertVoltageTo10bitADC(4.7);
-	engineConfiguration->tpsMax = convertVoltageTo10bitADC(0.9);
+	/* Fully closed - 0.9V, fully opened - 4.7 (?) */
+	engineConfiguration->tpsMin = convertVoltageTo10bitADC(0.9);
+	engineConfiguration->tpsMax = convertVoltageTo10bitADC(4.7);
 	engineConfiguration->tpsErrorDetectionTooLow = -10; // -10% open
 	engineConfiguration->tpsErrorDetectionTooHigh = 110; // 110% open
 
diff --git a/firmware/tunerstudio/generated/subaru_eg33_prefix.txt b/firmware/tunerstudio/generated/subaru_eg33_prefix.txt
deleted file mode 100644
index 386feb39e1..0000000000
--- a/firmware/tunerstudio/generated/subaru_eg33_prefix.txt
+++ /dev/null
@@ -1,4 +0,0 @@
- #define output_pin_e_enum "NONE","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","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","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","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","    - Self Shutdown","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","D17 - FAN 1","D03 - FAN 2","C16 - Tacho out","C14 - FPump modulator","D23 - FPump relay","D22 - EGR control","D19 - CE indicator","C15 - AUX1 out","D18 - Auxillary air valve","D06 - Absorber purge","D02 - IDLE open","D01 - IDLE close","XP2 - AUX0 out","XP2 - AUX1 out","B08 - AC clutch","D20 - Charge valve","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
- #define adc_channel_e_enum "NONE","TP  - AIN 0","int - IGN1 current","int - IGN2 current","B05 - MAF Ain","INVALID","INVALID","A02 - Battery Ain","int - Knock","A05 - Oxyg #2 Ain","A04 - EGR t Ait","--- - Atm P Ain","A18 - AUX0 Ain","B02 - TPS Ain","int - MC33972 DIN","A03 - Coolant t Ain","A06 - Oxyg #1 Ain","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","INVALID","INVALID"
- #define brain_input_pin_e_enum "NONE","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","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","INVALID","B11 - Speed Din (GPIO)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","A08 - Crank #2","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C01 - Crank #1","INVALID","A07 - Cam","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","B11 - Speed Din (MC33972)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
- #define switch_input_pin_e_enum "NONE","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","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","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","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","TP  - SP1 Din","TP  - SP2 Din","TP  - SP3 Din","INVALID","C10 - Starter Din","C12 - Memory SW Din","C13 - Test SW Din","D04 - California ID Din","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C09 - Air Condition request Din","B12 - IGN Din","INVALID","B10 - N pos Din","B09 - P pos Din","A20 - Torque Ctrl Din","A19 - AC Ctrl Din","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"