From 201b1db6a61e5e20d27f53d0a6334c2b35818263 Mon Sep 17 00:00:00 2001
From: binaryDiv <binarydiv@gmail.com>
Date: Sat, 17 Apr 2021 00:11:04 +0200
Subject: [PATCH] Replace "ERR" responses with "ERROR"

---
 firmware/src/commands.c | 19 ++++++++-----------
 firmware/src/parsing.c  |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/firmware/src/commands.c b/firmware/src/commands.c
index 51b8a8f..43ec213 100644
--- a/firmware/src/commands.c
+++ b/firmware/src/commands.c
@@ -46,7 +46,7 @@ void executeCommand(CommandLine cmdLine) {
     }
     else {
         // unknown command: return error message
-        uartPutLine("ERR invalid command");
+        uartPutLine("ERROR invalid command");
     }
 }
 
@@ -89,14 +89,14 @@ void commandHelp() {
 
 void commandRead(char* arg) {
     if (arg == NULL) {
-        uartPutLine("ERR READ needs an address or address range");
+        uartPutLine("ERROR READ needs an address or address range");
         return;
     }
 
     // Parse address(es)
     AddressRange range = parseAddressRange(arg);
     if (!range.isValid) {
-        uartPutLine("ERR invalid address format");
+        uartPutLine("ERROR invalid address format");
         return;
     }
 
@@ -136,30 +136,27 @@ void commandRead(char* arg) {
 
 void commandWrite(char* arg) {
     if (arg == NULL) {
-        uartPutLine("ERR WRITE needs a start address");
+        uartPutLine("ERROR WRITE needs a start address");
         return;
     }
 
     // Parse address
-    AddressRange range = parseSingleAddress(arg);
-    if (!range.isValid) {
-        uartPutLine("ERR invalid address format");
+        uartPutLine("ERROR invalid address format");
         return;
     }
 
     // Only binary mode
     if (!binary_mode) {
-        uartPutLine("ERR WRITE in ASCII mode is not implemented");
+        uartPutLine("ERROR WRITE in ASCII mode is not implemented");
         return;
     }
 
     // TODO read data from input and write to EEPROM
-    uartPutLine("ERR not implemented");
+    uartPutLine("ERROR not implemented");
 }
 
 void commandErase() {
-    // TODO
-    uartPutLine("ERR not implemented");
+    uartPutLine("ERROR not implemented");
 }
 
 // TESTREAD command: for testing purposes, reads a few bytes and returns them in a human readable format.
diff --git a/firmware/src/parsing.c b/firmware/src/parsing.c
index 7df21e7..41ec148 100644
--- a/firmware/src/parsing.c
+++ b/firmware/src/parsing.c
@@ -28,7 +28,7 @@ CommandLine readNextCommand(char* buffer, uint8_t bufferLength) {
 
         if (readChars >= bufferLength - 1) {
             // Reading was aborted after bufferLength-1 characters to prevent buffer overflow.
-            uartPutLine("ERR buffer overflow, discarding line");
+            uartPutLine("ERROR buffer overflow, discarding line");
 
             // Discard everything until we read an actual end of line
             for (unsigned char c = 0; c != '\n' && c != '\r'; c = uartGetChar());