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

SD card: trying to automatically unmount and trying to re-mount

This commit is contained in:
rusefi 2019-09-21 12:41:17 -04:00
parent 36c91eb31b
commit a08d0734dc
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
firmware/hw_layer/mmc_card.cpp
View File

@ -49,6 +49,7 @@ EXTERN_ENGINE;
#define F_SYNC_FREQUENCY 100 #define F_SYNC_FREQUENCY 100
static int totalLoggedBytes = 0; static int totalLoggedBytes = 0;
static int fileCreatedCounter = 0;
static int writeCounter = 0; static int writeCounter = 0;
static int totalWritesCounter = 0; static int totalWritesCounter = 0;
static int totalSyncCounter = 0; static int totalSyncCounter = 0;
@ -108,6 +109,8 @@ static LoggingWithStorage logger("mmcCard");
static int fatFsErrors = 0; static int fatFsErrors = 0;
static void mmcUnMount(void);
static void setSdCardReady(bool value) { static void setSdCardReady(bool value) {
fs_ready = value; fs_ready = value;
} }
@ -160,7 +163,7 @@ static void incLogFileName(void) {
scheduleMsg(&logger, "Got content [%s] size %d", data, result); scheduleMsg(&logger, "Got content [%s] size %d", data, result);
f_close(&FDCurrFile); f_close(&FDCurrFile);
if (result < 5) { if (result < 5) {
data[result] = 0; data[result] = 0;
logFileIndex = atoi(data); logFileIndex = atoi(data);
if (absI(logFileIndex) == ERROR_CODE) { if (absI(logFileIndex) == ERROR_CODE) {
logFileIndex = 1; logFileIndex = 1;
@ -324,26 +327,22 @@ void appendToLog(const char *line) {
FRESULT err = f_write(&FDLogFile, line, lineLength, &bytesWritten); FRESULT err = f_write(&FDLogFile, line, lineLength, &bytesWritten);
if (bytesWritten < lineLength) { if (bytesWritten < lineLength) {
printError("write error or disk full", err); // error or disk full printError("write error or disk full", err); // error or disk full
} mmcUnMount();
writeCounter++; } else {
totalWritesCounter++; writeCounter++;
if (writeCounter >= F_SYNC_FREQUENCY) { totalWritesCounter++;
/** if (writeCounter >= F_SYNC_FREQUENCY) {
* Performance optimization: not f_sync after each line, f_sync is probably a heavy operation /**
* todo: one day someone should actualy measure the relative cost of f_sync * Performance optimization: not f_sync after each line, f_sync is probably a heavy operation
*/ * todo: one day someone should actually measure the relative cost of f_sync
f_sync(&FDLogFile); */
totalSyncCounter++; f_sync(&FDLogFile);
writeCounter = 0; totalSyncCounter++;
writeCounter = 0;
}
} }
unlockSpi(); unlockSpi();
if (engineConfiguration->debugMode == DBG_SD_CARD) {
tsOutputChannels.debugIntField1 = totalLoggedBytes;
tsOutputChannels.debugIntField2 = totalWritesCounter;
tsOutputChannels.debugIntField3 = totalSyncCounter;
}
} }
/* /*
@ -430,6 +429,7 @@ static void MMCmount(void) {
sdStatus = SD_STATE_MOUNTED; sdStatus = SD_STATE_MOUNTED;
incLogFileName(); incLogFileName();
createLogFile(); createLogFile();
fileCreatedCounter++;
scheduleMsg(&logger, "MMC/SD mounted!"); scheduleMsg(&logger, "MMC/SD mounted!");
} else { } else {
sdStatus = SD_STATE_MOUNT_FAILED; sdStatus = SD_STATE_MOUNT_FAILED;
@ -440,6 +440,13 @@ static THD_FUNCTION(MMCmonThread, arg) {
chRegSetThreadName("MMC_Monitor"); chRegSetThreadName("MMC_Monitor");
while (true) { while (true) {
if (engineConfiguration->debugMode == DBG_SD_CARD) {
tsOutputChannels.debugIntField1 = totalLoggedBytes;
tsOutputChannels.debugIntField2 = totalWritesCounter;
tsOutputChannels.debugIntField3 = totalSyncCounter;
tsOutputChannels.debugIntField4 = fileCreatedCounter;
}
// this returns TRUE if SD module is there, even without an SD card? // this returns TRUE if SD module is there, even without an SD card?
if (blkIsInserted(&MMCD1)) { if (blkIsInserted(&MMCD1)) {