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

proteus SD card defaults (#1796) 

* proteus SD defaults

* disable serial console pins
This commit is contained in:
Matthew Kennedy 2020-09-14 00:54:25 -07:00 committed by GitHub
parent e3600a8f24
commit a62089e590
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/proteus/board.mk
View File

@ -22,7 +22,7 @@ else
endif endif
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_SOFTWARE_KNOCK=TRUE DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_SOFTWARE_KNOCK=TRUE -DEFI_CONSOLE_TX_BRAIN_PIN=GPIO_UNASSIGNED -DEFI_CONSOLE_RX_BRAIN_PIN=GPIO_UNASSIGNED
# Proteus <=v0.2 needs ADC hack - vbatt is on ADC3 # Proteus <=v0.2 needs ADC hack - vbatt is on ADC3
ifeq ($(PROTEUS_LEGACY),TRUE) ifeq ($(PROTEUS_LEGACY),TRUE)

13
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -139,6 +139,18 @@ static void setupDefaultSensorInputs() {
engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; engineConfiguration->map.sensor.hwChannel = EFI_ADC_10;
} }
static void setupSdCard() {
engineConfiguration->isSdCardEnabled = true;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->sdCardCsPin = GPIOD_2;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->spi3sckPin = GPIOC_10;
engineConfiguration->spi3misoPin = GPIOC_11;
engineConfiguration->spi3mosiPin = GPIOC_12;
}
void setPinConfigurationOverrides(void) { void setPinConfigurationOverrides(void) {
} }
@ -164,6 +176,7 @@ void setBoardConfigurationOverrides(void) {
setLedPins(); setLedPins();
setupVbatt(); setupVbatt();
setupEtb(); setupEtb();
setupSdCard();
// "required" hardware is done - set some reasonable defaults // "required" hardware is done - set some reasonable defaults
setupDefaultSensorInputs(); setupDefaultSensorInputs();

5
firmware/hw_layer/io_pins.cpp
View File

@ -48,6 +48,11 @@ bool efiReadPin(brain_pin_e pin) {
*/ */
void efiSetPadMode(const char *msg, brain_pin_e brainPin, iomode_t mode) void efiSetPadMode(const char *msg, brain_pin_e brainPin, iomode_t mode)
{ {
if (brainPin == GPIO_UNASSIGNED) {
// No pin configured, nothing to do here.
return;
}
bool wasUsed = brain_pin_markUsed(brainPin, msg); bool wasUsed = brain_pin_markUsed(brainPin, msg);
if (!wasUsed) { if (!wasUsed) {