diff --git a/firmware/config/boards/cypress/board_configuration.cpp b/firmware/config/boards/cypress/board_configuration.cpp index 14da39be02..02a526595d 100644 --- a/firmware/config/boards/cypress/board_configuration.cpp +++ b/firmware/config/boards/cypress/board_configuration.cpp @@ -91,7 +91,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->tps2_2AdcChannel = EFI_ADC_NONE; engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_NONE; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->hipOutputChannel = EFI_ADC_NONE; engineConfiguration->fuelLevelSensor = EFI_ADC_NONE; engineConfiguration->oilPressure.hwChannel = EFI_ADC_NONE; diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index 8f0543a8f7..dd8685e1cf 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -46,7 +46,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->afr.hwChannel = EFI_ADC_1; diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index 12fc462fc0..914649191a 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -75,7 +75,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1SecondaryMin = 1000; engineConfiguration->tps1SecondaryMax = 0; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->afr.hwChannel = EFI_ADC_1; diff --git a/firmware/config/boards/hellen/alphax-8chan-revA/board_configuration.cpp b/firmware/config/boards/hellen/alphax-8chan-revA/board_configuration.cpp index 9de2a1db03..64970d4a95 100644 --- a/firmware/config/boards/hellen/alphax-8chan-revA/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-8chan-revA/board_configuration.cpp @@ -83,7 +83,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1SecondaryMin = 1000; engineConfiguration->tps1SecondaryMax = 0; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2; engineConfiguration->baroSensor.type = MT_MPXH6400; // engineConfiguration->baroSensor.hwChannel = H144_IN_MAP3; diff --git a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp index c1c0b137c3..63f25b7676 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-8chan/board_configuration.cpp @@ -89,7 +89,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1SecondaryMin = 1000; engineConfiguration->tps1SecondaryMax = 0; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + // engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2; engineConfiguration->baroSensor.type = MT_MPXH6400; // engineConfiguration->baroSensor.hwChannel = H144_IN_MAP3; diff --git a/firmware/config/boards/hellen/hellen-112-17/board_configuration.cpp b/firmware/config/boards/hellen/hellen-112-17/board_configuration.cpp index dd708510e8..4c82860d46 100644 --- a/firmware/config/boards/hellen/hellen-112-17/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-112-17/board_configuration.cpp @@ -32,10 +32,8 @@ static void setupDefaultSensorInputs() { setPPSInputs(MM100_IN_PPS_ANALOG, MM100_IN_AUX2_ANALOG); - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; - engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1; -// engineConfiguration->afr.hwChannel = EFI_ADC_NONE; + engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1; engineConfiguration->clt.adcChannel = MM100_IN_CLT_ANALOG; @@ -108,7 +106,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - engineConfiguration->enableVerboseCanTx = true; engineConfiguration->etbFunctions[0] = DC_Throttle1; diff --git a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp index dbfd76c2fa..ef2829aebe 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp @@ -30,7 +30,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1; engineConfiguration->afr.hwChannel = EFI_ADC_NONE; @@ -129,7 +129,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - engineConfiguration->enableVerboseCanTx = true; engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[1] = DC_Wastegate; diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index d65e20b7dd..2d61ab7194 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -37,7 +37,7 @@ static void setupDefaultSensorInputs() { setTPS1Inputs(H144_IN_TPS, H144_IN_AUX1); setPPSInputs(EFI_ADC_3, EFI_ADC_14); - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1; engineConfiguration->afr.hwChannel = EFI_ADC_NONE; diff --git a/firmware/config/boards/hellen/hellen81/board_configuration.cpp b/firmware/config/boards/hellen/hellen81/board_configuration.cpp index 03d65416eb..084a51941f 100644 --- a/firmware/config/boards/hellen/hellen81/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen81/board_configuration.cpp @@ -48,7 +48,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->tps1_1AdcChannel = EFI_ADC_4; - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; + engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; engineConfiguration->afr.hwChannel = EFI_ADC_0; // ADC1_16