Finding other places to squeeze space for the DESFire config (Log and…

… terminal buffers stored on the stack -- adding buffer full messages for INFO)
gcammisa · Feb 12, 2022 · 3974786 · 3974786
1 parent a4672ff
commit 3974786
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Firmware/Chameleon-Mini/Log.c b/Firmware/Chameleon-Mini/Log.c
@@ -213,7 +213,6 @@ void LogGetModeList(char *List, uint16_t BufferSize) {
 void LogSRAMToFRAM(void) {
     if (LogMemLeft < LOG_SIZE) {
         uint16_t FRAM_Free = FRAM_LOG_SIZE - (LogFRAMAddr - FRAM_LOG_START_ADDR);
-
         if (FRAM_Free >= LOG_SIZE - LogMemLeft) {
             MemoryWriteBlock(LogMem, LogFRAMAddr, LOG_SIZE - LogMemLeft);
             LogFRAMAddr += LOG_SIZE - LogMemLeft;
@@ -223,13 +222,15 @@ void LogSRAMToFRAM(void) {
             // not everything fits in FRAM, simply write as much as possible to FRAM
             MemoryWriteBlock(LogMem, LogFRAMAddr, FRAM_Free);
             memmove(LogMem, LogMem + FRAM_Free, LOG_SIZE - FRAM_Free); // FRAM_Free is < LOG_SIZE - LogMemLeft and thus also < LOG_SIZE
-
             LogMemPtr -= FRAM_Free;
             LogMemLeft += FRAM_Free;
             LogFRAMAddr += FRAM_Free;
             MemoryWriteBlock(&LogFRAMAddr, FRAM_LOG_ADDR_ADDR, 2);
         } else {
-            // TODO: handle the case in which the FRAM is full
+            // TODO: handle the case in which the FRAM is full ???
+            // Notify the user by repeatedly blinking the LED:
+            LEDHook(LED_LOG_MEM_FULL, LED_BLINK_8X);
+            LEDHook(LED_LOG_MEM_FULL, LED_BLINK_8X);
         }
     }
 }
diff --git a/Firmware/Chameleon-Mini/Terminal/CommandLine.c b/Firmware/Chameleon-Mini/Terminal/CommandLine.c
@@ -482,6 +482,13 @@ static void DecodeCommand(void) {
         /* Send optional answer */
         TerminalSendString(pTerminalBuffer);
         TerminalSendStringP(PSTR(OPTIONAL_ANSWER_TRAILER));
+        if (StringLength(pTerminalBuffer, TERMINAL_BUFFER_SIZE) + 1 >= TERMINAL_BUFFER_SIZE) {
+            // Notify the user that the command line output is truncated. This can come up in the
+            // 'CONFIG=MF_DESFIRE' variants where the Makefile setting 'MEMORY_LIMITED_TESTING' is
+            // enabled by default to save space for other necessary components.
+            TerminalSendStringP(PSTR("-- OUTPUT TRUNCATED --"));
+            TerminalSendStringP(PSTR(OPTIONAL_ANSWER_TRAILER));
+        }
     }
 }