ping: switch from ping_error to ping_status

Author: pennam

UNOR4USBBridge/cmds_esp_generic.h

@@ -417,10 +417,10 @@ void CAtHandler::add_cmds_esp_generic() {
 
          auto ping_res = execute_ping(target.c_str(), atoi(ttl.c_str()), atoi(cnt.c_str()));
          char rsl[8];
-         if (ping_res.error == SUCCESS) {
+         if (ping_res.status == ping_status::SUCCESS) {
            sprintf(rsl,"%.0f", ping_res.averagertt);
          } else {
-           sprintf(rsl,"%d", ping_res.error);
+           sprintf(rsl,"%d", ping_res.status);
          }
 
          srv.write_response_prompt();

UNOR4USBBridge/ping.cpp

@@ -24,7 +24,7 @@ static void ping_timeout(esp_ping_handle_t hdl, void *args) {
 }
 
 static void ping_end(esp_ping_handle_t hdl, void *args) {
-    _stats.error = SUCCESS;
+    _stats.status = ping_status::SUCCESS;
 }
 
 ping_statistics execute_ping(const char* address, uint8_t ttl, uint8_t count) {
@@ -39,7 +39,7 @@ ping_statistics execute_ping(const char* address, uint8_t ttl, uint8_t count) {
 
     if(getaddrinfo(address, NULL, &hint, &res) != 0) {
         log_e("resolution error");
-        _stats.error = DNS_RESOLUTION_ERROR;
+        _stats.status = ping_status::DNS_RESOLUTION_ERROR;
         return _stats;
     }
 
@@ -62,14 +62,14 @@ ping_statistics execute_ping(const char* address, uint8_t ttl, uint8_t count) {
     cbs.cb_args         = NULL;
 
     memset(&_stats, 0, sizeof(_stats));
-    _stats.error = RUNNING;
+    _stats.status = ping_status::RUNNING;
 
     esp_ping_handle_t ping; // FIXME do I need this?
     esp_ping_new_session(&ping_config, &cbs, &ping);
     esp_ping_start(ping);
 
     // wait for the end of ping session
-    while(_stats.error != RUNNING) {
+    while(_stats.status != ping_status::RUNNING) {
         delay(10);
     }
 

UNOR4USBBridge/ping.h

@@ -2,18 +2,19 @@
 
 #include <stdint.h>
 
-enum ping_error: uint8_t {
-    RUNNING,
-    SUCCESS,
-    ERROR,
-    DNS_RESOLUTION_ERROR,
+enum class ping_status: int {
+    ERROR = -4,
+    DNS_RESOLUTION_ERROR = -3,
+    TIMEOUT = -2,
+    RUNNING = 0,
+    SUCCESS = 1
 };
 
 struct ping_statistics {
     uint8_t success_count;
     uint8_t timedout_count;
     float averagertt;         // measured in ms
-    volatile ping_error error;
+    volatile ping_status status;
 };
 
 ping_statistics execute_ping(const char* address, uint8_t ttl, uint8_t count);