Focus: Merge the eeprom.dump and eeprom.upload commands

Fixes #2.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

src/Kaleidoscope/EEPROM-Settings-Focus.cpp

@@ -60,34 +60,35 @@ namespace FocusHooks {
 
   bool eeprom (const char *command) {
     enum {
+      CONTENTS,
       FREE,
-      DUMP,
-      UPLOAD,
     } subCommand;
 
-    if (strcmp_P (command, PSTR ("eeprom.dump")) == 0)
+    if (strcmp_P (command, PSTR ("eeprom.contents")) == 0)
-      subCommand = DUMP;
+      subCommand = CONTENTS;
-    else if (strcmp_P (command, PSTR ("eeprom.upload")) == 0)
-      subCommand = UPLOAD;
     else if (strcmp_P (command, PSTR ("eeprom.free")) == 0)
       subCommand = FREE;
     else
       return false;
 
     switch (subCommand) {
-    case DUMP:
+    case CONTENTS: {
-      for (uint16_t i = 0; i < EEPROM.length (); i++) {
+      if (Serial.peek () == '\n') {
-        uint8_t d = EEPROM[i];
+        for (uint16_t i = 0; i < EEPROM.length (); i++) {
-        Focus.printNumber (d);
+          uint8_t d = EEPROM[i];
-        Focus.printSpace ();
+          Focus.printNumber (d);
-      }
+          Focus.printSpace ();
-      break;
+        }
-    case UPLOAD:
+        Serial.println ();
-      for (uint16_t i = 0; i < EEPROM.length (); i++) {
+      } else {
-        uint8_t d = Serial.parseInt ();
+        for (uint16_t i = 0; i < EEPROM.length (); i++) {
-        EEPROM.update (i, d);
+          uint8_t d = Serial.parseInt ();
+          EEPROM.update (i, d);
+        }
       }
+
       break;
+    }
     case FREE:
       Serial.println (EEPROM.length () - EEPROMSettings.used ());
       break;