rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proteus meta

This commit is contained in:
Matthew Kennedy 2022-05-04 13:28:20 -07:00 committed by rusefillc
parent 492be3188d
commit e1b2fcb2bc
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/proteus/connectors/white35.yaml
View File

@ -72,7 +72,7 @@ pins:
id: [A2, EFI_ADC_2] id: [A2, EFI_ADC_2]
class: [switch_inputs, analog_inputs] class: [switch_inputs, analog_inputs]
ts_name: Analog Volt 7 ts_name: Analog Volt 7
function: "Analog Voltage Input #7" function: "Analog Voltage Input #7 (PPS2)"
type: av type: av
- pin: 17 - pin: 17

6
firmware/config/boards/proteus_meta.h
View File

@ -94,25 +94,29 @@
// PC2 // PC2
#define PROTEUS_IN_ANALOG_VOLT_3 EFI_ADC_12 #define PROTEUS_IN_ANALOG_VOLT_3 EFI_ADC_12
#define PROTEUS_IN_TPS1_2 PROTEUS_IN_ANALOG_VOLT_3
// PC3 // PC3
#define PROTEUS_IN_ANALOG_VOLT_4 EFI_ADC_13 #define PROTEUS_IN_ANALOG_VOLT_4 EFI_ADC_13
#define PROTEUS_IN_TPS2_1 PROTEUS_IN_ANALOG_VOLT_4
// PA0 // PA0
#define PROTEUS_IN_ANALOG_VOLT_5 EFI_ADC_0 #define PROTEUS_IN_ANALOG_VOLT_5 EFI_ADC_0
// PA1 // PA1
#define PROTEUS_IN_ANALOG_VOLT_6 EFI_ADC_1 #define PROTEUS_IN_ANALOG_VOLT_6 EFI_ADC_1
#define PROTEUS_IN_PPS PROTEUS_IN_ANALOG_VOLT_6
// PA2 // PA2
#define PROTEUS_IN_ANALOG_VOLT_7 EFI_ADC_2 #define PROTEUS_IN_ANALOG_VOLT_7 EFI_ADC_2
#define PROTEUS_IN_PPS2 PROTEUS_IN_ANALOG_VOLT_7
// PA3 // PA3
#define PROTEUS_IN_ANALOG_VOLT_8 EFI_ADC_3 #define PROTEUS_IN_ANALOG_VOLT_8 EFI_ADC_3
// PA4 // PA4
#define PROTEUS_IN_ANALOG_VOLT_9 EFI_ADC_4 #define PROTEUS_IN_ANALOG_VOLT_9 EFI_ADC_4
#define PROTEUS_IN_PPS PROTEUS_IN_ANALOG_VOLT_9
// PA5 // PA5
#define PROTEUS_IN_ANALOG_VOLT_10 EFI_ADC_5 #define PROTEUS_IN_ANALOG_VOLT_10 EFI_ADC_5

4
firmware/config/engines/bmw_m73.cpp
View File

@ -251,8 +251,7 @@ void setEngineBMW_M73_Proteus() {
m73engine(); m73engine();
// 12 injectors defined in boards/proteus/board_configuration.cpp // 12 injectors defined in boards/proteus/board_configuration.cpp
// set_analog_input_pin pps pa4
engineConfiguration->throttlePedalPositionAdcChannel = PROTEUS_IN_PPS;
strcpy(engineConfiguration->vehicleName, "Using Proteus"); strcpy(engineConfiguration->vehicleName, "Using Proteus");
@ -278,6 +277,7 @@ void setEngineBMW_M73_Proteus() {
engineConfiguration->startStopButtonPin = Gpio::E12; engineConfiguration->startStopButtonPin = Gpio::E12;
engineConfiguration->startStopButtonMode = PI_PULLUP; engineConfiguration->startStopButtonMode = PI_PULLUP;
// tps and pps
setProteusHitachiEtbDefaults(); setProteusHitachiEtbDefaults();
engineConfiguration->useETBforIdleControl = true; engineConfiguration->useETBforIdleControl = true;

8
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -1073,16 +1073,16 @@ void setProteusHitachiEtbDefaults() {
setHitachiEtbCalibration(); setHitachiEtbCalibration();
// EFI_ADC_12: "Analog Volt 3" // EFI_ADC_12: "Analog Volt 3"
engineConfiguration->tps1_2AdcChannel = EFI_ADC_12; engineConfiguration->tps1_2AdcChannel = PROTEUS_IN_TPS1_2;
// EFI_ADC_13: "Analog Volt 4" // EFI_ADC_13: "Analog Volt 4"
engineConfiguration->tps2_1AdcChannel = EFI_ADC_13; engineConfiguration->tps2_1AdcChannel = PROTEUS_IN_TPS2_1;
// EFI_ADC_0: "Analog Volt 5" // EFI_ADC_0: "Analog Volt 5"
engineConfiguration->tps2_2AdcChannel = EFI_ADC_0; engineConfiguration->tps2_2AdcChannel = EFI_ADC_0;
// EFI_ADC_1: "Analog Volt 6" // EFI_ADC_1: "Analog Volt 6"
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_1; engineConfiguration->throttlePedalPositionAdcChannel = PROTEUS_IN_PPS;
// EFI_ADC_2: "Analog Volt 7" // EFI_ADC_2: "Analog Volt 7"
engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_2; engineConfiguration->throttlePedalPositionSecondAdcChannel = PROTEUS_IN_PPS2;
} }
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */ #endif /* EFI_ELECTRONIC_THROTTLE_BODY */