fixup! added preferences commands in command handler

Author: andreagilardoni

main/CommandHandler.cpp

@@ -2076,6 +2076,7 @@ int socket_getpeername(const uint8_t command[], uint8_t response[])
 #include "Preferences.h"
 
 Preferences preferences;
+const char PREF_TAG[] = "preferences";
 
 int pref_begin(const uint8_t command[], uint8_t response[])
 {
@@ -2100,7 +2101,9 @@ int pref_begin(const uint8_t command[], uint8_t response[])
   const uint8_t* command_ptr = &command[3];
 
   if(nargs < 1 && nargs > 3) {
-    // TODO error
+    ESP_LOGE(PREF_TAG, "Prefrences begin wrong number of arguments");
+    response[4] = 255;
+    goto error;
   }
 
   memset(store_name, 0x00, sizeof(store_name));
@@ -2125,12 +2128,12 @@ int pref_begin(const uint8_t command[], uint8_t response[])
     partition_label_ptr = command_ptr;
   }
 
+  response[4] = preferences.begin(store_name, readonly, (char*)partition_label_ptr) ? 0 : 1;
+
+error:
   response[2] = 1;          // number of parameters
   response[3] = 1;          // length of first parameter
-  // result of Preferences begin operation
-  response[4] = preferences.begin(store_name, readonly, (char*)partition_label_ptr) ? 1 : 0;
-  // response has to start ad position 2, and has to take into account
-  // 0xee that is put after the function being called
+
   return 6;
 }
 
@@ -2151,7 +2154,7 @@ int pref_clear(const uint8_t command[], uint8_t response[])
 
   response[2] = 1;                   // number of parameters
   response[3] = 1;                   // length of first parameter
-  response[4] = preferences.clear() ? 1 : 0; // result of Preferences clear operation
+  response[4] = preferences.clear() ? 0 : 1; // result of Preferences clear operation
 
   // response has to start ad position 2, and has to take into account
   // 0xee that is put after the function being called
@@ -2174,16 +2177,19 @@ int pref_remove(const uint8_t command[], uint8_t response[])
   const uint8_t* command_ptr = &command[3];
 
   if(nargs != 1) {
-    // TODO error
+    ESP_LOGE(PREF_TAG, "Prefrences remove wrong number of arguments");
+    response[4] = 255;
+    goto error;
   }
 
   memset(key, 0x00, sizeof(key));
   memcpy(key, command_ptr+1, *command_ptr);
   key[*command_ptr] = '\0';
 
+  response[4] = preferences.remove(key) ? 0 : 1; // result of Preferences end operation
+error:
   response[2] = 1;                 // number of parameters
   response[3] = 1;                 // length of first parameter
-  response[4] = preferences.remove(key) ? 1 : 0; // result of Preferences end operation
 
   // response has to start ad position 2, and has to take into account
   // 0xee that is put after the function being called
@@ -2209,7 +2215,11 @@ int pref_len(const uint8_t command[], uint8_t response[])
   uint32_t len = 0;
 
   if(nargs != 1) {
-    // TODO error
+    ESP_LOGE(PREF_TAG, "Prefrences length wrong number of arguments");
+    response[2] = 1;
+    response[3] = 1;
+    response[4] = 255;
+    return 6;
   }
 
   memset(key, 0x00, sizeof(key));
@@ -2222,10 +2232,10 @@ int pref_len(const uint8_t command[], uint8_t response[])
   response[3] = 4;          // length of first parameter
 
   // write the result in big endian into the response buffer
-  response[7] = (len >> 24) & 0xff;
-  response[6] = (len >> 16) & 0xff;
-  response[5] = (len >> 8)  & 0xff;
   response[4] = (len >> 0)  & 0xff;
+  response[5] = (len >> 8)  & 0xff;
+  response[6] = (len >> 16) & 0xff;
+  response[7] = (len >> 24) & 0xff;
 
   return 9;
 }
@@ -2244,10 +2254,10 @@ int pref_stat(const uint8_t command[], uint8_t response[])
   response[3] = 4;          // length of first parameter
 
   // write the result in big endian into the response buffer
-  response[7] = (res >> 24) & 0xff;
-  response[6] = (res >> 16) & 0xff;
-  response[5] = (res >> 8)  & 0xff;
   response[4] = (res >> 0)  & 0xff;
+  response[5] = (res >> 8)  & 0xff;
+  response[6] = (res >> 16) & 0xff;
+  response[7] = (res >> 24) & 0xff;
 
   return 9;
 }
@@ -2278,8 +2288,12 @@ int pref_put(const uint8_t command[], uint8_t response[])
   // restricting the return as 32 bit integer as it is enough
   size_t res = 0;
 
-  if(nargs != 2 && nargs != 3) {
-    // TODO error
+  if(nargs != 3) {
+    ESP_LOGE(PREF_TAG, "Prefrences put wrong number of arguments");
+    response[2] = 1;
+    response[3] = 1;
+    response[4] = 255;
+    return 6;
   }
 
   memset(key, 0x00, sizeof(key));
@@ -2289,10 +2303,6 @@ int pref_put(const uint8_t command[], uint8_t response[])
   // next argument
   command_ptr += *command_ptr + 1;
 
-  if(*command_ptr >= PT_INVALID) {
-    // TODO error
-  }
-
   command_ptr++; // The first byte contains the length of the parameter, which is 1
   PreferenceType type = (PreferenceType)*command_ptr;
   command_ptr++;
@@ -2341,17 +2351,20 @@ int pref_put(const uint8_t command[], uint8_t response[])
       break;
     case PT_INVALID:
     default:
-      // TODO error
-      break;
+      ESP_LOGE(PREF_TAG, "Prefrences put invalid type");
+      response[2] = 1;
+      response[3] = 1;
+      response[4] = 254;
+      return 6;
   }
 
   response[2] = 1; // response nargs
   response[3] = 4;          // length of first parameter
 
-  response[7] = (res >> 24) & 0xff;
-  response[6] = (res >> 16) & 0xff;
-  response[5] = (res >> 8)  & 0xff;
   response[4] = (res >> 0)  & 0xff;
+  response[5] = (res >> 8)  & 0xff;
+  response[6] = (res >> 16) & 0xff;
+  response[7] = (res >> 24) & 0xff;
 
   return 9;
 }
@@ -2379,7 +2392,10 @@ int pref_get(const uint8_t command[], uint8_t response[])
   uint32_t res=0;
 
   if(nargs != 2) {
-    // TODO error
+    ESP_LOGE(PREF_TAG, "Prefrences put wrong number of arguments");
+    response[2] = 1;
+    response[3] = 0;
+    return 5;
   }
 
   memset(key, 0x00, sizeof(key));
@@ -2392,9 +2408,6 @@ int pref_get(const uint8_t command[], uint8_t response[])
   command_ptr++; // The first byte contains the length of the parameter, which is 1
   PreferenceType type = static_cast<PreferenceType>(*command_ptr);
 
-  if(type >= PT_INVALID) {
-    // TODO error
-  }
   command_ptr++;
 
   switch(type) {
@@ -2438,8 +2451,10 @@ int pref_get(const uint8_t command[], uint8_t response[])
       goto array_return;
     case PT_INVALID:
     default:
-      // TODO error
-      break;
+      ESP_LOGE(PREF_TAG, "Prefrences put invalid type");
+      response[2] = 1;
+      response[3] = 0;
+      return 5;
   }
 
   // fill the response buffer