Merge pull request #155 from forntoh/logging/improvements

Add more logging functions
forntoh · Jan 29, 2024 · c115305 · c115305
2 parents 6318414 + 0b9f5f5
commit c115305
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/LcdMenu.h b/src/LcdMenu.h
@@ -410,7 +410,7 @@ class LcdMenu {
         if (isAtTheStart() || isEditModeEnabled) return;
         cursorPosition--;
         // Log
-        printCmd(F("UP"));
+        printCmd(F("UP"), cursorPosition);
         //
         // determine if cursor is at the top of the screen
         //
@@ -434,7 +434,7 @@ class LcdMenu {
         if (isAtTheEnd() || isEditModeEnabled) return;
         cursorPosition++;
         // Log
-        printCmd(F("DOWN"));
+        printCmd(F("DOWN"), cursorPosition);
         //
         // determine if cursor is at the bottom of the screen
         //
@@ -457,9 +457,9 @@ class LcdMenu {
      * - Toggle the state of an item.
      */
     void enter() {
-        // Log
-        printCmd(F("ENTER"));
         MenuItem* item = currentMenuTable[cursorPosition];
+        // Log
+        printCmd(F("ENTER"), item->getType());
         //
         // determine the type of menu entry, then execute it
         //
@@ -716,12 +716,12 @@ class LcdMenu {
         MenuItem* item = currentMenuTable[cursorPosition];
         //
         if (item->getType() != MENU_ITEM_INPUT) return;
-        // Log
-        printCmd(F("BACKSPACE"));
         //
         uint8_t p = blinkerPosition - (strlen(item->getText()) + 2) - 1;
         remove(item->getValue(), p, 1);
-
+        // Log
+        printCmd(F("BACKSPACE"), item->getValue());
+        //
         blinkerPosition--;
         update();
     }
@@ -798,12 +798,12 @@ class LcdMenu {
         MenuItem* item = currentMenuTable[cursorPosition];
         //
         if (item->getType() != MENU_ITEM_INPUT) return;
-        // Log
-        printCmd(F("CLEAR"));
         //
         // set the value
         //
         item->setValue((char*)"");
+        // Log
+        printCmd(F("CLEAR"), item->getValue());
         //
         // update blinker position
         //

diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -61,6 +61,13 @@ void printCmd(const __FlashStringHelper* command, const char value) {
     Serial.println(value);
 }
 
+void printCmd(const __FlashStringHelper* command, const uint8_t value) {
+    Serial.print(F("#CMD# "));
+    Serial.print(command);
+    Serial.print(F("="));
+    Serial.println(value, DEC);
+}
+
 void printCmd(const __FlashStringHelper* command, const char* value) {
     Serial.print(F("#CMD# "));
     Serial.print(command);

diff --git a/src/utils/utils.h b/src/utils/utils.h
@@ -21,6 +21,8 @@ void printCmd(const __FlashStringHelper* command);
 
 void printCmd(const __FlashStringHelper* command, const char value);
 
+void printCmd(const __FlashStringHelper* command, const uint8_t value);
+
 void printCmd(const __FlashStringHelper* command, const char* value);
 
 #endif