andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simpler 'isSdCardEnabled' logic 

only:uaefi
This commit is contained in:
rusefillc 2024-09-19 16:40:51 -04:00
parent 21d0340541
commit a5fc4550d3
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/hw_layer/mmc_card.cpp
View File

@ -342,12 +342,6 @@ static BaseBlockDevice* initializeMmcBlockDevice() {
return nullptr; return nullptr;
} }
if (!engineConfiguration->isSdCardEnabled ||
engineConfiguration->sdCardSpiDevice == SPI_NONE ||
!isBrainPinValid(engineConfiguration->sdCardCsPin)) {
return nullptr;
}
// Configures and activates the MMC peripheral. // Configures and activates the MMC peripheral.
mmcSpiDevice = engineConfiguration->sdCardSpiDevice; mmcSpiDevice = engineConfiguration->sdCardSpiDevice;
@ -390,10 +384,6 @@ static const SDCConfig sdcConfig = {
}; };
static BaseBlockDevice* initializeMmcBlockDevice() { static BaseBlockDevice* initializeMmcBlockDevice() {
if (!engineConfiguration->isSdCardEnabled) {
return nullptr;
}
sdcStart(&EFI_SDC_DEVICE, &sdcConfig); sdcStart(&EFI_SDC_DEVICE, &sdcConfig);
sdStatus = SD_STATE_CONNECTING; sdStatus = SD_STATE_CONNECTING;
if (blkConnect(&EFI_SDC_DEVICE) != HAL_SUCCESS) { if (blkConnect(&EFI_SDC_DEVICE) != HAL_SUCCESS) {
@ -637,7 +627,17 @@ void initEarlyMmcCard() {
#endif // EFI_PROD_CODE #endif // EFI_PROD_CODE
} }
static bool isSdCardEnabled() {
return engineConfiguration->isSdCardEnabled &&
engineConfiguration->sdCardSpiDevice != SPI_NONE &&
isBrainPinValid(engineConfiguration->sdCardCsPin);
}
void initMmcCard() { void initMmcCard() {
if (isSdCardEnabled()) {
// do not even bother starting the thread if SD card is not enabled & configured on start-up
return;
}
chThdCreateStatic(mmcThreadStack, sizeof(mmcThreadStack), PRIO_MMC, (tfunc_t)(void*) MMCmonThread, NULL); chThdCreateStatic(mmcThreadStack, sizeof(mmcThreadStack), PRIO_MMC, (tfunc_t)(void*) MMCmonThread, NULL);
} }

3
firmware/tunerstudio/tunerstudio.template.ini
View File

@ -295,6 +295,9 @@ enable2ndByteCanID = false
maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue : throttlePedalWOTVoltage }
maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
requiresPowerCycle = isSdCardEnabled
requiresPowerCycle = sdCardSpiDevice
requiresPowerCycle = sdCardCsPin
requiresPowerCycle = boardUseCanTerminator requiresPowerCycle = boardUseCanTerminator
requiresPowerCycle = injectorCompensationMode requiresPowerCycle = injectorCompensationMode
requiresPowerCycle = lps25BaroSensorScl requiresPowerCycle = lps25BaroSensorScl