FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring: helper method

This commit is contained in:
rusefillc 2022-10-30 00:17:42 -04:00
parent fa3fed1ffd
commit d6f6dd3a56
15 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp
View File

@ -74,7 +74,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = Gpio::Unassigned;
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2;

1
firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp
View File

@ -101,7 +101,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
setPPSInputs(H144_IN_PPS, H144_IN_AUX2);

1
firmware/config/boards/hellen/harley81/board_configuration.cpp
View File

@ -92,7 +92,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps1_2AdcChannel = H144_IN_O2S2;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
setPPSInputs(H144_IN_PPS, H144_IN_AUX1);

1
firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp
View File

@ -78,7 +78,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
setPPSInputs(H144_IN_PPS, H144_IN_AUX2);

1
firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp
View File

@ -67,7 +67,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = H144_IN_CAM;
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_10;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_11;

3
firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
View File

@ -71,8 +71,7 @@ static void setupDefaultSensorInputs() {
// todo: this requires unit test change
engineConfiguration->camInputs[1 * CAMS_PER_BANK] = H144_IN_D_AUX4;
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1;
setTPS1Inputs(H144_IN_TPS, H144_IN_AUX1);
setPPSInputs(H144_IN_PPS, EFI_ADC_14);
engineConfiguration->mafAdcChannel = EFI_ADC_10;

2
firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
View File

@ -72,8 +72,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; // 92 - TPS 1
engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
// 34 In PPS1
// 35 In PPS2
setPPSInputs(H144_IN_PPS, H144_IN_AUX2);

1
firmware/config/boards/hellen/hellen128/board_configuration.cpp
View File

@ -75,7 +75,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->tps1_1AdcChannel = EFI_ADC_4;
engineConfiguration->tps1_2AdcChannel = EFI_ADC_8;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = H144_IN_MAP1;
engineConfiguration->map.sensor.hwChannel = H144_IN_MAP2;

1
firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
View File

@ -72,7 +72,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = Gpio::Unassigned;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_4;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_10;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_11;

1
firmware/config/boards/hellen/hellen72/board_configuration.cpp
View File

@ -73,7 +73,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = Gpio::A6;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_4;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_10;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_11;

1
firmware/config/boards/hellen/hellen81/board_configuration.cpp
View File

@ -82,7 +82,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = Gpio::A6;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_4;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_10;

1
firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp
View File

@ -67,7 +67,6 @@ static void setupDefaultSensorInputs() {
engineConfiguration->camInputs[0] = Gpio::Unassigned;
engineConfiguration->tps1_1AdcChannel = H144_IN_TPS;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_10;
engineConfiguration->map.sensor.hwChannel = H144_IN_MAP3;

2
firmware/config/boards/microrusefi/board_configuration.cpp
View File

@ -128,8 +128,6 @@ static void setupDefaultSensorInputs() {
// vehicles without TPS or for first start without TPS one would have to turn in off
// to avoid cranking corrections based on wrong TPS data
engineConfiguration->tps1_1AdcChannel = MRE_IN_TPS;
engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
engineConfiguration->map.sensor.hwChannel = MRE_IN_MAP;

5
firmware/controllers/algo/defaults/default_base_engine.cpp
View File

@ -102,6 +102,11 @@ void setPPSInputs(adc_channel_e pps1, adc_channel_e pps2) {
engineConfiguration->throttlePedalPositionSecondAdcChannel = pps2;
}
void setTPS1Inputs(adc_channel_e tps1, adc_channel_e tps2) {
engineConfiguration->tps1_1AdcChannel = tps1;
engineConfiguration->tps1_2AdcChannel = tps2;
}
void setPPSCalibration(float primaryUp, float primaryDown, float secondaryUp, float secondaryDown) {
engineConfiguration->throttlePedalUpVoltage = primaryUp;
engineConfiguration->throttlePedalWOTVoltage = primaryDown;

1
firmware/controllers/algo/defaults/defaults.h
View File

@ -8,4 +8,5 @@ void setDefaultFuel();
void setDefaultIgnition();
void setDefaultCranking();
void setPPSInputs(adc_channel_e pps1, adc_channel_e pps2);
void setTPS1Inputs(adc_channel_e tps1, adc_channel_e tps2);
void setPPSCalibration(float primaryUp, float primaryDown, float secondaryUp, float secondaryDown);