minor proteus default config & mapping fixes (#1113)

* vbatt and can

* correct comment

* fix mapping
This commit is contained in:
Matthew Kennedy 2020-01-29 20:32:48 -08:00 committed by GitHub
parent ff3329655a
commit d004efa844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions

View File

@ -65,8 +65,8 @@ static void setupVbatt() {
// 5.6k high side/10k low side = 1.56 ratio divider
engineConfiguration->analogInputDividerCoefficient = 1.56f;
// 47k high side/10k low side = 4.7
engineConfiguration->vbattDividerCoeff = (57.0f / 10.0f);
// 82k high side/10k low side = 9.2
engineConfiguration->vbattDividerCoeff = (92.0f / 10.0f);
//engineConfiguration->vbattAdcChannel = TODO;
engineConfiguration->adcVcc = 3.3f;
@ -106,9 +106,14 @@ static void setupEtb() {
engineConfiguration->etbFreq = 800;
}
static void setupCanPins() {
engineConfiguration->canTxPin = GPIOD_1;
engineConfiguration->canRxPin = GPIOD_0;
}
static void setupDefaultSensorInputs() {
// trigger inputs
// VR channel 1 as default - others not set
// Digital channel 1 as default - others not set
engineConfiguration->triggerInputPins[0] = GPIOC_6;
engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED;
@ -150,6 +155,7 @@ void setBoardConfigurationOverrides(void) {
setLedPins();
setupVbatt();
setupEtb();
setupCanPins();
// "required" hardware is done - set some reasonable defaults
setupDefaultSensorInputs();

View File

@ -41,8 +41,8 @@ event_inputs:
GPIOE_13: "Digital 4"
GPIOE_14: "Digital 5"
GPIOE_15: "Digital 6"
GPIOE_7: "Digital 7"
GPIOE_8: "Digital 8"
GPIOE_7: "VR 1"
GPIOE_8: "VR 2"
switch_inputs:
GPIOC_6: "Digital 1"
@ -51,8 +51,6 @@ switch_inputs:
GPIOE_13: "Digital 4"
GPIOE_14: "Digital 5"
GPIOE_15: "Digital 6"
GPIOE_7: "Digital 7"
GPIOE_8: "Digital 8"
analog_inputs:
EFI_ADC_0: "Analog Volt 5"