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

switch (#1839) 

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2020-09-30 22:36:33 -07:00 committed by GitHub
parent 737a9cda53
commit fb85082e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/hw_layer/mmc_card.cpp
View File

@ -140,7 +140,7 @@ static void sdStatistics(void) {
printMmcPinout();
scheduleMsg(&logger, "SD enabled=%s status=%s", boolToString(CONFIG(isSdCardEnabled)),
sdStatus);
printSpiConfig(&logger, "SD", engineConfiguration->sdCardSpiDevice);
printSpiConfig(&logger, "SD", CONFIG(sdCardSpiDevice));
if (isSdCardAlive()) {
scheduleMsg(&logger, "filename=%s size=%d", logName, totalLoggedBytes);
}
@ -444,7 +444,7 @@ static THD_FUNCTION(MMCmonThread, arg) {
chRegSetThreadName("MMC_Monitor");
while (true) {
if (engineConfiguration->debugMode == DBG_SD_CARD) {
if (CONFIG(debugMode) == DBG_SD_CARD) {
tsOutputChannels.debugIntField1 = totalLoggedBytes;
tsOutputChannels.debugIntField2 = totalWritesCounter;
tsOutputChannels.debugIntField3 = totalSyncCounter;
@ -467,8 +467,9 @@ static THD_FUNCTION(MMCmonThread, arg) {
chThdSleepMilliseconds(100);
}
if (engineConfiguration->sdCardPeriodMs > 0) {
chThdSleepMilliseconds(engineConfiguration->sdCardPeriodMs);
auto period = CONFIG(sdCardPeriodMs);
if (period > 0) {
chThdSleepMilliseconds(period);
}
}
}
@ -487,7 +488,7 @@ void initMmcCard(void) {
// todo: reuse initSpiCs method?
hs_spicfg.ssport = ls_spicfg.ssport = getHwPort("mmc", CONFIG(sdCardCsPin));
hs_spicfg.sspad = ls_spicfg.sspad = getHwPin("mmc", CONFIG(sdCardCsPin));
mmccfg.spip = getSpiDevice(engineConfiguration->sdCardSpiDevice);
mmccfg.spip = getSpiDevice(CONFIG(sdCardSpiDevice));
/**
* FYI: SPI does not work with CCM memory, be sure to have main() stack in RAM, not in CCMRAM