diff --git a/HAA/HAA_Installer/main/header.h b/HAA/HAA_Installer/main/header.h
index c329d523..503b356d 100644
--- a/HAA/HAA_Installer/main/header.h
+++ b/HAA/HAA_Installer/main/header.h
@@ -11,6 +11,6 @@
 #include "../../common/common_headers.h"
 
 #define INSTALLER_BETA_REVISION     ""
-#define INSTALLER_VERSION           "7.6.0"INSTALLER_BETA_REVISION
+#define INSTALLER_VERSION           "7.7.0"INSTALLER_BETA_REVISION
 
 #endif  // __HAA_OTA_HEADER_H__
diff --git a/HAA/HAA_Installer/main/main.c b/HAA/HAA_Installer/main/main.c
index 9db683ff..41979788 100644
--- a/HAA/HAA_Installer/main/main.c
+++ b/HAA/HAA_Installer/main/main.c
@@ -101,7 +101,7 @@ void init_task() {
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
     esp_wifi_init(&cfg);
     esp_wifi_set_storage(WIFI_STORAGE_RAM);
-    esp_wifi_set_mode(WIFI_MODE_STA);
+    //esp_wifi_set_mode(WIFI_MODE_APSTA);
     
     const esp_partition_t* running_partition = esp_ota_get_running_partition();
 #ifdef HAABOOT
diff --git a/HAA/HAA_Installer/main/setup.c b/HAA/HAA_Installer/main/setup.c
index 1affba6a..35c9b4f7 100644
--- a/HAA/HAA_Installer/main/setup.c
+++ b/HAA/HAA_Installer/main/setup.c
@@ -84,6 +84,17 @@ void setup_set_esp_netif(esp_netif_t* esp_netif) {
     setup_esp_netif = esp_netif;
     //esp_netif_set_default_netif(esp_netif);
 }
+
+#define haa_sdk_wifi_set_opmode(mode)       esp_wifi_set_mode(mode)
+
+#else
+
+void haa_sdk_wifi_set_opmode(const uint8_t opmode) {
+    LOCK_TCPIP_CORE();
+    sdk_wifi_set_opmode(opmode);
+    UNLOCK_TCPIP_CORE();
+}
+
 #endif
 
 typedef struct _wifi_network_info {
@@ -125,9 +136,6 @@ typedef struct _client {
     uint32_t body_length;
 } client_t;
 
-
-static void wifi_config_station_connect();
-
 void setup_mode_reset_sysparam() {
     sysparam_create_area(SYSPARAMSECTOR, SYSPARAMSIZE, true);
     sysparam_init(SYSPARAMSECTOR, 0);
@@ -424,9 +432,9 @@ static void wifi_config_smart_connect() {
 }
 
 #ifdef ESP_PLATFORM
-static uint8_t wifi_config_connect();
+static void wifi_config_connect();
 #else
-static uint8_t wifi_config_connect(const uint8_t phy);
+static void wifi_config_connect(const uint8_t phy);
 
 static void wifi_config_reset() {
     INFO("Wifi clean");
@@ -1124,9 +1132,7 @@ static void http_task(void *arg) {
 }
 
 static void wifi_config_softap_start() {
-    LOCK_TCPIP_CORE();
-    sdk_wifi_set_opmode(STATIONAP_MODE);
-    UNLOCK_TCPIP_CORE();
+    haa_sdk_wifi_set_opmode(STATIONAP_MODE);
     //sdk_wifi_set_sleep_type(WIFI_SLEEP_NONE);
     
     uint8_t macaddr[6];
@@ -1277,9 +1283,9 @@ static void on_disconnect(void *arg, esp_event_base_t event_base, int32_t event_
     sdk_wifi_station_connect();
 }
 
-static uint8_t wifi_config_connect() {
+static void wifi_config_connect() {
 #else
-static uint8_t wifi_config_connect(const uint8_t phy) {
+static void wifi_config_connect(const uint8_t phy) {
 #endif
     sysparam_set_string(INSTALLER_VERSION_SYSPARAM, INSTALLER_VERSION);
     
@@ -1299,120 +1305,117 @@ static uint8_t wifi_config_connect(const uint8_t phy) {
     esp_wifi_set_ps(WIFI_PS_NONE);
 #endif
     
-    if (wifi_ssid) {
 #ifndef ESP_PLATFORM
-        wifi_config_reset();
+    wifi_config_reset();
 #endif
-        
-        sdk_wifi_station_disconnect();
-        vTaskDelay(1);
+    
+    sdk_wifi_station_disconnect();
+    vTaskDelay(1);
 
-        char* wifi_password = NULL;
-        sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password);
-        
+    char* wifi_password = NULL;
+    sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password);
+    
 #ifdef ESP_PLATFORM
-        esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL);
-        esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL);
-        
-        strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1);
-        
-        if (wifi_password) {
-           strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1);
-        }
+    esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL);
+    esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL);
+    
+    strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1);
+    
+    if (wifi_password) {
+       strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1);
+    }
 #else
-        struct sdk_station_config sta_config;
-        memset(&sta_config, 0, sizeof(sta_config));
-        
-        strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1);
-        
-        if (wifi_password) {
-           strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1);
-        }
+    struct sdk_station_config sta_config;
+    memset(&sta_config, 0, sizeof(sta_config));
+    
+    strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1);
+    
+    if (wifi_password) {
+       strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1);
+    }
 #endif
-        
-        int8_t wifi_mode = 0;
-        sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode);
-        
-        uint8_t* wifi_bssid = NULL;
-        sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL);
-        
-        INFO_NNL("BSSID ");
-        if (wifi_bssid) {
-            INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]);
-        } else {
-            INFO("-");
-        }
-        
-        INFO_NNL("Mode ");
-        if (wifi_mode < 2) {
-            if (wifi_mode == 1 && wifi_bssid) {
+    
+    int8_t wifi_mode = 0;
+    sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode);
+    
+    uint8_t* wifi_bssid = NULL;
+    sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL);
+    
+    INFO_NNL("BSSID ");
+    if (wifi_bssid) {
+        INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]);
+    } else {
+        INFO("-");
+    }
+    
+    INFO_NNL("Mode ");
+    if (wifi_mode < 2) {
+        if (wifi_mode == 1 && wifi_bssid) {
 #ifdef ESP_PLATFORM
-                sta_config.sta.bssid_set = 1;
-                memcpy(sta_config.sta.bssid, wifi_bssid, 6);
+            sta_config.sta.bssid_set = 1;
+            memcpy(sta_config.sta.bssid, wifi_bssid, 6);
 #else
-                sta_config.bssid_set = 1;
-                memcpy(sta_config.bssid, wifi_bssid, 6);
+            sta_config.bssid_set = 1;
+            memcpy(sta_config.bssid, wifi_bssid, 6);
 #endif
-                INFO("Forced");
-                
-                //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]);
-
-            } else {
-                INFO("Normal");
-            }
-            
-            LOCK_TCPIP_CORE();
-            sdk_wifi_set_opmode(STATION_MODE);
-            UNLOCK_TCPIP_CORE();
-            sdk_wifi_station_set_config(&sta_config);
-            sdk_wifi_station_set_auto_connect(true);
-            
-#ifndef ESP_PLATFORM
-            wifi_config_toggle_phy_mode(phy);
-#endif
-            
-            sdk_wifi_station_connect();
+            INFO("Forced");
             
+            //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]);
+
         } else {
-            INFO("Roaming");
-            sysparam_erase(WIFI_STA_BSSID_SYSPARAM);
-            LOCK_TCPIP_CORE();
-            sdk_wifi_set_opmode(STATION_MODE);
-            UNLOCK_TCPIP_CORE();
-            sdk_wifi_station_set_config(&sta_config);
-            sdk_wifi_station_set_auto_connect(true);
-            
+            INFO("Normal");
+        }
+        
+        haa_sdk_wifi_set_opmode(STATION_MODE);
+        sdk_wifi_station_set_config(&sta_config);
+        sdk_wifi_station_set_auto_connect(true);
+        
 #ifndef ESP_PLATFORM
-            wifi_config_toggle_phy_mode(phy);
+        wifi_config_toggle_phy_mode(phy);
 #endif
-            
-            if (wifi_mode == 4) {
-                xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL);
-            } else {
-                wifi_config_smart_connect();
-            }
-            
-            vTaskDelay(MS_TO_TICKS(5000));
-        }
         
-        free(wifi_ssid);
+        sdk_wifi_station_connect();
         
-        if (wifi_password) {
-            free(wifi_password);
-        }
+    } else {
+        INFO("Roaming");
+        sysparam_erase(WIFI_STA_BSSID_SYSPARAM);
+        haa_sdk_wifi_set_opmode(STATION_MODE);
+        sdk_wifi_station_set_config(&sta_config);
+        sdk_wifi_station_set_auto_connect(true);
         
-        if (wifi_bssid) {
-            free(wifi_bssid);
+#ifndef ESP_PLATFORM
+        wifi_config_toggle_phy_mode(phy);
+#endif
+        
+        if (wifi_mode == 4) {
+            xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL);
+        } else {
+            wifi_config_smart_connect();
         }
         
-        return 1;
+        vTaskDelay(MS_TO_TICKS(5000));
     }
     
-    INFO("No Wifi config");
-    return 0;
+    free(wifi_ssid);
+    
+    if (wifi_password) {
+        free(wifi_password);
+    }
+    
+    if (wifi_bssid) {
+        free(wifi_bssid);
+    }
 }
 
 static void wifi_config_station_connect() {
+#ifndef ESP_PLATFORM
+    void connect_to_wifi() {
+        int8_t phy_mode = 3;
+        sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode);
+        wifi_config_connect(phy_mode);
+    }
+#endif
+    
     vTaskDelay(1);
     
     int8_t setup_mode = 3;
@@ -1420,21 +1423,35 @@ static void wifi_config_station_connect() {
     
     INFO("HAA INSTALLER");
     
+    char *wifi_ssid = NULL;
+    sysparam_get_string(WIFI_STA_SSID_SYSPARAM, &wifi_ssid);
+    
+    if (wifi_ssid && setup_mode == 0) {
+        INFO("* NORMAL");
+        
 #ifdef ESP_PLATFORM
-    if (wifi_config_connect() == 1 && setup_mode == 0) {
+        wifi_config_connect();
 #else
-    int8_t phy_mode = 0;
-    sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode);
-    
-    if (wifi_config_connect(phy_mode) == 1 && setup_mode == 0) {
+        connect_to_wifi();
 #endif
-        INFO("* NORMAL");
+        
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 1);
         
         xTaskCreate(wifi_config_sta_connect_timeout_task, "STI", (TASK_SIZE_FACTOR * 640), NULL, (tskIDLE_PRIORITY + 1), &context->sta_connect_timeout);
         
     } else {
         INFO("* SETUP");
+        
+        wifi_config_softap_start();
+        
+        if (wifi_ssid) {
+#ifdef ESP_PLATFORM
+            wifi_config_connect();
+#else
+            connect_to_wifi();
+#endif
+        }
+        
         adv_logger_close_buffered_task();
         vTaskDelete(context->ota_task);
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
@@ -1443,10 +1460,12 @@ static void wifi_config_station_connect() {
             context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, false, NULL, auto_reboot_run);
             rs_esp_timer_start_forced(context->auto_reboot_timer);
         }
-        
-        wifi_config_softap_start();
     }
     
+#ifdef ESP_PLATFORM
+    esp_wifi_start();
+#endif
+    
     vTaskDelete(NULL);
 }
 
diff --git a/HAA/HAA_Installer/main/setup.html b/HAA/HAA_Installer/main/setup.html
index dfe3de43..15cfe6df 100644
--- a/HAA/HAA_Installer/main/setup.html
+++ b/HAA/HAA_Installer/main/setup.html
@@ -79,7 +79,7 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 </div>
 </form>
 <center>© 2018-2023 Jos&eacute; A. Jim&eacute;nez Campos</center>
-<h2>If you have paid for this firmware or for a device with it installed, you have been scammed. You must report the fraud to the authorities and claim the amount paid. <a href="https://raw.githubusercontent.com/RavenSystem/esp-homekit-devices/master/LICENSE">LICENSE</a></h2>
+<h2>If you have paid for this firmware or for a device with it installed, you have been scammed. <a href="https://raw.githubusercontent.com/RavenSystem/esp-homekit-devices/master/LICENSE">LICENSE</a></h2>
 </div><script>
 var ssid_field,bssid_field,pass_block,pass_field,join_button;
 networks_block=document.getElementById('networks');
diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
index d32a09cb..0535065a 100644
--- a/HAA/HAA_Main/main/header.h
+++ b/HAA/HAA_Main/main/header.h
@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.8.2"
+#define HAA_FIRMWARE_VERSION                "12.9.0"
 #define HAA_FIRMWARE_BETA_REVISION          ""
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
@@ -190,6 +190,8 @@
 #define VALVE_MAX_DURATION                  "d"
 #define VALVE_MAX_DURATION_DEFAULT          (3600)
 
+#define BINARY_SENSOR_EXTRA_DATA_SET        "dt"
+
 #define THERMOSTAT_TYPE                     "w"
 #define TH_TYPE                             ch_group->num_i[4]
 #define THERMOSTAT_TYPE_HEATER              (1)
@@ -494,6 +496,7 @@
 #define FM_SENSOR_TYPE_FREE                 (1)
 #define FM_SENSOR_TYPE_PULSE_FREQ           (2)
 #define FM_SENSOR_TYPE_PULSE_US_TIME        (3)
+#define FM_SENSOR_TYPE_PWM_DUTY             (4)
 #define FM_SENSOR_TYPE_MATHS                (5)
 #define FM_SENSOR_TYPE_ADC                  (10)
 #define FM_SENSOR_TYPE_ADC_INV              (11)
@@ -514,6 +517,13 @@
 #define FM_SENSOR_GPIO_TRIGGER              ch_group->num_i[3]
 #define FM_NEW_VALUE                        ch_group->num_f[2]
 #define FM_OVERRIDE_VALUE                   ch_group->num_f[3]
+#define FM_SENSOR_PWM_DUTY_STATUS           ch_group->num_i[2]
+#define FM_SENSOR_PWM_DUTY_STATUS_START     (0)
+#define FM_SENSOR_PWM_DUTY_STATUS_HIGH      (1)
+#define FM_SENSOR_PWM_DUTY_STATUS_LOW       (2)
+#define FM_SENSOR_PWM_DUTY_STATUS_END       (3)
+#define FM_SENSOR_PWM_DUTY_TIME_HIGH        ch_group->num_f[2]
+#define FM_SENSOR_PWM_DUTY_TIME_LOW         ch_group->num_f[3]
 #define FM_FACTOR_SET                       "ff"
 #define FM_FACTOR_DEFAULT                   (1)
 #define FM_FACTOR                           ch_group->num_f[0]
@@ -548,6 +558,8 @@
 #define FM_MATHS_GEN_RANDOM_NUMBER          (-10)
 #define FM_MATHS_GET_UPTIME                 (-11)
 #define FM_MATHS_GET_WIFI_RSSI              (-12)
+#define FM_MATHS_GET_HK_CLIENT_IPADDR       (-13)
+#define FM_MATHS_GET_HK_CLIENT_COUNT        (-14)
 #define FM_MATHS_OPERATIONS                 ch_group->num_i[1]
 #define FM_MATHS_FIRST_OPERATION            (2)
 #define FM_MATHS_INT                        ch_group->num_i
@@ -755,7 +767,7 @@
 #define SETUP_MODE_ACTIVATE_COUNT           "z"
 #define SETUP_MODE_DEFAULT_ACTIVATE_COUNT   (8)
 #define SETUP_MODE_TOGGLE_TIME_MS           (1050)
-#define CUSTOM_HAA_COMMAND                  "ic"
+#define CUSTOM_HAA_COMMAND                  "po"
 #define HAA_SETUP_ACCESSORY_SET             "s"
 
 #define IRRF_CAPTURE_BUFFER_SIZE            (2048)
@@ -783,7 +795,7 @@
 #define WIFI_WATCHDOG_ARP_PERIOD_DEFAULT    (190)   // * WIFI_WATCHDOG_POLL_PERIOD_MS
 #define WIFI_WATCHDOG_ROAMING_PERIOD        (1234)  // * WIFI_WATCHDOG_POLL_PERIOD_MS
 
-#define HAA_RMT_LED_STRIP_BLOCK_SYMBOLS     (256)
+#define HAA_RMT_LED_STRIP_BLOCK_SYMBOLS     (128)   // Bigger than 128 does not work
 #define HAA_RMT_LED_STRIP_RESOLUTION_HZ     (10000000)
 #define HAA_RMT_LED_STRIP_QUEUE_DEPTH       (2)
 
diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
index 38860659..b84cbf6e 100644
--- a/HAA/HAA_Main/main/main.c
+++ b/HAA/HAA_Main/main/main.c
@@ -522,7 +522,7 @@ void random_task_long_delay() {
 }
 
 void disable_emergency_setup(TimerHandle_t xTimer) {
-    INFO("Disarming Setup");
+    //INFO("Disarming Setup");
     sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
     rs_esp_timer_delete(xTimer);
 }
@@ -705,6 +705,9 @@ addressled_t* new_addressled(uint8_t gpio, const uint16_t max_range, float time_
         
         rmt_new_bytes_encoder(&bytes_encoder_config, &addressled->rmt_encoder_handle);
 #else
+        gpio_enable(gpio, GPIO_OUTPUT);
+        gpio_write(gpio, false);
+        
         addressled->time_0 = nrz_ticks(time_0h);
         addressled->time_1 = nrz_ticks(time_1h);
         addressled->period = nrz_ticks(time_0h + time_0l);
@@ -854,7 +857,7 @@ void reboot_task() {
 void reboot_haa() {
     if (xTaskCreate(reboot_task, "REB", REBOOT_TASK_SIZE, NULL, REBOOT_TASK_PRIORITY, NULL) != pdPASS) {
         homekit_remove_oldest_client();
-        ERROR("New REB");
+        ERROR("REB");
     }
 }
 
@@ -937,7 +940,7 @@ void ntp_timer_worker(TimerHandle_t xTimer) {
         } else if (xTaskCreate(ntp_task, "NTP", NTP_TASK_SIZE, NULL, NTP_TASK_PRIORITY, NULL) != pdPASS) {
             homekit_remove_oldest_client();
             raven_ntp_get_time();
-            ERROR("New NTP");
+            ERROR("NTP");
         }
     } else {
         raven_ntp_get_time();
@@ -987,7 +990,7 @@ void wifi_reconnection_task() {
         
         vTaskDelay(1);
         
-        INFO("Wifi connecting");
+        INFO("Wifi con");
         
         sdk_wifi_station_connect();
     }
@@ -1000,7 +1003,7 @@ void wifi_reconnection_task() {
         const int new_ip = wifi_config_get_ip();
         
         if (main_config.wifi_status <= WIFI_STATUS_DISCONNECTED) {
-            INFO("Wifi reconnecting");
+            INFO("Wifi recon");
             
 #ifndef ESP_PLATFORM
             int8_t phy_mode = 4;    // main_config.wifi_status == WIFI_STATUS_LONG_DISCONNECTED
@@ -1126,7 +1129,7 @@ void wifi_watchdog() {
         if (main_config.wifi_ping_max_errors != 255 && !homekit_is_pairing()) {
             if (xTaskCreate(wifi_ping_gw_task, "GWP", WIFI_PING_GW_TASK_SIZE, NULL, WIFI_PING_GW_TASK_PRIORITY, NULL) != pdPASS) {
                 homekit_remove_oldest_client();
-                ERROR("New GWP");
+                ERROR("GWP");
             }
         }
         
@@ -1148,7 +1151,7 @@ void wifi_watchdog() {
         
         if (xTaskCreate(wifi_reconnection_task, "RCN", WIFI_RECONNECTION_TASK_SIZE, NULL, WIFI_RECONNECTION_TASK_PRIORITY, NULL) != pdPASS) {
             homekit_remove_oldest_client();
-            ERROR("New RCN");
+            ERROR("RCN");
         }
     }
 }
@@ -1211,23 +1214,23 @@ void ping_task_timer_worker() {
     if (!homekit_is_pairing()) {
         if (xTaskCreate(ping_task, "PIN", PING_TASK_SIZE, NULL, PING_TASK_PRIORITY, NULL) != pdPASS) {
             homekit_remove_oldest_client();
-            ERROR("New PIN");
+            ERROR("PIN");
         }
     } else {
-        ERROR("PING HK pair %i", homekit_is_pairing());
+        ERROR("PING pair %i", homekit_is_pairing());
     }
 }
 
 // -----
 
 void setup_mode_call(const uint16_t gpio, void* args, const uint8_t param) {
-    INFO("Setup call");
+    INFO("Setup");
     
     if (main_config.setup_mode_time == 0 || xTaskGetTickCount() < main_config.setup_mode_time * (1000 / portTICK_PERIOD_MS)) {
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 1);
         reboot_haa();
     } else {
-        ERROR("Not allowed after %is since boot", main_config.setup_mode_time);
+        ERROR("Not after %is", main_config.setup_mode_time);
     }
 }
 
@@ -1301,7 +1304,7 @@ void homekit_characteristic_notify_safe(homekit_characteristic_t *ch) {
 void hkc_custom_setup_setter(homekit_characteristic_t* ch, const homekit_value_t value) {
     if (strncmp(value.string_value, CUSTOM_HAA_COMMAND, strlen(CUSTOM_HAA_COMMAND)) == 0) {
         const unsigned int option = value.string_value[strlen(CUSTOM_HAA_COMMAND)];
-        INFO("<0> -> MODE %c", value.string_value[strlen(CUSTOM_HAA_COMMAND)]);
+        INFO("<0> -> %c", value.string_value[strlen(CUSTOM_HAA_COMMAND)]);
         
         homekit_characteristic_notify(ch);
         
@@ -1348,7 +1351,7 @@ void hkc_setter(homekit_characteristic_t* ch, const homekit_value_t value) {
 
 void pm_custom_consumption_reset(ch_group_t* ch_group) {
     if (!main_config.clock_ready) {
-        ERROR("<%i> Clock not ready", ch_group->serv_index);
+        //ERROR("<%i> Clock not ready", ch_group->serv_index);
         return;
     }
     
@@ -1779,7 +1782,7 @@ void power_monitor_timer_worker(TimerHandle_t xTimer) {
                 if (xTaskCreate(power_monitor_task, "PM", POWER_MONITOR_TASK_SIZE, (void*) ch_group, POWER_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                     ch_group->is_working = false;
                     homekit_remove_oldest_client();
-                    ERROR("New PM");
+                    ERROR("PM");
                 }
             } else {
                 ERROR("<%i> Overlaps", ch_group->serv_index);
@@ -2066,7 +2069,7 @@ void set_zones_timer_worker(TimerHandle_t xTimer) {
     if (!homekit_is_pairing()) {
         if (xTaskCreate(set_zones_task, "iAZ", SET_ZONES_TASK_SIZE, (void*) pvTimerGetTimerID(xTimer), SET_ZONES_TASK_PRIORITY, NULL) != pdPASS) {
             homekit_remove_oldest_client();
-            ERROR("New iAZ");
+            ERROR("iAZ");
             rs_esp_timer_start(xTimer);
         }
     } else {
@@ -2080,7 +2083,7 @@ void process_th_task(void* args) {
     
     led_blink(1);
     
-    INFO("<%i> TH Process", ch_group->serv_index);
+    INFO("<%i> TH Task", ch_group->serv_index);
     
     const int th_current_action = THERMOSTAT_CURRENT_ACTION;
     unsigned int mode_has_changed = false;
@@ -2302,7 +2305,7 @@ void process_th_task(void* args) {
 void process_th_timer(TimerHandle_t xTimer) {
     if (xTaskCreate(process_th_task, "TH", PROCESS_TH_TASK_SIZE, (void*) pvTimerGetTimerID(xTimer), PROCESS_TH_TASK_PRIORITY, NULL) != pdPASS) {
         homekit_remove_oldest_client();
-        ERROR("New TH");
+        ERROR("TH");
         rs_esp_timer_start(xTimer);
     }
 }
@@ -2444,7 +2447,7 @@ void process_hum_task(void* args) {
     
     led_blink(1);
     
-    INFO("<%i> Hum Process", ch_group->serv_index);
+    INFO("<%i> Hum Task", ch_group->serv_index);
     
     const int humidif_current_action = HUMIDIF_CURRENT_ACTION;
     
@@ -2648,7 +2651,7 @@ void process_hum_task(void* args) {
 void process_humidif_timer(TimerHandle_t xTimer) {
     if (xTaskCreate(process_hum_task, "HUM", PROCESS_HUMIDIF_TASK_SIZE, (void*) pvTimerGetTimerID(xTimer), PROCESS_HUMIDIF_TASK_PRIORITY, NULL) != pdPASS) {
         homekit_remove_oldest_client();
-        ERROR("New HUM");
+        ERROR("HUM");
         rs_esp_timer_start(xTimer);
     }
 }
@@ -3029,7 +3032,7 @@ void temperature_timer_worker(TimerHandle_t xTimer) {
             if (xTaskCreate(temperature_task, "TEM", TEMPERATURE_TASK_SIZE, (void*) ch_group, TEMPERATURE_TASK_PRIORITY, NULL) != pdPASS) {
                 ch_group->is_working = false;
                 homekit_remove_oldest_client();
-                ERROR("New TEM");
+                ERROR("TEM");
             }
         } else {
             ERROR("<%i> Overlaps", ch_group->serv_index);
@@ -3538,19 +3541,19 @@ void hsi2rgbw(uint16_t h, float s, uint8_t v, ch_group_t* ch_group) {
     INFO("hsi2rgbw runtime: %0.3f ms", ((float) (sdk_system_get_time_raw() - run_time)) * 1e-3);
 #endif
 }
+
 /*
 void hsi2white(uint16_t h, float s, uint8_t v, ch_group_t* ch_group) {
     lightbulb_group_t* lightbulb_group = lightbulb_group_find(ch_group->ch[0]);
     
-    
 }
 
 void white2hsi(uint16_t t, ch_group_t* ch_group) {
     lightbulb_group_t* lightbulb_group = lightbulb_group_find(ch_group->ch[0]);
     
-    
 }
 */
+
 void rgbw_set_timer_worker() {
     unsigned int all_channels_ready = true;
     
@@ -3800,7 +3803,7 @@ void lightbulb_task_timer(TimerHandle_t xTimer) {
         lightbulb_group->lightbulb_task_running = false;
         
         homekit_remove_oldest_client();
-        ERROR("New LB");
+        ERROR("LB");
         rs_esp_timer_start(xTimer);
     }
 }
@@ -3952,7 +3955,7 @@ void autodimmer_call(homekit_characteristic_t* ch0, const homekit_value_t value)
             
             if (xTaskCreate(autodimmer_task, "DIM", AUTODIMMER_TASK_SIZE, (void*) ch0, AUTODIMMER_TASK_PRIORITY, NULL) != pdPASS) {
                 homekit_remove_oldest_client();
-                ERROR("New DIM");
+                ERROR("DIM");
             }
         } else {
             rs_esp_timer_start(LIGHTBULB_AUTODIMMER_TIMER);
@@ -4459,7 +4462,7 @@ void process_fan_task(void* args) {
 void process_fan_timer(TimerHandle_t xTimer) {
     if (xTaskCreate(process_fan_task, "FAN", PROCESS_FAN_TASK_SIZE, (void*) pvTimerGetTimerID(xTimer), PROCESS_FAN_TASK_PRIORITY, NULL) != pdPASS) {
         homekit_remove_oldest_client();
-        ERROR("New FAN");
+        ERROR("FAN");
         rs_esp_timer_start(xTimer);
     }
 }
@@ -4473,13 +4476,19 @@ void hkc_fan_setter(homekit_characteristic_t* ch, const homekit_value_t value) {
         
         ch->value = value;
         
+        // If speed is 0, set speed to 1 and turn off fan
+        if (ch == ch_group->ch[1] && ch->value.float_value == 0) {
+            ch->value.float_value = 1;
+            ch_group->ch[0]->value.bool_value = false;
+        }
+        
         if (FAN_SET_DELAY_TIMER) {
             rs_esp_timer_start(FAN_SET_DELAY_TIMER);
         } else {
             process_fan_task((void*) ch_group);
         }
         
-        if (ch == ch_group->ch[0] && ch->value.bool_value != old_on_value) {
+        if (ch_group->ch[0]->value.bool_value != old_on_value) {
             setup_mode_toggle_upcount(ch_group->homekit_enabled);
             
             if (ch_group->ch[0]->value.bool_value) {
@@ -4573,7 +4582,7 @@ void light_sensor_timer_worker(TimerHandle_t xTimer) {
             if (xTaskCreate(light_sensor_task, "LUX", LIGHT_SENSOR_TASK_SIZE, (void*) ch_group, LIGHT_SENSOR_TASK_PRIORITY, NULL) != pdPASS) {
                 ch_group->is_working = false;
                 homekit_remove_oldest_client();
-                ERROR("New LUX");
+                ERROR("LUX");
             }
         } else {
             ERROR("<%i> Overlaps", ch_group->serv_index);
@@ -5015,6 +5024,49 @@ void IRAM fm_pulse_interrupt(const uint8_t gpio) {
     }
 }
 
+#ifdef ESP_PLATFORM
+void IRAM_ATTR fm_pwm_interrupt(void* args) {
+    const uint64_t time = sdk_system_get_time_raw();
+    const uint8_t gpio = (uint32_t) args;
+#else
+void IRAM fm_pwm_interrupt(const uint8_t gpio) {
+    const uint32_t time = sdk_system_get_time_raw();
+#endif
+    
+    ch_group_t* ch_group = main_config.ch_groups;
+    while (ch_group) {
+        if ((ch_group->serv_type == SERV_TYPE_FREE_MONITOR ||
+             ch_group->serv_type == SERV_TYPE_FREE_MONITOR_ACCUMULATVE) &&
+            private_abs(FM_SENSOR_TYPE) == FM_SENSOR_TYPE_PWM_DUTY &&
+            FM_SENSOR_GPIO == gpio) {
+            
+            switch (FM_SENSOR_PWM_DUTY_STATUS) {
+                case FM_SENSOR_PWM_DUTY_STATUS_HIGH:
+                    FM_SENSOR_PWM_DUTY_TIME_HIGH = time - FM_SENSOR_PWM_DUTY_TIME_HIGH;
+                    FM_SENSOR_PWM_DUTY_TIME_LOW = time;
+                    FM_SENSOR_PWM_DUTY_STATUS = FM_SENSOR_PWM_DUTY_STATUS_LOW;
+                    break;
+                    
+                case FM_SENSOR_PWM_DUTY_STATUS_LOW:
+                    FM_SENSOR_PWM_DUTY_TIME_LOW = time - FM_SENSOR_PWM_DUTY_TIME_LOW;
+                    FM_SENSOR_PWM_DUTY_STATUS = FM_SENSOR_PWM_DUTY_STATUS_END;
+                    break;
+                    
+                default:    // case FM_SENSOR_PWM_DUTY_STATUS_START:
+                    if (gpio_read(gpio)) {
+                        FM_SENSOR_PWM_DUTY_TIME_HIGH = time;
+                        FM_SENSOR_PWM_DUTY_STATUS = FM_SENSOR_PWM_DUTY_STATUS_HIGH;
+                    }
+                    break;
+            }
+            
+            break;
+        }
+        
+        ch_group = ch_group->next;
+    }
+}
+
 bool free_monitor_type_is_pattern(const uint8_t fm_sensor_type) {
     if (fm_sensor_type == FM_SENSOR_TYPE_NETWORK_PATTERN_TEXT ||
         fm_sensor_type == FM_SENSOR_TYPE_NETWORK_PATTERN_HEX ||
@@ -5124,6 +5176,46 @@ void free_monitor_task(void* args) {
                     
                     FM_OVERRIDE_VALUE = NO_LAST_WILDCARD_ACTION;
                     
+                } else if (fm_sensor_type == FM_SENSOR_TYPE_PWM_DUTY) {
+                    FM_SENSOR_PWM_DUTY_STATUS = FM_SENSOR_PWM_DUTY_STATUS_START;
+                    
+#ifdef ESP_PLATFORM
+                    gpio_intr_enable(FM_SENSOR_GPIO);
+#else
+                    gpio_set_interrupt(FM_SENSOR_GPIO, GPIO_INTTYPE_EDGE_ANY, fm_pwm_interrupt);
+#endif
+                    
+                    int old_pwm_status = FM_SENSOR_PWM_DUTY_STATUS_START;
+                    // Wait up to 1 second (1000ms) without PWM status changes
+                    for (unsigned int wait_count = 0; wait_count < 50; wait_count++) {
+                        vTaskDelay(MS_TO_TICKS(20));
+                        
+                        if (FM_SENSOR_PWM_DUTY_STATUS == FM_SENSOR_PWM_DUTY_STATUS_END) {
+                            break;
+                            
+                        } else if (old_pwm_status != FM_SENSOR_PWM_DUTY_STATUS) {
+                            old_pwm_status = FM_SENSOR_PWM_DUTY_STATUS;
+                            wait_count = 0;
+                        }
+                    }
+                    
+#ifdef ESP_PLATFORM
+                    gpio_intr_disable(FM_SENSOR_GPIO);
+#else
+                    gpio_set_interrupt(FM_SENSOR_GPIO, GPIO_INTTYPE_NONE, NULL);
+#endif
+                    
+                    if (FM_SENSOR_PWM_DUTY_STATUS == FM_SENSOR_PWM_DUTY_STATUS_END) {
+                        value = 100 * FM_SENSOR_PWM_DUTY_TIME_HIGH / (FM_SENSOR_PWM_DUTY_TIME_HIGH + FM_SENSOR_PWM_DUTY_TIME_LOW);
+                    } else {
+                        value = gpio_read(FM_SENSOR_GPIO) ? 100 : 0;
+                        
+                    }
+                    
+                    if (value >= 0 && value <= 100) {
+                        get_value = true;
+                    }
+                    
                 } else if (fm_sensor_type == FM_SENSOR_TYPE_MATHS) {
                     unsigned int float_index = FM_MATHS_FLOAT_FIRST + (FM_SENSOR_TYPE < 0 ? 2 : 0);
                     unsigned int int_index = FM_MATHS_FIRST_OPERATION;
@@ -5148,7 +5240,7 @@ void free_monitor_task(void* args) {
                             read_value = get_hkch_value(ch_group_find_by_serv(read_service)->ch[(uint8_t) FM_MATHS_FLOAT[float_index]]);
                             
                         } else {
-                            if (!main_config.clock_ready && read_service <= FM_MATHS_GET_TIME_IS_SAVING) {
+                            if (!main_config.clock_ready && read_service >= FM_MATHS_GET_TIME_IS_SAVING) {
                                 get_value = false;
                                 break;
                             }
@@ -5206,9 +5298,17 @@ void free_monitor_task(void* args) {
                                     read_value = wifi_rssi;
                                     break;
 #endif
-                                default:    // case FM_MATHS_GET_UPTIME:
+                                case FM_MATHS_GET_UPTIME:
                                     read_value = xTaskGetTickCount() / (1000 / portTICK_PERIOD_MS);
                                     break;
+                                    
+                                case FM_MATHS_GET_HK_CLIENT_IPADDR:
+                                    read_value = homekit_get_unique_client_ipaddr();
+                                    break;
+                                    
+                                default:    // case FM_MATHS_GET_HK_CLIENT_COUNT:
+                                    read_value = homekit_get_client_count();
+                                    break;
                             }
                         }
                         
@@ -5655,7 +5755,7 @@ void free_monitor_timer_worker(TimerHandle_t xTimer) {
                     if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                         ch_group->is_working = false;
                         homekit_remove_oldest_client();
-                        ERROR("New FM");
+                        ERROR("FM");
                     }
                 } else {
                     ERROR("<%i> Overlaps %i", ch_group->serv_index, ch_group_b->serv_index);
@@ -5717,7 +5817,7 @@ void recv_uart_task() {
     if (call_free_monitor) {
         if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, NULL, FREE_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
             reset_uart_buffer();
-            ERROR("New FM");
+            ERROR("FM");
             homekit_remove_oldest_client();
         }
     } else {
@@ -6719,7 +6819,6 @@ void uart_action_task(void* pvParameters) {
             INFO_NNL("<%i> UART%i -> ", action_task->ch_group->serv_index, action_uart->uart);
             for (unsigned int i = 0; i < action_uart->len; i++) {
                 INFO_NNL("%02x", action_uart->command[i]);
-                INFO_NNL("%02x", action_uart->command[i]);
             }
             INFO("");
             
@@ -7125,7 +7224,7 @@ void do_actions(ch_group_t* ch_group, uint8_t action) {
                                     if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                                         ch_group->is_working = false;
                                         homekit_remove_oldest_client();
-                                        ERROR("New FM");
+                                        ERROR("FM");
                                     }
                                 } else {
                                     ERROR("<%i> Overlaps", ch_group->serv_index);
@@ -9828,7 +9927,12 @@ void normal_mode_init() {
     
     // *** NEW BINARY SENSOR
     void new_binary_sensor(const uint16_t accessory, uint16_t service, const uint16_t total_services, cJSON_rsf* json_context, uint8_t serv_type) {
-        ch_group_t* ch_group = new_ch_group(1, 0, 0, 0);
+        unsigned int extra_data_size = 0;
+        if (cJSON_rsf_GetObjectItemCaseSensitive(json_context, BINARY_SENSOR_EXTRA_DATA_SET) != NULL) {
+            extra_data_size = (uint8_t) cJSON_rsf_GetObjectItemCaseSensitive(json_context, BINARY_SENSOR_EXTRA_DATA_SET)->valuefloat;
+        }
+        
+        ch_group_t* ch_group = new_ch_group(1 + extra_data_size, 0, 0, 0);
         ch_group->serv_type = SERV_TYPE_CONTACT_SENSOR;
         ch_group->serv_index = service_numerator;
         unsigned int homekit_enabled = acc_homekit_enabled(json_context);
@@ -9875,6 +9979,14 @@ void normal_mode_init() {
                     accessories[accessory]->services[service]->type = HOMEKIT_SERVICE_CARBON_MONOXIDE_SENSOR;
                 }
                 ch_group->ch[0] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_MONOXIDE_DETECTED, 0);
+                
+                if (extra_data_size > 0) {
+                    ch_group->ch[1] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_MONOXIDE_LEVEL, 0);
+                    
+                    if (extra_data_size > 1) {
+                        ch_group->ch[2] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_MONOXIDE_PEAK_LEVEL, 0);
+                    }
+                }
                 break;
                 
             case SERV_TYPE_CARBON_DIOXIDE_SENSOR:
@@ -9882,6 +9994,14 @@ void normal_mode_init() {
                     accessories[accessory]->services[service]->type = HOMEKIT_SERVICE_CARBON_DIOXIDE_SENSOR;
                 }
                 ch_group->ch[0] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_DIOXIDE_DETECTED, 0);
+                
+                if (extra_data_size > 0) {
+                    ch_group->ch[1] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_DIOXIDE_LEVEL, 0);
+                    
+                    if (extra_data_size > 1) {
+                        ch_group->ch[2] = NEW_HOMEKIT_CHARACTERISTIC(CARBON_DIOXIDE_PEAK_LEVEL, 0);
+                    }
+                }
                 break;
                 
             case SERV_TYPE_FILTER_CHANGE_SENSOR:
@@ -9916,8 +10036,11 @@ void normal_mode_init() {
                 accessories[accessory]->services[service]->type = HOMEKIT_SERVICE_CUSTOM_HAA_HIDDEN_BINARY_SENSOR;
             }
             
-            accessories[accessory]->services[service]->characteristics = calloc(2, sizeof(homekit_characteristic_t*));
-            accessories[accessory]->services[service]->characteristics[0] = ch_group->ch[0];
+            accessories[accessory]->services[service]->characteristics = calloc(2 + extra_data_size, sizeof(homekit_characteristic_t*));
+            
+            for (unsigned int i = 0; i <= extra_data_size; i++) {
+                accessories[accessory]->services[service]->characteristics[i] = ch_group->ch[i];
+            }
             
             //service_iid += 2;
         }
@@ -10047,9 +10170,8 @@ void normal_mode_init() {
             }
             
             accessories[accessory]->services[service]->characteristics = calloc(2 + extra_data_size, sizeof(homekit_characteristic_t*));
-            accessories[accessory]->services[service]->characteristics[0] = ch_group->ch[0];
             
-            for (unsigned int i = 1; i <= extra_data_size; i++) {
+            for (unsigned int i = 0; i <= extra_data_size; i++) {
                 accessories[accessory]->services[service]->characteristics[i] = ch_group->ch[i];
             }
             
@@ -12229,6 +12351,7 @@ void normal_mode_init() {
 #endif
                                             ( fm_sensor_type == FM_SENSOR_TYPE_PULSE_FREQ ) +
                                             ( fm_sensor_type == FM_SENSOR_TYPE_PULSE_US_TIME ? 3 : 0 ) +
+                                            ( fm_sensor_type == FM_SENSOR_TYPE_PWM_DUTY ? 2 : 0 ) +
                                             is_type_uart +
                                             is_val_data +
                                             ( fm_sensor_type >= FM_SENSOR_TYPE_NETWORK ? 2 : 0 ) +
@@ -12343,21 +12466,17 @@ void normal_mode_init() {
 #ifdef ESP_PLATFORM
             fm_sensor_type == FM_SENSOR_TYPE_ADC || fm_sensor_type == FM_SENSOR_TYPE_ADC_INV ||
 #endif
-            fm_sensor_type == FM_SENSOR_TYPE_PULSE_US_TIME) {
+            fm_sensor_type == FM_SENSOR_TYPE_PULSE_US_TIME || fm_sensor_type == FM_SENSOR_TYPE_PWM_DUTY) {
             cJSON_rsf* gpio_array = cJSON_rsf_GetObjectItemCaseSensitive(json_context, FM_SENSOR_GPIO_ARRAY_SET);
             unsigned int gpio = (uint8_t) cJSON_rsf_GetArrayItem(gpio_array, 0)->valuefloat;
             FM_SENSOR_GPIO = gpio;
             unsigned int interrupt_type = 0;
             
-#ifdef ESP_PLATFORM
             if (fm_sensor_type == FM_SENSOR_TYPE_PULSE_FREQ ||
                 fm_sensor_type == FM_SENSOR_TYPE_PULSE_US_TIME) {
-#endif
                 interrupt_type = (uint8_t) cJSON_rsf_GetArrayItem(gpio_array, 1)->valuefloat;
                 //set_used_gpio(gpio);
-#ifdef ESP_PLATFORM
             }
-#endif
             
             if (fm_sensor_type == FM_SENSOR_TYPE_PULSE_FREQ) {
                 adv_hlw_unit_create(gpio, -1, -1, 0, interrupt_type);
@@ -12382,6 +12501,13 @@ void normal_mode_init() {
                     gpio_write(gpio_final, !inverted);
                     //set_used_gpio(gpio_final);
                 }
+#ifdef ESP_PLATFORM
+            } else if (fm_sensor_type == FM_SENSOR_TYPE_PWM_DUTY) {
+                gpio_install_isr_service(0);
+                gpio_set_intr_type(gpio, GPIO_INTR_ANYEDGE);
+                gpio_isr_handler_add(gpio, fm_pwm_interrupt, (void*) ((uint32_t) gpio));
+                gpio_intr_disable(gpio);
+#endif
             }
             
         } else if (fm_sensor_type == FM_SENSOR_TYPE_I2C ||
@@ -12992,7 +13118,7 @@ void init_task() {
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
     esp_wifi_init(&cfg);
     esp_wifi_set_storage(WIFI_STORAGE_RAM);
-    esp_wifi_set_mode(WIFI_MODE_STA);
+    //esp_wifi_set_mode(WIFI_MODE_APSTA);
 #endif
     
     uint8_t macaddr[6];
diff --git a/HAA/HAA_Main/main/setup.c b/HAA/HAA_Main/main/setup.c
index 7c9f88ed..fb722041 100644
--- a/HAA/HAA_Main/main/setup.c
+++ b/HAA/HAA_Main/main/setup.c
@@ -93,6 +93,16 @@ void setup_set_boot_installer() {
     
     esp_ota_set_boot_partition(partition_boot1);
 }
+
+#define haa_sdk_wifi_set_opmode(mode)       esp_wifi_set_mode(mode)
+
+#else
+
+void haa_sdk_wifi_set_opmode(const uint8_t opmode) {
+    LOCK_TCPIP_CORE();
+    sdk_wifi_set_opmode(opmode);
+    UNLOCK_TCPIP_CORE();
+}
 #endif
 
 typedef struct _wifi_network_info {
@@ -143,8 +153,6 @@ typedef struct _client {
     uint32_t body_length;
 } client_t;
 
-static void wifi_config_station_connect();
-
 inline static void setup_mode_reset_sysparam() {
     sysparam_create_area(SYSPARAMSECTOR, SYSPARAMSIZE, true);
     sysparam_init(SYSPARAMSECTOR, 0);
@@ -464,9 +472,9 @@ void wifi_config_smart_connect() {
 }
 
 #ifdef ESP_PLATFORM
-uint8_t wifi_config_connect(const uint8_t mode, const bool with_reset);
+void wifi_config_connect(const uint8_t mode, const bool with_reset);
 #else
-uint8_t wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset);
+void wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset);
 #endif
     
 void wifi_config_reset() {
@@ -1192,9 +1200,7 @@ static void http_task(void *arg) {
 
 static void wifi_config_softap_start(const int8_t wifi_ap_enable) {
     if (wifi_ap_enable) {
-        LOCK_TCPIP_CORE();
-        sdk_wifi_set_opmode(STATIONAP_MODE);
-        UNLOCK_TCPIP_CORE();
+        haa_sdk_wifi_set_opmode(STATIONAP_MODE);
         
         uint8_t macaddr[6];
         sdk_wifi_get_macaddr(STATION_IF, macaddr);
@@ -1420,13 +1426,17 @@ static void on_disconnect(void *arg, esp_event_base_t event_base, int32_t event_
     sdk_wifi_station_connect();
 }
 
-uint8_t wifi_config_connect(const uint8_t mode, const bool with_reset) {
+void wifi_config_connect(const uint8_t mode, const bool with_reset) {
 #else
-uint8_t wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset) {
+void wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset) {
 #endif
     char *wifi_ssid = NULL;
     sysparam_get_string(WIFI_STA_SSID_SYSPARAM, &wifi_ssid);
     
+    if (!wifi_ssid) {
+        return;
+    }
+    
 #ifdef ESP_PLATFORM
     wifi_config_t sta_config = {
         .sta = {
@@ -1448,164 +1458,159 @@ uint8_t wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool wi
     }
 #endif
     
-    if (wifi_ssid) {
-        if (with_reset) {
-            wifi_config_reset();
-            vTaskDelay(MS_TO_TICKS(5000));
-        }
-        
-        sdk_wifi_station_disconnect();
-        vTaskDelay(1);
-        
-        char *wifi_password = NULL;
-        sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password);
-        
+    if (with_reset) {
+        wifi_config_reset();
+        vTaskDelay(MS_TO_TICKS(5000));
+    }
+    
+    sdk_wifi_station_disconnect();
+    vTaskDelay(1);
+    
+    char *wifi_password = NULL;
+    sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password);
+    
 #ifdef ESP_PLATFORM
-        esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL);
-        esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL);
-        
-        strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1);
-        
-        if (wifi_password) {
-           strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1);
-        }
+    esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL);
+    esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL);
+    
+    strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1);
+    
+    if (wifi_password) {
+       strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1);
+    }
 #else
-        struct sdk_station_config sta_config;
-        memset(&sta_config, 0, sizeof(sta_config));
-        
-        strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1);
-        
-        if (wifi_password) {
-           strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1);
-        }
+    struct sdk_station_config sta_config;
+    memset(&sta_config, 0, sizeof(sta_config));
+    
+    strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1);
+    
+    if (wifi_password) {
+       strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1);
+    }
 #endif
 
-        int8_t wifi_mode = 0;
-        sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode);
-        
-        uint8_t *wifi_bssid = NULL;
-        sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL);
-        
-        INFO_NNL("BSSID ");
-        if (wifi_bssid) {
-            INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]);
-        } else {
-            INFO("-");
-        }
-        
-        INFO_NNL("Mode ");
-        if (wifi_mode < 2 || (wifi_mode == 4 && mode == 1)) {
-            if ((wifi_mode == 1 || (wifi_mode == 4 && mode == 1)) && wifi_bssid) {
+    int8_t wifi_mode = 0;
+    sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode);
+    
+    uint8_t *wifi_bssid = NULL;
+    sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL);
+    
+    INFO_NNL("BSSID ");
+    if (wifi_bssid) {
+        INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]);
+    } else {
+        INFO("-");
+    }
+    
+    INFO_NNL("Mode ");
+    if (wifi_mode < 2 || (wifi_mode == 4 && mode == 1)) {
+        if ((wifi_mode == 1 || (wifi_mode == 4 && mode == 1)) && wifi_bssid) {
 #ifdef ESP_PLATFORM
-                sta_config.sta.bssid_set = 1;
-                memcpy(sta_config.sta.bssid, wifi_bssid, 6);
+            sta_config.sta.bssid_set = 1;
+            memcpy(sta_config.sta.bssid, wifi_bssid, 6);
 #else
-                sta_config.bssid_set = 1;
-                memcpy(sta_config.bssid, wifi_bssid, 6);
+            sta_config.bssid_set = 1;
+            memcpy(sta_config.bssid, wifi_bssid, 6);
 #endif
-                INFO("Forced");
-                
-                //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]);
-
-            } else {
-                INFO("Normal");
-            }
+            INFO("Forced");
             
-            LOCK_TCPIP_CORE();
-            sdk_wifi_set_opmode(STATION_MODE);
-            UNLOCK_TCPIP_CORE();
-            sdk_wifi_station_set_config(&sta_config);
-            sdk_wifi_station_set_auto_connect(true);
+            //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]);
 
-#ifndef ESP_PLATFORM
-            wifi_config_toggle_phy_mode(phy);
-#endif
-            
-            sdk_wifi_station_connect();
-            
         } else {
-            INFO("Roaming");
-            sysparam_erase(WIFI_STA_BSSID_SYSPARAM);
-            LOCK_TCPIP_CORE();
-            sdk_wifi_set_opmode(STATION_MODE);
-            UNLOCK_TCPIP_CORE();
-            sdk_wifi_station_set_config(&sta_config);
-            sdk_wifi_station_set_auto_connect(true);
-            
+            INFO("Normal");
+        }
+        
+        haa_sdk_wifi_set_opmode(STATION_MODE);
+        
+        sdk_wifi_station_set_config(&sta_config);
+        sdk_wifi_station_set_auto_connect(true);
+
 #ifndef ESP_PLATFORM
-            wifi_config_toggle_phy_mode(phy);
+        wifi_config_toggle_phy_mode(phy);
 #endif
-            
-            if (wifi_mode == 4) {
-                xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL);
-            } else {
-                wifi_config_smart_connect();
-            }
-            
-            vTaskDelay(MS_TO_TICKS(5000));
-        }
         
-        free(wifi_ssid);
+        sdk_wifi_station_connect();
         
-        if (wifi_password) {
-            free(wifi_password);
-        }
+    } else {
+        INFO("Roaming");
+        sysparam_erase(WIFI_STA_BSSID_SYSPARAM);
         
-        if (wifi_bssid) {
-            free(wifi_bssid);
+        haa_sdk_wifi_set_opmode(STATION_MODE);
+        
+        sdk_wifi_station_set_config(&sta_config);
+        sdk_wifi_station_set_auto_connect(true);
+        
+#ifndef ESP_PLATFORM
+        wifi_config_toggle_phy_mode(phy);
+#endif
+        
+        if (wifi_mode == 4) {
+            xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL);
+        } else {
+            wifi_config_smart_connect();
         }
         
-        return 1;
+        vTaskDelay(MS_TO_TICKS(5000));
     }
     
-    INFO("No Wifi config");
-    return 0;
+    free(wifi_ssid);
+    
+    if (wifi_password) {
+        free(wifi_password);
+    }
+    
+    if (wifi_bssid) {
+        free(wifi_bssid);
+    }
 }
 
 static void wifi_config_station_connect() {
     vTaskDelay(1);
     
-#ifndef ESP_PLATFORM
-    int8_t phy_mode = 3;
-    if (!context->on_wifi_ready) {
-        sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode);
-    }
-#endif
 
+    
+    char *wifi_ssid = NULL;
+    sysparam_get_string(WIFI_STA_SSID_SYSPARAM, &wifi_ssid);
+    
+    if (wifi_ssid) {
 #ifdef ESP_PLATFORM
-    if (wifi_config_connect(0, false) == 1) {
+        wifi_config_connect(0, false);
 #else
-    if (wifi_config_connect(0, phy_mode, false) == 1) {
+        int8_t phy_mode = 3;
+        sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode);
+        wifi_config_connect(0, phy_mode, false);
 #endif
-        xTaskCreate(wifi_config_sta_connect_timeout_task, "STI", (TASK_SIZE_FACTOR * 640), NULL, (tskIDLE_PRIORITY + 1), &context->sta_connect_timeout);
+    }
+    
+    if (!context->on_wifi_ready) {
+        INFO("HAA Setup");
         
-        if (!context->on_wifi_ready) {
-            INFO("HAA Setup");
-            
-            int8_t setup_mode = 0;
-            sysparam_get_int8(HAA_SETUP_MODE_SYSPARAM, &setup_mode);
-            
-            sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
-            
-            if (setup_mode == 1) {
-                INFO("Enabling auto reboot");
-                context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, false, NULL, auto_reboot_run);
-                rs_esp_timer_start_forced(context->auto_reboot_timer);
-            } else if (setup_mode == 2) {
-                ERROR("Script");
-                context->param += 100;
-            }
-            
-            int8_t wifi_ap_enable = 1;
-            sysparam_get_int8(WIFI_AP_ENABLE_SYSPARAM, &wifi_ap_enable);
-            
-            wifi_config_softap_start(wifi_ap_enable);
-        }
+        int8_t wifi_ap_enable = 1;
+        sysparam_get_int8(WIFI_AP_ENABLE_SYSPARAM, &wifi_ap_enable);
         
-    } else {
-        wifi_config_softap_start(1);
+        wifi_config_softap_start(wifi_ap_enable);
+        
+        int8_t setup_mode = 0;
+        sysparam_get_int8(HAA_SETUP_MODE_SYSPARAM, &setup_mode);
+        
+        sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
+        
+        if (setup_mode == 1) {
+            INFO("Auto reboot");
+            context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, false, NULL, auto_reboot_run);
+            rs_esp_timer_start_forced(context->auto_reboot_timer);
+        } else if (setup_mode == 2) {
+            ERROR("Script");
+            context->param += 100;
+        }
     }
     
+#ifdef ESP_PLATFORM
+    esp_wifi_start();
+#endif
+    
+    xTaskCreate(wifi_config_sta_connect_timeout_task, "STI", (TASK_SIZE_FACTOR * 640), NULL, (tskIDLE_PRIORITY + 1), &context->sta_connect_timeout);
+    
     vTaskDelete(NULL);
 }
 
@@ -1622,6 +1627,8 @@ void wifi_config_init(const char* ssid_prefix, void (*on_wifi_ready)(), const ch
     context->ssid_prefix = strndup(ssid_prefix, 33 - 7);
     
 #ifdef ESP_PLATFORM
+    free_wifi_config_ip_info();
+    
     context->wifi_sleep_mode = wifi_sleep_mode;
     context->bandwidth_40 = bandwidth_40;
     
diff --git a/HAA/HAA_Main/main/setup.h b/HAA/HAA_Main/main/setup.h
index 6189d5f9..13a8d508 100644
--- a/HAA/HAA_Main/main/setup.h
+++ b/HAA/HAA_Main/main/setup.h
@@ -11,13 +11,13 @@ void wifi_config_init(const char* ssid_prefix, void (*on_wifi_ready)(), const ch
 void setup_set_esp_netif(esp_netif_t* esp_net_if);
 esp_netif_t* setup_get_esp_netif();
 void setup_set_boot_installer();
-uint8_t wifi_config_connect(const uint8_t mode, const bool with_reset);
+void wifi_config_connect(const uint8_t mode, const bool with_reset);
 #define save_last_working_phy()
 
 #else
 
 void wifi_config_init(const char* ssid_prefix, void (*on_wifi_ready)(), const char* custom_hostname, const int param);
-uint8_t wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset);
+void wifi_config_connect(const uint8_t mode, const uint8_t phy, const bool with_reset);
 void save_last_working_phy();
 
 #endif
diff --git a/HAA/HAA_Main/main/setup.html b/HAA/HAA_Main/main/setup.html
index cca36933..822555fa 100644
--- a/HAA/HAA_Main/main/setup.html
+++ b/HAA/HAA_Main/main/setup.html
@@ -119,7 +119,7 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <input type="text" id="bssid" name="bid" maxlength="12">
 </div></form>
 <center>© 2018-2023 Jos&eacute; A. Jim&eacute;nez Campos</center>
-<h2>If you have paid for this firmware or for a device with it installed, you have been scammed. You must report the fraud to the authorities and claim the amount paid. <a href="https://raw.githubusercontent.com/RavenSystem/esp-homekit-devices/master/LICENSE">LICENSE</a></h2>
+<h2>If you have paid for this firmware or for a device with it installed, you have been scammed. <a href="https://raw.githubusercontent.com/RavenSystem/esp-homekit-devices/master/LICENSE">LICENSE</a></h2>
 </div><script>
 var ssid_field,bssid_field,pass_block,pass_field,join_button;
 networks_block=document.getElementById('networks');
diff --git a/external_libs/cJSON/CMakeLists.txt b/external_libs/cJSON/CMakeLists.txt
deleted file mode 100644
index c2246c60..00000000
--- a/external_libs/cJSON/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(COMPONENT_SRCDIRS
-    "cJSON"
-)
-
-set(COMPONENT_ADD_INCLUDEDIRS
-    "cJSON/"
-)
-
-register_component()
diff --git a/external_libs/cJSON/cJSON/.github/CONTRIBUTING.md b/external_libs/cJSON/cJSON/.github/CONTRIBUTING.md
deleted file mode 100644
index 83d2e599..00000000
--- a/external_libs/cJSON/cJSON/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Contribution Guidelines
-=======================
-
-Contributions to cJSON are welcome. If you find a bug or want to improve cJSON in another way, pull requests are appreciated.
-
-For bigger changes, in order to avoid wasted effort, please open an issue to discuss the technical details before creating a pull request.
-
-The further sections explain the process in more detail and provides some guidelines on how contributions should look like.
-
-Branches
---------
-There are two branches to be aware of, the `master` and the `develop` branch. The `master` branch is reserved for the latest release, so only make pull requests to the `master` branch for small bug- or security fixes (these are usually just a few lines). In all other cases, please make a pull request to the `develop` branch.
-
-Coding Style
-------------
-The coding style has been discussed in [#24](https://github.com/DaveGamble/cJSON/issues/24). The basics are:
-
-* Use 4 spaces for indentation
-* No oneliners (conditions, loops, variable declarations ...)
-* Always use parenthesis for control structures
-* Don't implicitly rely on operator precedence, use round brackets in expressions. e.g. `(a > b) && (c < d)` instead of `a>b && c<d`
-* opening curly braces start in the next line
-* use spaces around operators
-* lines should not have trailing whitespace
-* use spaces between function parameters
-* use pronouncable variable names, not just a combination of letters
-
-Example:
-
-```c
-/* calculate the new length of the string in a printbuffer and update the offset */
-static void update_offset(printbuffer * const buffer)
-{
-    const unsigned char *buffer_pointer = NULL;
-    if ((buffer == NULL) || (buffer->buffer == NULL))
-    {
-        return;
-    }
-    buffer_pointer = buffer->buffer + buffer->offset;
-
-    buffer->offset += strlen((const char*)buffer_pointer);
-}
-```
-
-Unit Tests
-----------
-cJSON uses the [Unity](https://github.com/ThrowTheSwitch/Unity) library for unit tests. The tests are located in the `tests` directory. In order to add a new test, either add it to one of the existing files (if it fits) or add a new C file for the test. That new file has to be added to the list of tests in `tests/CMakeLists.txt`.
-
-All new features have to be covered by unit tests.
-
-Other Notes
------------
-* Internal functions are to be declared static.
-* Wrap the return type of external function in the `CJSON_PUBLIC` macro.
diff --git a/external_libs/cJSON/cJSON/.gitignore b/external_libs/cJSON/cJSON/.gitignore
deleted file mode 100644
index e2e312b5..00000000
--- a/external_libs/cJSON/cJSON/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.svn
-test
-*.o
-*.a
-*.so
-*.swp
-*.patch
-tags
-*.dylib
-build/
-cJSON_test
-cJSON_test_utils
-libcjson.so.*
-libcjson_utils.so.*
-*.orig
-.vscode
diff --git a/external_libs/cJSON/cJSON/.travis.yml b/external_libs/cJSON/cJSON/.travis.yml
deleted file mode 100644
index e7ff744e..00000000
--- a/external_libs/cJSON/cJSON/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-dist: trusty
-sudo: false
-language: c
-env:
-  matrix:
-    - VALGRIND=On SANITIZERS=Off
-    - VALGRIND=Off SANITIZERS=Off
-    - VALGRIND=Off SANITIZERS=On
-compiler:
-  - gcc
-  - clang
-addons:
-  apt:
-    packages:
-      - valgrind
-      - libasan0
-      - lib32asan0
-      # currently not supported on travis:
-      # - libasan1
-      # - libasan2
-      # - libubsan0
-      - llvm
-script:
-  - mkdir build
-  - cd build
-  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SAFE_STACK="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
-  - make
-  - make test CTEST_OUTPUT_ON_FAILURE=On
diff --git a/external_libs/cJSON/cJSON/CHANGELOG.md b/external_libs/cJSON/cJSON/CHANGELOG.md
deleted file mode 100644
index 8d00cbb9..00000000
--- a/external_libs/cJSON/cJSON/CHANGELOG.md
+++ /dev/null
@@ -1,354 +0,0 @@
-1.7.7
-=====
-Fixes:
-------
-* Fix a memory leak when realloc fails (see #267), thanks @AlfieDeng for reporting
-* Fix a typo in the header file (see #266), thanks @zhaozhixu
-
-1.7.6
-=====
-Fixes:
-------
-* Add `SONAME` to the ELF files built by the Makefile (see #252), thanks @YanhaoMo for reporting
-* Add include guards and `extern "C"` to `cJSON_Utils.h` (see #256), thanks @daschfg for reporting
-
-Other changes:
---------------
-* Mark the Makefile as deprecated in the README.
-
-1.7.5
-=====
-Fixes:
-------
-* Fix a bug in the JSON Patch implementation of `cJSON Utils` (see #251), thanks @bobkocisko.
-
-1.7.4
-=====
-Fixes:
-------
-* Fix potential use after free if the `string` parameter to `cJSON_AddItemToObject` is an alias of the `string` property of the object that is added (#248). Thanks @hhallen for reporting.
-
-1.7.3
-=====
-Fixes:
-------
-* Fix potential double free, thanks @projectgus for reporting (see #241)
-
-1.7.2
-=====
-Fixes:
-------
-* Fix the use of GNUInstallDirs variables and the pkgconfig file. Thanks @zeerd for reporting (see #240)
-
-1.7.1
-=====
-Fixes:
-------
-* Fixed an Off-By-One error that could lead to an out of bounds write. Thanks @liuyunbin for reporting (see #230)
-* Fixed two errors with buffered printing. Thanks @liuyunbin for reporting (see #230)
-
-1.7.0
-=====
-Features:
----------
-* Large rewrite of the documentation, see #215
-* Added the `cJSON_GetStringValue` function
-* Added the `cJSON_CreateStringReference` function
-* Added the `cJSON_CreateArrayReference` function
-* Added the `cJSON_CreateObjectReference` function
-* The `cJSON_Add...ToObject` macros are now functions that return a pointer to the added item, see #226
-
-Fixes:
-------
-* Fix a problem with `GNUInstallDirs` in the CMakeLists.txt, thanks @yangfl, see #210
-* Fix linking the tests when building as static library, see #213
-* New overrides for the CMake option `BUILD_SHARED_LIBS`, see #207
-
-Other Changes:
---------------
-* Readme: Explain how to include cJSON, see #211
-* Removed some trailing spaces in the code, thanks @yangfl, see#212
-* Updated [Unity](https://github.com/ThrowTheSwitch/Unity) and [json-patch-tests](https://github.com/json-patch/json-patch-tests)
-
-1.6.0
-=====
-Features:
----------
-* You can now build cJSON as both shared and static library at once with CMake using `-DBUILD_SHARED_AND_STATIC_LIBS=On`, see #178
-* UTF-8 byte order marks are now ignored, see #184
-* Locales can now be disabled with the option `-DENABLE_LOCALES=Off`, see #202, thanks @Casperinous
-* Better support for MSVC and Visual Studio
-
-Other Changes:
---------------
-* Add the new warnings `-Wswitch-enum`, `-Wused-but-makred-unused`, `-Wmissing-variable-declarations`, `-Wunused-macro`
-* More number printing tests.
-* Continuous integration testing with AppVeyor (semi automatic at this point), thanks @simon-p-r
-
-1.5.9
-=====
-* Set the global error pointer even if `return_parse_end` is passed to `cJSON_ParseWithOpts`. See #200, thanks @rmallins
-
-1.5.8
-=====
-* Fix `make test` in the Makefile, thanks @YanhaoMo for reporting this (#195)
-
-1.5.7
-=====
-Fixes:
-------
-* Fix a bug where realloc failing would return a pointer to an invalid memory address. This is a security issue as it could potentially be used by an attacker to write to arbitrary memory addresses. (see #189), fixed in (954d61e5e7cb9dc6c480fc28ac1cdceca07dd5bd), big thanks @timothyjohncarney for reporting this issue
-* Fix a spelling mistake in the AFL fuzzer dictionary (#185), thanks @jwilk
-
-1.5.6
-=====
-Fixes:
-------
-* Make cJSON a lot more tolerant about passing NULL pointers to its functions, it should now fail safely instead of dereferencing the pointer. (#183) Thanks @msichal for reporting #182
-
-1.5.5
-=====
-Fixes:
-------
-* Fix pointers to nested arrays in cJSON_Utils (9abe75e072050f34732a7169740989a082b65134)
-* Fix an error with case sensitivity handling in cJSON_Utils (b9cc911831b0b3e1bb72f142389428e59f882b38)
-* Fix cJSON_Compare for arrays that are prefixes of the other and objects that are a subset of the other (03ba72faec115160d1f3aea5582d9b6af5d3e473) See #180, thanks @zhengqb for reporting
-
-1.5.4
-=====
-Fixes:
-------
-* Fix build with GCC 7.1.1 and optimization level `-O2` (bfbd8fe0d85f1dd21e508748fc10fc4c27cc51be)
-
-Other Changes:
---------------
-* Update [Unity](https://github.com/ThrowTheSwitch/Unity) to 3b69beaa58efc41bbbef70a32a46893cae02719d
-
-1.5.3
-=====
-Fixes:
-------
-* Fix `cJSON_ReplaceItemInObject` not keeping the name of an item (#174)
-
-1.5.2
-=====
-Fixes:
-------
-* Fix a reading buffer overflow in `parse_string` (a167d9e381e5c84bc03de4e261757b031c0c690d)
-* Fix compiling with -Wcomma (186cce3ece6ce6dfcb58ac8b2a63f7846c3493ad)
-* Remove leftover attribute from tests (b537ca70a35680db66f1f5b8b437f7114daa699a)
-
-1.5.1
-=====
-Fixes:
-------
-* Add gcc version guard to the Makefile (#164), thanks @juvasquezg
-* Fix incorrect free in `cJSON_Utils` if custom memory allocator is used (#166), thanks @prefetchnta
-
-1.5.0
-=====
-Features:
----------
-* cJSON finally prints numbers without losing precision (#153) thanks @DeboraG
-* `cJSON_Compare` recursively checks if two cJSON items contain the same values (#148)
-* Provide case sensitive versions of every function where it matters (#158, #159)
-* Added `cJSON_ReplaceItemViaPointer` and `cJSON_DetachItemViaPointer`
-* Added `cJSON_free` and `cJSON_malloc` that expose the internal configured memory allocators. (02a05eea4e6ba41811f130b322660bea8918e1a0)
-
-
-Enhancements:
--------------
-* Parse into a buffer, this will allow parsing `\u0000` in the future (not quite yet though)
-* General simplifications and readability improvements
-* More unit tests
-* Update [unity](https://github.com/ThrowTheSwitch/Unity) testing library to 2.4.1
-* Add the [json-patch-tests](https://github.com/json-patch/json-patch-tests) test suite to test cJSON_Utils.
-* Move all tests from `test_utils.c` to unit tests with unity.
-
-Fixes:
-------
-* Fix some warnings with the Microsoft compiler (#139) thanks @PawelWMS
-* Fix several bugs in cJSON_Utils, mostly found with [json-patch-tests](https://github.com/json-patch/json-patch-tests)
-* Prevent a stack overflow by specifying a maximum nesting depth `CJSON_NESTING_LIMIT`
-
-Other Changes:
---------------
-* Move generated files in the `library_config` subdirectory.
-
-1.4.7
-=====
-Fixes:
-------
-* Fix `cJSONUtils_ApplyPatches`, it was completely broken and apparently nobody noticed (or at least reported it) (075a06f40bdc4f836c7dd7cad690d253a57cfc50)
-* Fix inconsistent prototype for `cJSON_GetObjectItemCaseSensitive` (51d3df6c9f7b56b860c8fb24abe7bab255cd4fa9) thanks @PawelWMS
-
-1.4.6
-=====
-Fixes:
-------
-* Several corrections in the README
-* Making clear that `valueint` should not be written to
-* Fix overflow detection in `ensure` (2683d4d9873df87c4bdccc523903ddd78d1ad250)
-* Fix a potential null pointer dereference in cJSON_Utils (795c3acabed25c9672006b2c0f40be8845064827)
-* Replace incorrect `sizeof('\0')` with `sizeof("")` (84237ff48e69825c94261c624eb0376d0c328139)
-* Add caveats section to the README (50b3c30dfa89830f8f477ce33713500740ac3b79)
-* Make cJSON locale independent (#146) Thanks @peterh for reporting
-* Fix compiling without CMake with MSVC (#147) Thanks @dertuxmalwieder for reporting
-
-1.4.5
-=====
-Fixes:
-------
-* Fix bug in `cJSON_SetNumberHelper`, thanks @mmkeeper (#138 ef34500693e8c4a2849d41a4bd66fd19c9ec46c2)
-* Workaround for internal compiler error in GCC 5.4.0 and 6.3.1 on x86 (2f65e80a3471d053fdc3f8aed23d01dd1782a5cb [GCC bugreport](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80097))
-
-1.4.4
-=====
-Fixes:
---------
-* Fix a theoretical integer overflow, (not sure if it is possible on actual hardware) e58f7ec027d00b7cdcbf63e518c1b5268b29b3da
-* Fix an off by one error (cc84a446be20cc283bafdc4d94c050ba1111ac02), thanks @gatzka
-* Double check the offset of the print buffer in `ensure` (1934059554b9a0971e00f79e96900f422cfdd114)
-
-Improvements:
--------------
-* Add a note in the header about required buffer size when using `cJSON_PrintPreallocated` (4bfb88009342fb568295a7f6dc4b7fee74fbf022)
-
-1.4.3
-=====
-Fixes:
-------
-* Fix compilation of the tests on 32 bit PowerPC and potentially other systems (4ec6e76ea2eec16f54b58e8c95b4c734e59481e4)
-* Fix compilation with old GCC compilers (4.3+ were tested) (227d3398d6b967879761ebe02c1b63dbd6ea6e0d, 466eb8e3f8a65080f2b3ca4a79ab7b72bd539dba), see also #126
-
-1.4.2
-=====
-Fixes:
-------
-* Fix minimum required cmake version (30e1e7af7c63db9b55f5a3cda977a6c032f0b132)
-* Fix detection of supported compiler flags (76e5296d0d05ceb3018a9901639e0e171b44a557)
-* Run `cJSON_test` and `cJSON_test_utils` along with unity tests (c597601cf151a757dcf800548f18034d4ddfe2cb)
-
-1.4.1
-=====
-Fix: Make `print_number` abort with a failure in out of memory situations (cf1842dc6f64c49451a022308b4415e4d468be0a)
-
-1.4.0
-=====
-Features
---------
-* Functions to check the type of an item (#120)
-* Use dllexport on windows and fvisibility on Unix systems for public functions (#116), thanks @mjerris
-* Remove trailing zeroes from printed numbers (#123)
-* Expose the internal boolean type `cJSON_bool` in the header (2d3520e0b9d0eb870e8886e8a21c571eeddbb310)
-
-Fixes
------
-* Fix handling of NULL pointers in `cJSON_ArrayForEach` (b47d0e34caaef298edfb7bd09a72cfff21d231ff)
-* Make it compile with GCC 7 (fix -Wimplicit-fallthrough warning) (9d07917feb1b613544a7513d19233d4c851ad7ad)
-
-Other Improvements
-------------------
-* internally use realloc if available (#110)
-* builtin support for fuzzing with [afl](http://lcamtuf.coredump.cx/afl/) (#111)
-* unit tests for the print functions (#112)
-* Always use buffered printing (#113)
-* simplify the print functions (#114)
-* Add the compiler flags `-Wdouble-conversion`, `-Wparentheses` and `-Wcomma` (#122)
-
-1.3.2
-=====
-Fix:
-----
-- Don't build the unity library if testing is disabled ( #121 ). Thanks @ffontaine
-
-1.3.1
-=====
-Bugfix release that fixes an out of bounds read #118. This shouldn't have any security implications.
-
-1.3.0
-=====
-This release includes a lot of rework in the parser and includes the Cunity unit testing framework, as well as some fixes. I increased the minor version number because there were quite a lot of internal changes.
-
-Features:
----------
-- New type for cJSON structs: `cJSON_Invalid` (#108)
-
-Fixes:
-------
-- runtime checks for a lot of potential integer overflows
-- fix incorrect return in cJSON_PrintBuffered (cf9d57d56cac21fc59465b8d26cf29bf6d2a87b3)
-- fix several potential issues found by [Coverity](https://scan.coverity.com/projects/cjson)
-- fix potentially undefined behavior when assigning big numbers to `valueint` (41e2837df1b1091643aff073f2313f6ff3cc10f4)
-  - Numbers exceeding `INT_MAX` or lower than `INT_MIN` will be explicitly assigned to `valueint` as `INT_MAX` and `INT_MIN` respectively (saturation on overflow).
-  - fix the `cJSON_SetNumberValue` macro (87f77274de6b3af00fb9b9a7f3b900ef382296c2), this slightly changes the behavior, see commit message
-
-Introduce unit tests
---------------------
-
-Started writing unit tests with the [Cunity](https://github.com/ThrowTheSwitch/Unity) testing framework. Currently this covers the parser functions.
-
-Also:
-- Support for running the tests with [Valgrind](http://valgrind.org)
-- Support for compiling the tests with [AddressSanitizer](https://github.com/google/sanitizers) and [UndefinedBehaviorSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html).
-- `travis.yml` file for running unit tests on travis. (not enabled for the repository yet though #102)
-
-Simplifications
----------------
-
-After having unit tests for the parser function in place, I started refactoring the parser functions (as well as others) and making them easier to read and maintain.
-- Use `strtod` from the standard library for parsing numbers (074766997246481dfc72bfa78f07898a2716473f)
-- Use goto-fail in several parser functions (#100)
-- Rewrite/restructure all of the parsing functions to be easier to understand and have less code paths doing the same as another. (#109)
-- Simplify the buffer allocation strategy to always doubling the needed amount (9f6fa94c91a87b71e4c6868dbf2ce431a48517b0)
-- Combined `cJSON_AddItemToObject` and `cJSON_AddItemToObjectCS` to one function (cf862d0fed7f9407e4b046d78d3d8050d2080d12)
-
-Other changes
--------------
-- Prevent the usage of incompatible C and header versions via preprocessor directive (123bb1af7bfae41d805337fef4b41045ef6c7d25)
-- Let CMake automatically detect compiler flags
-- Add new compiler flags (`-Wundef`, `-Wswitch-default`, `-Wconversion`, `-fstack-protector-strong`) (#98)
-- Change internal sizes from `int` to `size_t` (ecd5678527a6bc422da694e5be9e9979878fe6a0)
-- Change internal strings from `char*` to `unsigned char*` (28b9ba4334e0f7309e867e874a31f395c0ac2474)
-- Add `const` in more places
-
-1.2.1
-=====
-Fixes:
-------
-- Fixes a potential null pointer dereference in cJSON_Utils, discovered using clang's static analyzer by @bnason-nf (#96)
-
-1.2.0
-=====
-Features:
----------
-- Add a new type of cJSON item for raw JSON and support printing it. Thanks @loigu (#65, #90)
-
-Fixes:
-------
-- Compiler warning if const is casted away, Thanks @gatzka (#83)
-- Fix compile error with strict-overflow on PowerPC, (#85)
-- Fix typo in the README, thanks @MicroJoe (#88)
-- Add compile flag for compatibility with C++ compilers
-
-1.1.0
-=====
-- Add a function `cJSON_PrintPreallocated` to print to a preallocated buffer, thanks @ChisholmKyle (#72)
-- More compiler warnings when using Clang or GCC, thanks @gatzka (#75, #78)
-- fixed a memory leak in `cJSON_Duplicate`, thanks @alperakcan (#81)
-- fix the `ENABLE_CUSTOM_COMPILER_FLAGS` cmake option
-
-1.0.2
-=====
-Rename internal boolean type, see #71.
-
-1.0.1
-=====
-Small bugfix release.
-- Fixes a bug with the use of the cJSON structs type in cJSON_Utils, see d47339e2740360e6e0994527d5e4752007480f3a
-- improve code readability
-- initialize all variables
-
-1.0.0
-=====
-This is the first official versioned release of cJSON. It provides an API version for the shared library and improved Makefile and CMake build files.
diff --git a/external_libs/cJSON/cJSON/CMakeLists.txt b/external_libs/cJSON/cJSON/CMakeLists.txt
deleted file mode 100644
index b347ac91..00000000
--- a/external_libs/cJSON/cJSON/CMakeLists.txt
+++ /dev/null
@@ -1,247 +0,0 @@
-set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.8.5)
-
-project(cJSON C)
-
-include(GNUInstallDirs)
-
-set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 7)
-set(PROJECT_VERSION_PATCH 7)
-set(CJSON_VERSION_SO 1)
-set(CJSON_UTILS_VERSION_SO 1)
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-
-set(custom_compiler_flags)
-
-include(CheckCCompilerFlag)
-option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags" ON)
-if (ENABLE_CUSTOM_COMPILER_FLAGS)
-    if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU"))
-        list(APPEND custom_compiler_flags
-            -std=c89
-            -pedantic
-            -Wall
-            -Wextra
-            -Werror
-            -Wstrict-prototypes
-            -Wwrite-strings
-            -Wshadow
-            -Winit-self
-            -Wcast-align
-            -Wformat=2
-            -Wmissing-prototypes
-            -Wstrict-overflow=2
-            -Wcast-qual
-            -Wundef
-            -Wswitch-default
-            -Wconversion
-            -Wc++-compat
-            -fstack-protector-strong
-            -Wcomma
-            -Wdouble-promotion
-            -Wparentheses
-            -Wformat-overflow
-            -Wunused-macros
-            -Wmissing-variable-declarations
-            -Wused-but-marked-unused
-            -Wswitch-enum
-        )
-    elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-        list(APPEND custom_compiler_flags
-            /GS
-            /Za
-            /sdl
-            /W4
-        )
-    endif()
-endif()
-
-option(ENABLE_SANITIZERS "Enables AddressSanitizer and UndefinedBehaviorSanitizer." OFF)
-if (ENABLE_SANITIZERS)
-    list(APPEND custom_compiler_flags
-        -fno-omit-frame-pointer
-        -fsanitize=address
-        -fsanitize=undefined
-        -fsanitize=float-divide-by-zero
-        -fsanitize=float-cast-overflow
-        -fsanitize-address-use-after-scope
-        -fsanitize=integer
-        -01
-        -fno-sanitize-recover
-        )
-endif()
-
-option(ENABLE_SAFE_STACK "Enables the SafeStack instrumentation pass by the Code Pointer Integrity Project" OFF)
-if (ENABLE_SAFE_STACK)
-    if (ENABLE_SANITIZERS)
-        message(FATAL_ERROR "ENABLE_SAFE_STACK cannot be used in combination with ENABLE_SANITIZERS")
-    endif()
-    list(APPEND custom_compiler_flags
-        -fsanitize=safe-stack
-        )
-endif()
-
-option(ENABLE_PUBLIC_SYMBOLS "Export library symbols." On)
-if (ENABLE_PUBLIC_SYMBOLS)
-    list(APPEND custom_compiler_flags -fvisibility=hidden)
-    add_definitions(-DCJSON_EXPORT_SYMBOLS -DCJSON_API_VISIBILITY)
-endif()
-option(ENABLE_HIDDEN_SYMBOLS "Hide library symbols." Off)
-if (ENABLE_HIDDEN_SYMBOLS)
-    add_definitions(-DCJSON_HIDE_SYMBOLS -UCJSON_API_VISIBILITY)
-endif()
-
-# apply custom compiler flags
-foreach(compiler_flag ${custom_compiler_flags})
-    #remove problematic characters
-    string(REGEX REPLACE "[^a-zA-Z0-9]" "" current_variable ${compiler_flag})
-
-    CHECK_C_COMPILER_FLAG(${compiler_flag} "FLAG_SUPPORTED_${current_variable}")
-    if (FLAG_SUPPORTED_${current_variable})
-        list(APPEND supported_compiler_flags)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${compiler_flag}")
-    endif()
-endforeach()
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${supported_compiler_flags}")
-
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-option(ENABLE_TARGET_EXPORT "Enable exporting of CMake targets. Disable when it causes problems!" ON)
-
-#cJSON
-set(CJSON_LIB cjson)
-
-file(GLOB HEADERS cJSON.h)
-set(SOURCES cJSON.c)
-
-option(BUILD_SHARED_AND_STATIC_LIBS "Build both shared and static libraries" Off)
-option(CJSON_OVERRIDE_BUILD_SHARED_LIBS "Override BUILD_SHARED_LIBS with CJSON_BUILD_SHARED_LIBS" OFF)
-option(CJSON_BUILD_SHARED_LIBS "Overrides BUILD_SHARED_LIBS if CJSON_OVERRIDE_BUILD_SHARED_LIBS is enabled" ON)
-
-if ((CJSON_OVERRIDE_BUILD_SHARED_LIBS AND CJSON_BUILD_SHARED_LIBS) OR ((NOT CJSON_OVERRIDE_BUILD_SHARED_LIBS) AND BUILD_SHARED_LIBS))
-    set(CJSON_LIBRARY_TYPE SHARED)
-else()
-    set(CJSON_LIBRARY_TYPE STATIC)
-endif()
-
-
-if (NOT BUILD_SHARED_AND_STATIC_LIBS)
-    add_library("${CJSON_LIB}" "${CJSON_LIBRARY_TYPE}" "${HEADERS}" "${SOURCES}")
-else()
-    # See https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
-    add_library("${CJSON_LIB}" SHARED "${HEADERS}" "${SOURCES}")
-    add_library("${CJSON_LIB}-static" STATIC "${HEADERS}" "${SOURCES}")
-    set_target_properties("${CJSON_LIB}-static" PROPERTIES OUTPUT_NAME "${CJSON_LIB}")
-    set_target_properties("${CJSON_LIB}-static" PROPERTIES PREFIX "lib")
-endif()
-if (NOT WIN32)
-    target_link_libraries("${CJSON_LIB}" m)
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)
-
-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}")
-if (BUILD_SHARED_AND_STATIC_LIBS)
-    install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
-endif()
-if(ENABLE_TARGET_EXPORT)
-    # export library information for CMake projects
-    install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
-endif()
-
-set_target_properties("${CJSON_LIB}"
-    PROPERTIES
-        SOVERSION "${CJSON_VERSION_SO}"
-        VERSION "${PROJECT_VERSION}")
-
-#cJSON_Utils
-option(ENABLE_CJSON_UTILS "Enable building the cJSON_Utils library." OFF)
-if(ENABLE_CJSON_UTILS)
-    set(CJSON_UTILS_LIB cjson_utils)
-
-    file(GLOB HEADERS_UTILS cJSON_Utils.h)
-    set(SOURCES_UTILS cJSON_Utils.c)
-
-    if (NOT BUILD_SHARED_AND_STATIC_LIBS)
-        add_library("${CJSON_UTILS_LIB}" "${CJSON_LIBRARY_TYPE}" "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
-    else()
-        add_library("${CJSON_UTILS_LIB}" SHARED "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
-        add_library("${CJSON_UTILS_LIB}-static" STATIC "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        target_link_libraries("${CJSON_UTILS_LIB}-static" "${CJSON_LIB}-static")
-        set_target_properties("${CJSON_UTILS_LIB}-static" PROPERTIES OUTPUT_NAME "${CJSON_UTILS_LIB}")
-        set_target_properties("${CJSON_UTILS_LIB}-static" PROPERTIES PREFIX "lib")
-    endif()
-
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)
-
-    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
-    if (BUILD_SHARED_AND_STATIC_LIBS)
-        install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
-    endif()
-    install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-    if(ENABLE_TARGET_EXPORT)
-      # export library information for CMake projects
-      install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
-    endif()
-
-    set_target_properties("${CJSON_UTILS_LIB}"
-        PROPERTIES
-            SOVERSION "${CJSON_UTILS_VERSION_SO}"
-            VERSION "${PROJECT_VERSION}")
-endif()
-
-# create the other package config files
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/library_config/cJSONConfig.cmake.in"
-    ${PROJECT_BINARY_DIR}/cJSONConfig.cmake @ONLY)
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/library_config/cJSONConfigVersion.cmake.in"
-    ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake @ONLY)
-
-# Install package config files
-install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
-    ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
-    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
-
-option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
-if(ENABLE_CJSON_TEST)
-    enable_testing()
-
-    set(TEST_CJSON cJSON_test)
-    add_executable("${TEST_CJSON}" test.c)
-    target_link_libraries("${TEST_CJSON}" "${CJSON_LIB}")
-
-    add_test(NAME ${TEST_CJSON} COMMAND "${CMAKE_CURRENT_BINARY_DIR}/${TEST_CJSON}")
-
-    # Disable -fsanitize=float-divide-by-zero for cJSON_test
-    if (FLAG_SUPPORTED_fsanitizefloatdividebyzero)
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=float-divide-by-zero")
-        else()
-            target_compile_options(${TEST_CJSON} PRIVATE "-fno-sanitize=float-divide-by-zero")
-        endif()
-    endif()
-
-    #"check" target that automatically builds everything and runs the tests
-    add_custom_target(check
-        COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
-        DEPENDS ${TEST_CJSON})
-endif()
-
-# Enable the use of locales
-option(ENABLE_LOCALES "Enable the use of locales" ON)
-if(ENABLE_LOCALES)
-	add_definitions(-DENABLE_LOCALES)
-endif()
-
-add_subdirectory(tests)
-add_subdirectory(fuzzing)
diff --git a/external_libs/cJSON/cJSON/CONTRIBUTORS.md b/external_libs/cJSON/cJSON/CONTRIBUTORS.md
deleted file mode 100644
index 434a90d7..00000000
--- a/external_libs/cJSON/cJSON/CONTRIBUTORS.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Contributors
-============
-
-Original Author: [Dave Gamble](https://github.com/DaveGamble)
-Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
-
-* [Ajay Bhargav](https://github.com/ajaybhargav)
-* [Alper Akcan](https://github.com/alperakcan)
-* [Anton Sergeev](https://github.com/anton-sergeev)
-* [Bob Kocisko](https://github.com/bobkocisko)
-* [Christian Schulze](https://github.com/ChristianSch)
-* [Casperinous](https://github.com/Casperinous)
-* [Debora Grosse](https://github.com/DeboraG)
-* [dieyushi](https://github.com/dieyushi)
-* [Dōngwén Huáng (黄东文)](https://github.com/DongwenHuang)
-* Eswar Yaganti
-* [Evan Todd](https://github.com/etodd)
-* [Fabrice Fontaine](https://github.com/ffontaine)
-* Ian Mobley
-* Irwan Djadjadi
-* [IvanVoid](https://github.com/npi3pak)
-* [Jakub Wilk](https://github.com/jwilk)
-* [Jiri Zouhar](https://github.com/loigu)
-* [Jonathan Fether](https://github.com/jfether)
-* [Julián Vásquez](https://github.com/juvasquezg)
-* [Kevin Branigan](https://github.com/kbranigan)
-* [Kyle Chisholm](https://github.com/ChisholmKyle)
-* [Linus Wallgren](https://github.com/ecksun)
-* Mike Pontillo
-* [Mike Jerris](https://github.com/mjerris)
-* [Mike Robinson](https://github.com/mhrobinson)
-* Paulo Antonio Alvarez
-* [Pawel Winogrodzki](https://github.com/PawelWMS)
-* [prefetchnta](https://github.com/prefetchnta)
-* [Rafael Leal Dias](https://github.com/rafaeldias)
-* [Robin Mallinson](https://github.com/rmallins)
-* [Rod Vagg](https://github.com/rvagg)
-* [Roland Meertens](https://github.com/rmeertens)
-* [Romain Porte](https://github.com/MicroJoe)
-* [Simon Ricaldone](https://github.com/simon-p-r)
-* [Stephan Gatzka](https://github.com/gatzka)
-* [Weston Schmidt](https://github.com/schmidtw)
-* [yangfl](https://github.com/yangfl)
-* [Zhao Zhixu](https://github.com/zhaozhixu)
-
-And probably more people on [SourceForge](https://sourceforge.net/p/cjson/bugs/search/?q=status%3Aclosed-rejected+or+status%3Aclosed-out-of-date+or+status%3Awont-fix+or+status%3Aclosed-fixed+or+status%3Aclosed&page=0)
-
-Also thanks to all the people who reported bugs and suggested new features.
diff --git a/external_libs/cJSON/cJSON/LICENSE b/external_libs/cJSON/cJSON/LICENSE
deleted file mode 100644
index 78deb040..00000000
--- a/external_libs/cJSON/cJSON/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/external_libs/cJSON/cJSON/Makefile b/external_libs/cJSON/cJSON/Makefile
deleted file mode 100644
index 456b13a3..00000000
--- a/external_libs/cJSON/cJSON/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-CJSON_OBJ = cJSON.o
-UTILS_OBJ = cJSON_Utils.o
-CJSON_LIBNAME = libcjson
-UTILS_LIBNAME = libcjson_utils
-CJSON_TEST = cJSON_test
-
-CJSON_TEST_SRC = cJSON.c test.c
-
-LDLIBS = -lm
-
-LIBVERSION = 1.7.7
-CJSON_SOVERSION = 1
-UTILS_SOVERSION = 1
-
-CJSON_SO_LDFLAG=-Wl,-soname=$(CJSON_LIBNAME).so.$(CJSON_SOVERSION)
-UTILS_SO_LDFLAG=-Wl,-soname=$(UTILS_LIBNAME).so.$(UTILS_SOVERSION)
-
-PREFIX ?= /usr/local
-INCLUDE_PATH ?= include/cjson
-LIBRARY_PATH ?= lib
-
-INSTALL_INCLUDE_PATH = $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
-
-INSTALL ?= cp -a
-
-# validate gcc version for use fstack-protector-strong
-MIN_GCC_VERSION = "4.9"
-GCC_VERSION := "`$(CC) -dumpversion`"
-IS_GCC_ABOVE_MIN_VERSION := $(shell expr "$(GCC_VERSION)" ">=" "$(MIN_GCC_VERSION)")
-ifeq "$(IS_GCC_ABOVE_MIN_VERSION)" "1"
-    CFLAGS += -fstack-protector-strong
-else
-    CFLAGS += -fstack-protector
-endif
-
-R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default -Wconversion $(CFLAGS)
-
-uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')
-
-#library file extensions
-SHARED = so
-STATIC = a
-
-## create dynamic (shared) library on Darwin (base OS for MacOSX and IOS)
-ifeq (Darwin, $(uname))
-	SHARED = dylib
-	CJSON_SO_LDFLAG = ""
-    UTILS_SO_LDFLAG = ""
-endif
-
-#cJSON library names
-CJSON_SHARED = $(CJSON_LIBNAME).$(SHARED)
-CJSON_SHARED_VERSION = $(CJSON_LIBNAME).$(SHARED).$(LIBVERSION)
-CJSON_SHARED_SO = $(CJSON_LIBNAME).$(SHARED).$(CJSON_SOVERSION)
-CJSON_STATIC = $(CJSON_LIBNAME).$(STATIC)
-
-#cJSON_Utils library names
-UTILS_SHARED = $(UTILS_LIBNAME).$(SHARED)
-UTILS_SHARED_VERSION = $(UTILS_LIBNAME).$(SHARED).$(LIBVERSION)
-UTILS_SHARED_SO = $(UTILS_LIBNAME).$(SHARED).$(UTILS_SOVERSION)
-UTILS_STATIC = $(UTILS_LIBNAME).$(STATIC)
-
-SHARED_CMD = $(CC) -shared -o
-
-.PHONY: all shared static tests clean install
-
-all: shared static tests
-
-shared: $(CJSON_SHARED) $(UTILS_SHARED)
-
-static: $(CJSON_STATIC) $(UTILS_STATIC)
-
-tests: $(CJSON_TEST)
-
-test: tests
-	./$(CJSON_TEST)
-
-.c.o:
-	$(CC) -c $(R_CFLAGS) $<
-
-#tests
-#cJSON
-$(CJSON_TEST): $(CJSON_TEST_SRC) cJSON.h
-	$(CC) $(R_CFLAGS) $(CJSON_TEST_SRC)  -o $@ $(LDLIBS) -I.
-
-#static libraries
-#cJSON
-$(CJSON_STATIC): $(CJSON_OBJ)
-	$(AR) rcs $@ $<
-#cJSON_Utils
-$(UTILS_STATIC): $(UTILS_OBJ)
-	$(AR) rcs $@ $<
-
-#shared libraries .so.1.0.0
-#cJSON
-$(CJSON_SHARED_VERSION): $(CJSON_OBJ)
-	$(CC) -shared -o $@ $< $(CJSON_SO_LDFLAG) $(LDFLAGS)
-#cJSON_Utils
-$(UTILS_SHARED_VERSION): $(UTILS_OBJ)
-	$(CC) -shared -o $@ $< $(UTILS_SO_LDFLAG) $(LDFLAGS)
-
-#objects
-#cJSON
-$(CJSON_OBJ): cJSON.c cJSON.h
-#cJSON_Utils
-$(UTILS_OBJ): cJSON_Utils.c cJSON_Utils.h
-
-
-#links .so -> .so.1 -> .so.1.0.0
-#cJSON
-$(CJSON_SHARED_SO): $(CJSON_SHARED_VERSION)
-	ln -s $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO)
-$(CJSON_SHARED): $(CJSON_SHARED_SO)
-	ln -s $(CJSON_SHARED_SO) $(CJSON_SHARED)
-#cJSON_Utils
-$(UTILS_SHARED_SO): $(UTILS_SHARED_VERSION)
-	ln -s $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO)
-$(UTILS_SHARED): $(UTILS_SHARED_SO)
-	ln -s $(UTILS_SHARED_SO) $(UTILS_SHARED)
-
-#install
-#cJSON
-install-cjson:
-	mkdir -p $(INSTALL_LIBRARY_PATH) $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) cJSON.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) $(CJSON_SHARED) $(CJSON_SHARED_SO) $(CJSON_SHARED_VERSION) $(INSTALL_LIBRARY_PATH)
-#cJSON_Utils
-install-utils: install-cjson
-	$(INSTALL) cJSON_Utils.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) $(UTILS_SHARED) $(UTILS_SHARED_SO) $(UTILS_SHARED_VERSION) $(INSTALL_LIBRARY_PATH)
-
-install: install-cjson install-utils
-
-#uninstall
-#cJSON
-uninstall-cjson: uninstall-utils
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED)
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED_VERSION)
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED_SO)
-	rmdir $(INSTALL_LIBRARY_PATH)
-	$(RM) $(INSTALL_INCLUDE_PATH)/cJSON.h
-	rmdir $(INSTALL_INCLUDE_PATH)
-#cJSON_Utils
-uninstall-utils:
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED)
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED_VERSION)
-	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED_SO)
-	$(RM) $(INSTALL_INCLUDE_PATH)/cJSON_Utils.h
-
-uninstall: uninstall-utils uninstall-cjson
-
-clean:
-	$(RM) $(CJSON_OBJ) $(UTILS_OBJ) #delete object files
-	$(RM) $(CJSON_SHARED) $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO) $(CJSON_STATIC) #delete cJSON
-	$(RM) $(UTILS_SHARED) $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO) $(UTILS_STATIC) #delete cJSON_Utils
-	$(RM) $(CJSON_TEST)  #delete test
diff --git a/external_libs/cJSON/cJSON/README.md b/external_libs/cJSON/cJSON/README.md
deleted file mode 100644
index c6b788f9..00000000
--- a/external_libs/cJSON/cJSON/README.md
+++ /dev/null
@@ -1,531 +0,0 @@
-# cJSON
-
-Ultralightweight JSON parser in ANSI C.
-
-## Table of contents
-* [License](#license)
-* [Usage](#usage)
-  * [Welcome to cJSON](#welcome-to-cjson)
-  * [Building](#building)
-    * [Copying the source](#copying-the-source)
-    * [CMake](#cmake)
-    * [Makefile](#makefile)
-  * [Including cJSON](#including-cjson)
-  * [Data Structure](#data-structure)
-  * [Working with the data structure](#working-with-the-data-structure)
-    * [Basic types](#basic-types)
-    * [Arrays](#arrays)
-    * [Objects](#objects)
-  * [Parsing JSON](#parsing-json)
-  * [Printing JSON](#printing-json)
-  * [Example](#example)
-    * [Printing](#printing)
-    * [Parsing](#parsing)
-  * [Caveats](#caveats)
-    * [Zero Character](#zero-character)
-    * [Character Encoding](#character-encoding)
-    * [C Standard](#c-standard)
-    * [Floating Point Numbers](#floating-point-numbers)
-    * [Deep Nesting Of Arrays And Objects](#deep-nesting-of-arrays-and-objects)
-    * [Thread Safety](#thread-safety)
-    * [Case Sensitivity](#case-sensitivity)
-    * [Duplicate Object Members](#duplicate-object-members)
-  * [Enjoy cJSON!](#enjoy-cjson)
-
-## License
-
-MIT License
-
->  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
->
->  Permission is hereby granted, free of charge, to any person obtaining a copy
->  of this software and associated documentation files (the "Software"), to deal
->  in the Software without restriction, including without limitation the rights
->  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
->  copies of the Software, and to permit persons to whom the Software is
->  furnished to do so, subject to the following conditions:
->
->  The above copyright notice and this permission notice shall be included in
->  all copies or substantial portions of the Software.
->
->  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
->  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
->  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
->  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
->  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
->  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
->  THE SOFTWARE.
-
-## Usage
-
-### Welcome to cJSON.
-
-cJSON aims to be the dumbest possible parser that you can get your job done with.
-It's a single file of C, and a single header file.
-
-JSON is described best here: http://www.json.org/
-It's like XML, but fat-free. You use it to move data around, store things, or just
-generally represent your program's state.
-
-As a library, cJSON exists to take away as much legwork as it can, but not get in your way.
-As a point of pragmatism (i.e. ignoring the truth), I'm going to say that you can use it
-in one of two modes: Auto and Manual. Let's have a quick run-through.
-
-I lifted some JSON from this page: http://www.json.org/fatfree.html
-That page inspired me to write cJSON, which is a parser that tries to share the same
-philosophy as JSON itself. Simple, dumb, out of the way.
-
-### Building
-
-There are several ways to incorporate cJSON into your project.
-
-#### copying the source
-Because the entire library is only one C file and one header file, you can just copy `cJSON.h` and `cJSON.c` to your projects source and start using it.
-
-cJSON is written in ANSI C (C89) in order to support as many platforms and compilers as possible.
-
-#### CMake
-With CMake, cJSON supports a full blown build system. This way you get the most features. CMake with an equal or higher version than 2.8.5 is supported. With CMake it is recommended to do an out of tree build, meaning the compiled files are put in a directory separate from the source files. So in order to build cJSON with CMake on a Unix platform, make a `build` directory and run CMake inside it.
-
-```
-mkdir build
-cd build
-cmake ..
-```
-
-This will create a Makefile and a bunch of other files. You can then compile it:
-
-```
-make
-```
-
-And install it with `make install` if you want. By default it installs the headers `/usr/local/include/cjson` and the libraries to `/usr/local/lib`. It also installs files for pkg-config to make it easier to detect and use an existing installation of CMake. And it installs CMake config files, that can be used by other CMake based projects to discover the library.
-
-You can change the build process with a list of different options that you can pass to CMake. Turn them on with `On` and off with `Off`:
-* `-DENABLE_CJSON_TEST=On`: Enable building the tests. (on by default)
-* `-DENABLE_CJSON_UTILS=On`: Enable building cJSON_Utils. (off by default)
-* `-DENABLE_TARGET_EXPORT=On`: Enable the export of CMake targets. Turn off if it makes problems. (on by default)
-* `-DENABLE_CUSTOM_COMPILER_FLAGS=On`: Enable custom compiler flags (currently for Clang, GCC and MSVC). Turn off if it makes problems. (on by default)
-* `-DENABLE_VALGRIND=On`: Run tests with [valgrind](http://valgrind.org). (off by default)
-* `-DENABLE_SANITIZERS=On`: Compile cJSON with [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) and [UndefinedBehaviorSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) enabled (if possible). (off by default)
-* `-DENABLE_SAFE_STACK`: Enable the [SafeStack](https://clang.llvm.org/docs/SafeStack.html) instrumentation pass. Currently only works with the Clang compiler. (off by default)
-* `-DBUILD_SHARED_LIBS=On`: Build the shared libraries. (on by default)
-* `-DBUILD_SHARED_AND_STATIC_LIBS=On`: Build both shared and static libraries. (off by default)
-* `-DCMAKE_INSTALL_PREFIX=/usr`: Set a prefix for the installation.
-* `-DENABLE_LOCALES=On`: Enable the usage of localeconv method. ( on by default )
-* `-DCJSON_OVERRIDE_BUILD_SHARED_LIBS=On`: Enable overriding the value of `BUILD_SHARED_LIBS` with `-DCJSON_BUILD_SHARED_LIBS`.
-
-If you are packaging cJSON for a distribution of Linux, you would probably take these steps for example:
-```
-mkdir build
-cd build
-cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_CJSON_TEST=Off -DCMAKE_INSTALL_PREFIX=/usr
-make
-make DESTDIR=$pkgdir install
-```
-
-On Windows CMake is usually used to create a Visual Studio solution file by running it inside the Developer Command Prompt for Visual Studio, for exact steps follow the official documentation from CMake and Microsoft and use the online search engine of your choice. The descriptions of the the options above still generally apply, although not all of them work on Windows.
-
-#### Makefile
-**NOTE:** This Method is deprecated. Use CMake if at all possible. Makefile support is limited to fixing bugs.
-
-If you don't have CMake available, but still have GNU make. You can use the makefile to build cJSON:
-
-Run this command in the directory with the source code and it will automatically compile static and shared libraries and a little test program (not the full test suite).
-
-```
-make all
-```
-
-If you want, you can install the compiled library to your system using `make install`. By default it will install the headers in `/usr/local/include/cjson` and the libraries in `/usr/local/lib`. But you can change this behavior by setting the `PREFIX` and `DESTDIR` variables: `make PREFIX=/usr DESTDIR=temp install`.
-
-### Including cJSON
-If you installed it via CMake or the Makefile, you can include cJSON like this:
-
-```c
-#include <cjson/cJSON.h>
-```
-
-### Data Structure
-
-cJSON represents JSON data using the `cJSON` struct data type:
-
-```c
-/* The cJSON structure: */
-typedef struct cJSON
-{
-    struct cJSON *next;
-    struct cJSON *prev;
-    struct cJSON *child;
-    int type;
-    char *valuestring;
-    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
-    int valueint;
-    double valuedouble;
-    char *string;
-} cJSON;
-```
-
-An item of this type represents a JSON value. The type is stored in `type` as a bit-flag (**this means that you cannot find out the type by just comparing the value of `type`**).
-
-To check the type of an item, use the corresponding `cJSON_Is...` function. It does a `NULL` check followed by a type check and returns a boolean value if the item is of this type.
-
-The type can be one of the following:
-* `cJSON_Invalid` (check with `cJSON_IsInvalid`): Represents an invalid item that doesn't contain any value. You automatically have this type if you set the item to all zero bytes.
-* `cJSON_False` (check with `cJSON_IsFalse`): Represents a `false` boolean value. You can also check for boolean values in general with `cJSON_IsBool`.
-* `cJSON_True` (check with `cJSON_IsTrue`): Represents a `true` boolean value. You can also check for boolean values in general with `cJSON_IsBool`.
-* `cJSON_NULL` (check with `cJSON_IsNull`): Represents a `null` value.
-* `cJSON_Number` (check with `cJSON_IsNumber`): Represents a number value. The value is stored as a double in `valuedouble` and also in `valueint`. If the number is outside of the range of an integer, `INT_MAX` or `INT_MIN` are used for `valueint`.
-* `cJSON_String` (check with `cJSON_IsString`): Represents a string value. It is stored in the form of a zero terminated string in `valuestring`.
-* `cJSON_Array` (check with `cJSON_IsArray`): Represent an array value. This is implemented by pointing `child` to a linked list of `cJSON` items that represent the values in the array. The elements are linked together using `next` and `prev`, where the first element has `prev == NULL` and the last element `next == NULL`.
-* `cJSON_Object` (check with `cJSON_IsObject`): Represents an object value. Objects are stored same way as an array, the only difference is that the items in the object store their keys in `string`.
-* `cJSON_Raw` (check with `cJSON_IsRaw`): Represents any kind of JSON that is stored as a zero terminated array of characters in `valuestring`. This can be used, for example, to avoid printing the same static JSON over and over again to save performance. cJSON will never create this type when parsing. Also note that cJSON doesn't check if it is valid JSON.
-
-Additionally there are the following two flags:
-* `cJSON_IsReference`: Specifies that the item that `child` points to and/or `valuestring` is not owned by this item, it is only a reference. So `cJSON_Delete` and other functions will only deallocate this item, not it's children/valuestring.
-* `cJSON_StringIsConst`: This means that `string` points to a constant string. This means that `cJSON_Delete` and other functions will not try to deallocate `string`.
-
-### Working with the data structure
-
-For every value type there is a `cJSON_Create...` function that can be used to create an item of that type.
-All of these will allocate a `cJSON` struct that can later be deleted with `cJSON_Delete`.
-Note that you have to delete them at some point, otherwise you will get a memory leak.
-**Important**: If you have added an item to an array or an object already, you **mustn't** delete it with `cJSON_Delete`. Adding it to an array or object transfers its ownership so that when that array or object is deleted, it gets deleted as well.
-
-#### Basic types
-* **null** is created with `cJSON_CreateNull`
-* **booleans** are created with `cJSON_CreateTrue`, `cJSON_CreateFalse` or `cJSON_CreateBool`
-* **numbers** are created with `cJSON_CreateNumber`. This will set both `valuedouble` and `valueint`. If the number is outside of the range of an integer, `INT_MAX` or `INT_MIN` are used for `valueint`
-* **strings** are created with `cJSON_CreateString` (copies the string) or with `cJSON_CreateStringReference` (directly points to the string. This means that `valuestring` won't be deleted by `cJSON_Delete` and you are responsible for it's lifetime, useful for constants)
-
-#### Arrays
-
-You can create an empty array with `cJSON_CreateArray`. `cJSON_CreateArrayReference` can be used to create an array that doesn't "own" its content, so its content doesn't get deleted by `cJSON_Delete`.
-
-To add items to an array, use `cJSON_AddItemToArray` to append items to the end.
-Using `cJSON_AddItemReferenceToArray` an element can be added as a reference to another item, array or string. This means that `cJSON_Delete` will not delete that items `child` or `valuestring` properties, so no double frees are occuring if they are already used elsewhere.
-To insert items in the middle, use `cJSON_InsertItemInArray`. It will insert an item at the given 0 based index and shift all the existing items to the right.
-
-If you want to take an item out of an array at a given index and continue using it, use `cJSON_DetachItemFromArray`, it will return the detached item, so be sure to assign it to a pointer, otherwise you will have a memory leak.
-
-Deleting items is done with `cJSON_DeleteItemFromArray`. It works like `cJSON_DetachItemFromArray`, but deletes the detached item via `cJSON_Delete`.
-
-You can also replace an item in an array in place. Either with `cJSON_ReplaceItemInArray` using an index or with `cJSON_ReplaceItemViaPointer` given a pointer to an element. `cJSON_ReplaceItemViaPointer` will return `0` if it fails. What this does internally is to detach the old item, delete it and insert the new item in its place.
-
-To get the size of an array, use `cJSON_GetArraySize`. Use `cJSON_GetArrayItem` to get an element at a given index.
-
-Because an array is stored as a linked list, iterating it via index is inefficient (`O(n²)`), so you can iterate over an array using the `cJSON_ArrayForEach` macro in `O(n)` time complexity.
-
-#### Objects
-
-You can create an empty object with `cJSON_CreateObject`. `cJSON_CreateObjectReference` can be used to create an object that doesn't "own" its content, so its content doesn't get deleted by `cJSON_Delete`.
-
-To add items to an object, use `cJSON_AddItemToObject`. Use `cJSON_AddItemToObjectCS` to add an item to an object with a name that is a constant or reference (key of the item, `string` in the `cJSON` struct), so that it doesn't get freed by `cJSON_Delete`.
-Using `cJSON_AddItemReferenceToArray` an element can be added as a reference to another object, array or string. This means that `cJSON_Delete` will not delete that items `child` or `valuestring` properties, so no double frees are occuring if they are already used elsewhere.
-
-If you want to take an item out of an object, use `cJSON_DetachItemFromObjectCaseSensitive`, it will return the detached item, so be sure to assign it to a pointer, otherwise you will have a memory leak.
-
-Deleting items is done with `cJSON_DeleteItemFromObjectCaseSensitive`. It works like `cJSON_DetachItemFromObjectCaseSensitive` followed by `cJSON_Delete`.
-
-You can also replace an item in an object in place. Either with `cJSON_ReplaceItemInObjectCaseSensitive` using a key or with `cJSON_ReplaceItemViaPointer` given a pointer to an element. `cJSON_ReplaceItemViaPointer` will return `0` if it fails. What this does internally is to detach the old item, delete it and insert the new item in its place.
-
-To get the size of an object, you can use `cJSON_GetArraySize`, this works because internally objects are stored as arrays.
-
-If you want to access an item in an object, use `cJSON_GetObjectItemCaseSensitive`.
-
-To iterate over an object, you can use the `cJSON_ArrayForEach` macro the same way as for arrays.
-
-cJSON also provides convenient helper functions for quickly creating a new item and adding it to an object, like `cJSON_AddNullToObject`. They return a pointer to the new item or `NULL` if they failed.
-
-### Parsing JSON
-
-Given some JSON in a zero terminated string, you can parse it with `cJSON_Parse`.
-
-```c
-cJSON *json = cJSON_Parse(string);
-```
-
-It will parse the JSON and allocate a tree of `cJSON` items that represents it. Once it returns, you are fully responsible for deallocating it after use with `cJSON_Delete`.
-
-The allocator used by `cJSON_Parse` is `malloc` and `free` by default but can be changed (globally) with `cJSON_InitHooks`.
-
-If an error occurs a pointer to the position of the error in the input string can be accessed using `cJSON_GetErrorPtr`. Note though that this can produce race conditions in multithreading scenarios, in that case it is better to use `cJSON_ParseWithOpts` with `return_parse_end`.
-By default, characters in the input string that follow the parsed JSON will not be considered as an error.
-
-If you want more options, use `cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)`.
-`return_parse_end` returns a pointer to the end of the JSON in the input string or the position that an error occurs at (thereby replacing `cJSON_GetErrorPtr` in a thread safe way). `require_null_terminated`, if set to `1` will make it an error if the input string contains data after the JSON.
-
-### Printing JSON
-
-Given a tree of `cJSON` items, you can print them as a string using `cJSON_Print`.
-
-```c
-char *string = cJSON_Print(json);
-```
-
-It will allocate a string and print a JSON representation of the tree into it. Once it returns, you are fully responsible for deallocating it after use with your allocator. (usually `free`, depends on what has been set with `cJSON_InitHooks`).
-
-`cJSON_Print` will print with whitespace for formatting. If you want to print without formatting, use `cJSON_PrintUnformatted`.
-
-If you have a rough idea of how big your resulting string will be, you can use `cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)`. `fmt` is a boolean to turn formatting with whitespace on and off. `prebuffer` specifies the first buffer size to use for printing. `cJSON_Print` currently uses 256 bytes for it's first buffer size. Once printing runs out of space, a new buffer is allocated and the old gets copied over before printing is continued.
-
-These dynamic buffer allocations can be completely avoided by using `cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format)`. It takes a buffer to a pointer to print to and it's length. If the length is reached, printing will fail and it returns `0`. In case of success, `1` is returned. Note that you should provide 5 bytes more than is actually needed, because cJSON is not 100% accurate in estimating if the provided memory is enough.
-
-### Example
-In this example we want to build and parse the following JSON:
-
-```json
-{
-    "name": "Awesome 4K",
-    "resolutions": [
-        {
-            "width": 1280,
-            "height": 720
-        },
-        {
-            "width": 1920,
-            "height": 1080
-        },
-        {
-            "width": 3840,
-            "height": 2160
-        }
-    ]
-}
-```
-
-#### Printing
-Let's build the above JSON and print it to a string:
-```c
-//create a monitor with a list of supported resolutions
-char* create_monitor(void)
-{
-    const unsigned int resolution_numbers[3][2] = {
-        {1280, 720},
-        {1920, 1080},
-        {3840, 2160}
-    };
-    char *string = NULL;
-    cJSON *name = NULL;
-    cJSON *resolutions = NULL;
-    cJSON *resolution = NULL;
-    cJSON *width = NULL;
-    cJSON *height = NULL;
-    size_t index = 0;
-
-    cJSON *monitor = cJSON_CreateObject();
-    if (monitor == NULL)
-    {
-        goto end;
-    }
-
-    name = cJSON_CreateString("Awesome 4K");
-    if (name == NULL)
-    {
-        goto end;
-    }
-    /* after creation was successful, immediately add it to the monitor,
-     * thereby transfering ownership of the pointer to it */
-    cJSON_AddItemToObject(monitor, "name", name);
-
-    resolutions = cJSON_CreateArray();
-    if (resolutions == NULL)
-    {
-        goto end;
-    }
-    cJSON_AddItemToObject(monitor, "resolutions", resolutions);
-
-    for (index = 0; index < (sizeof(resolution_numbers) / (2 * sizeof(int))); ++index)
-    {
-        resolution = cJSON_CreateObject();
-        if (resolution == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToArray(resolutions, resolution);
-
-        width = cJSON_CreateNumber(resolution_numbers[index][0]);
-        if (width == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToObject(resolution, "width", width);
-
-        height = cJSON_CreateNumber(resolution_numbers[index][1]);
-        if (height == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToObject(resolution, "height", height);
-    }
-
-    string = cJSON_Print(monitor);
-    if (string == NULL)
-    {
-        fprintf(stderr, "Failed to print monitor.\n");
-    }
-
-end:
-    cJSON_Delete(monitor);
-    return string;
-}
-```
-
-Alternatively we can use the `cJSON_Add...ToObject` helper functions to make our lifes a little easier:
-```c
-char *create_monitor_with_helpers(void)
-{
-    const unsigned int resolution_numbers[3][2] = {
-        {1280, 720},
-        {1920, 1080},
-        {3840, 2160}
-    };
-    char *string = NULL;
-    cJSON *resolutions = NULL;
-    size_t index = 0;
-
-    cJSON *monitor = cJSON_CreateObject();
-
-    if (cJSON_AddStringToObject(monitor, "name", "Awesome 4K") == NULL)
-    {
-        goto end;
-    }
-
-    resolutions = cJSON_AddArrayToObject(monitor, "resolutions");
-    if (resolutions == NULL)
-    {
-        goto end;
-    }
-
-    for (index = 0; index < (sizeof(resolution_numbers) / (2 * sizeof(int))); ++index)
-    {
-        cJSON *resolution = cJSON_CreateObject();
-
-        if (cJSON_AddNumberToObject(resolution, "width", resolution_numbers[index][0]) == NULL)
-        {
-            goto end;
-        }
-
-        if(cJSON_AddNumberToObject(resolution, "height", resolution_numbers[index][1]) == NULL)
-        {
-            goto end;
-        }
-
-        cJSON_AddItemToArray(resolutions, resolution);
-    }
-
-    string = cJSON_Print(monitor);
-    if (string == NULL) {
-        fprintf(stderr, "Failed to print monitor.\n");
-    }
-
-end:
-    cJSON_Delete(monitor);
-    return string;
-}
-```
-
-#### Parsing
-In this example we will parse a JSON in the above format and check if the monitor supports a Full HD resolution while printing some diagnostic output:
-
-```c
-/* return 1 if the monitor supports full hd, 0 otherwise */
-int supports_full_hd(const char * const monitor)
-{
-    const cJSON *resolution = NULL;
-    const cJSON *resolutions = NULL;
-    const cJSON *name = NULL;
-    int status = 0;
-    cJSON *monitor_json = cJSON_Parse(monitor);
-    if (monitor_json == NULL)
-    {
-        const char *error_ptr = cJSON_GetErrorPtr();
-        if (error_ptr != NULL)
-        {
-            fprintf(stderr, "Error before: %s\n", error_ptr);
-        }
-        status = 0;
-        goto end;
-    }
-
-    name = cJSON_GetObjectItemCaseSensitive(monitor_json, "name");
-    if (cJSON_IsString(name) && (name->valuestring != NULL))
-    {
-        printf("Checking monitor \"%s\"\n", name->valuestring);
-    }
-
-    resolutions = cJSON_GetObjectItemCaseSensitive(monitor_json, "resolutions");
-    cJSON_ArrayForEach(resolution, resolutions)
-    {
-        cJSON *width = cJSON_GetObjectItemCaseSensitive(resolution, "width");
-        cJSON *height = cJSON_GetObjectItemCaseSensitive(resolution, "height");
-
-        if (!cJSON_IsNumber(width) || !cJSON_IsNumber(height))
-        {
-            status = 0;
-            goto end;
-        }
-
-        if ((width->valuedouble == 1920) && (height->valuedouble == 1080))
-        {
-            status = 1;
-            goto end;
-        }
-    }
-
-end:
-    cJSON_Delete(monitor_json);
-    return status;
-}
-```
-
-Note that there are no NULL checks except for the result of `cJSON_Parse` because `cJSON_GetObjectItemCaseSensitive` checks for `NULL` inputs already, so a `NULL` value is just propagated and `cJSON_IsNumber` and `cJSON_IsString` return `0` if the input is `NULL`.
-
-### Caveats
-
-#### Zero Character
-
-cJSON doesn't support strings that contain the zero character `'\0'` or `\u0000`. This is impossible with the current API because strings are zero terminated.
-
-#### Character Encoding
-
-cJSON only supports UTF-8 encoded input. In most cases it doesn't reject invalid UTF-8 as input though, it just propagates it through as is. As long as the input doesn't contain invalid UTF-8, the output will always be valid UTF-8.
-
-#### C Standard
-
-cJSON is written in ANSI C (or C89, C90). If your compiler or C library doesn't follow this standard, correct behavior is not guaranteed.
-
-NOTE: ANSI C is not C++ therefore it shouldn't be compiled with a C++ compiler. You can compile it with a C compiler and link it with your C++ code however. Although compiling with a C++ compiler might work, correct behavior is not guaranteed.
-
-#### Floating Point Numbers
-
-cJSON does not officially support any `double` implementations other than IEEE754 double precision floating point numbers. It might still work with other implementations but bugs with these will be considered invalid.
-
-The maximum length of a floating point literal that cJSON supports is currently 63 characters.
-
-#### Deep Nesting Of Arrays And Objects
-
-cJSON doesn't support arrays and objects that are nested too deeply because this would result in a stack overflow. To prevent this cJSON limits the depth to `CJSON_NESTING_LIMIT` which is 1000 by default but can be changed at compile time.
-
-#### Thread Safety
-
-In general cJSON is **not thread safe**.
-
-However it is thread safe under the following conditions:
-* `cJSON_GetErrorPtr` is never used (the `return_parse_end` parameter of `cJSON_ParseWithOpts` can be used instead)
-* `cJSON_InitHooks` is only ever called before using cJSON in any threads.
-* `setlocale` is never called before all calls to cJSON functions have returned.
-
-#### Case Sensitivity
-
-When cJSON was originally created, it didn't follow the JSON standard and didn't make a distinction between uppercase and lowercase letters. If you want the correct, standard compliant, behavior, you need to use the `CaseSensitive` functions where available.
-
-#### Duplicate Object Members
-
-cJSON supports parsing and printing JSON that contains objects that have multiple members with the same name. `cJSON_GetObjectItemCaseSensitive` however will always only return the first one.
-
-# Enjoy cJSON!
-
-- Dave Gamble (original author)
-- Max Bruckner (current maintainer)
-- and the other [cJSON contributors](CONTRIBUTORS.md)
diff --git a/external_libs/cJSON/cJSON/appveyor.yml b/external_libs/cJSON/cJSON/appveyor.yml
deleted file mode 100644
index 464bf038..00000000
--- a/external_libs/cJSON/cJSON/appveyor.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-os: Visual Studio 2015
-
-# ENABLE_CUSTOM_COMPILER_FLAGS - on by default
-# ENABLE_SANITIZERS - off by default
-# ENABLE_PUBLIC_SYMBOLS - on by default
-# BUILD_SHARED_LIBS - on by default
-# ENABLE_TARGET_EXPORT - on by default
-# ENABLE_CJSON_UTILS - off by default
-# ENABLE_CJSON_TEST -on by default
-# ENABLE_VALGRIND - off by default
-# ENABLE_FUZZING - off by default
-
-environment:
-  matrix:
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-
-platform:
-  - x86
-  - x64
-matrix:
-  exclude:
-  - platform: x64
-    GENERATOR: "Visual Studio 9 2008"
-
-configuration:
-  - Release
-
-
-build_script:
-  - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
-  - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
-  - cmake --build build --config "%CONFIGURATION%"
-
-
-on_failure:
-  - ps: if(Test-Path builds/CMakeFiles/CMakeOutput.log) { cat builds/CMakeFiles/CMakeOutput.log }
-  - ps: if(Test-Path builds/CMakeFiles/CMakeError.log) { cat builds/CMakeFiles/CMakeError.log }
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/cJSON.c b/external_libs/cJSON/cJSON/cJSON.c
deleted file mode 100644
index 9e1e2517..00000000
--- a/external_libs/cJSON/cJSON/cJSON.c
+++ /dev/null
@@ -1,2895 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-/* cJSON */
-/* JSON parser in C. */
-
-/* disable warnings about old C89 functions in MSVC */
-#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-#ifdef __GNUC__
-#pragma GCC visibility push(default)
-#endif
-#if defined(_MSC_VER)
-#pragma warning (push)
-/* disable warning about single line comments in system headers */
-#pragma warning (disable : 4001)
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
-
-#ifdef ENABLE_LOCALES
-#include <locale.h>
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-#ifdef __GNUC__
-#pragma GCC visibility pop
-#endif
-
-#include "cJSON.h"
-
-/* define our own boolean type */
-#define true ((cJSON_bool)1)
-#define false ((cJSON_bool)0)
-
-typedef struct {
-    const unsigned char *json;
-    size_t position;
-} error;
-static error global_error = { NULL, 0 };
-
-CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
-{
-    return (const char*) (global_error.json + global_error.position);
-}
-
-CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) {
-    if (!cJSON_IsString(item)) {
-        return NULL;
-    }
-
-    return item->valuestring;
-}
-
-/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
-#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 7)
-    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
-#endif
-
-CJSON_PUBLIC(const char*) cJSON_Version(void)
-{
-    static char version[15];
-    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
-
-    return version;
-}
-
-/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
-static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
-{
-    if ((string1 == NULL) || (string2 == NULL))
-    {
-        return 1;
-    }
-
-    if (string1 == string2)
-    {
-        return 0;
-    }
-
-    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
-    {
-        if (*string1 == '\0')
-        {
-            return 0;
-        }
-    }
-
-    return tolower(*string1) - tolower(*string2);
-}
-
-typedef struct internal_hooks
-{
-    void *(*allocate)(size_t size);
-    void (*deallocate)(void *pointer);
-    void *(*reallocate)(void *pointer, size_t size);
-} internal_hooks;
-
-#if defined(_MSC_VER)
-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
-static void *internal_malloc(size_t size)
-{
-    return malloc(size);
-}
-static void internal_free(void *pointer)
-{
-    free(pointer);
-}
-static void *internal_realloc(void *pointer, size_t size)
-{
-    return realloc(pointer, size);
-}
-#else
-#define internal_malloc malloc
-#define internal_free free
-#define internal_realloc realloc
-#endif
-
-static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
-
-static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
-{
-    size_t length = 0;
-    unsigned char *copy = NULL;
-
-    if (string == NULL)
-    {
-        return NULL;
-    }
-
-    length = strlen((const char*)string) + sizeof("");
-    copy = (unsigned char*)hooks->allocate(length);
-    if (copy == NULL)
-    {
-        return NULL;
-    }
-    memcpy(copy, string, length);
-
-    return copy;
-}
-
-CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
-{
-    if (hooks == NULL)
-    {
-        /* Reset hooks */
-        global_hooks.allocate = malloc;
-        global_hooks.deallocate = free;
-        global_hooks.reallocate = realloc;
-        return;
-    }
-
-    global_hooks.allocate = malloc;
-    if (hooks->malloc_fn != NULL)
-    {
-        global_hooks.allocate = hooks->malloc_fn;
-    }
-
-    global_hooks.deallocate = free;
-    if (hooks->free_fn != NULL)
-    {
-        global_hooks.deallocate = hooks->free_fn;
-    }
-
-    /* use realloc only if both free and malloc are used */
-    global_hooks.reallocate = NULL;
-    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
-    {
-        global_hooks.reallocate = realloc;
-    }
-}
-
-/* Internal constructor. */
-static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
-{
-    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
-    if (node)
-    {
-        memset(node, '\0', sizeof(cJSON));
-    }
-
-    return node;
-}
-
-/* Delete a cJSON structure. */
-CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
-{
-    cJSON *next = NULL;
-    while (item != NULL)
-    {
-        next = item->next;
-        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
-        {
-            cJSON_Delete(item->child);
-        }
-        if (!(item->type & cJSON_IsReference) && (cJSON_IsString(item) || cJSON_IsRaw(item)) && (item->valuestring != NULL))
-        {
-            global_hooks.deallocate(item->valuestring);
-        }
-        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
-        {
-            global_hooks.deallocate(item->string);
-        }
-        global_hooks.deallocate(item);
-        item = next;
-    }
-}
-
-/* get the decimal point character of the current locale */
-static unsigned char get_decimal_point(void)
-{
-#ifdef ENABLE_LOCALES
-    struct lconv *lconv = localeconv();
-    return (unsigned char) lconv->decimal_point[0];
-#else
-    return '.';
-#endif
-}
-
-typedef struct
-{
-    const unsigned char *content;
-    size_t length;
-    size_t offset;
-    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
-    internal_hooks hooks;
-} parse_buffer;
-
-/* check if the given size is left to read in a given parse buffer (starting with 1) */
-#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
-/* check if the buffer can be accessed at the given index (starting with 0) */
-#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
-#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
-/* get a pointer to the buffer at the position */
-#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
-
-/* Parse the input text to generate a number, and populate the result into item. */
-static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
-{
-    float number = 0;
-    unsigned char *after_end = NULL;
-    unsigned char number_c_string[64];
-    unsigned char decimal_point = get_decimal_point();
-    size_t i = 0;
-
-    if ((input_buffer == NULL) || (input_buffer->content == NULL))
-    {
-        return false;
-    }
-
-    /* copy the number into a temporary buffer and replace '.' with the decimal point
-     * of the current locale (for strtod)
-     * This also takes care of '\0' not necessarily being available for marking the end of the input */
-    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
-    {
-        switch (buffer_at_offset(input_buffer)[i])
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            case '+':
-            case '-':
-            case 'e':
-            case 'E':
-                number_c_string[i] = buffer_at_offset(input_buffer)[i];
-                break;
-
-            case '.':
-                number_c_string[i] = decimal_point;
-                break;
-
-            default:
-                goto loop_end;
-        }
-    }
-loop_end:
-    number_c_string[i] = '\0';
-
-    number = strtod((const char*)number_c_string, (char**)&after_end);
-    if (number_c_string == after_end)
-    {
-        return false; /* parse_error */
-    }
-
-    item->valuefloat = number;
-    item->type = cJSON_Number;
-
-    input_buffer->offset += (size_t)(after_end - number_c_string);
-    return true;
-}
-
-/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
-CJSON_PUBLIC(float) cJSON_SetNumberHelper(cJSON *object, float number)
-{
-    return object->valuefloat = number;
-}
-
-typedef struct
-{
-    unsigned char *buffer;
-    size_t length;
-    size_t offset;
-    size_t depth; /* current nesting depth (for formatted printing) */
-    cJSON_bool noalloc;
-    cJSON_bool format; /* is this print a formatted print */
-    internal_hooks hooks;
-} printbuffer;
-
-/* realloc printbuffer if necessary to have at least "needed" bytes more */
-static unsigned char* ensure(printbuffer * const p, size_t needed)
-{
-    unsigned char *newbuffer = NULL;
-    size_t newsize = 0;
-
-    if ((p == NULL) || (p->buffer == NULL))
-    {
-        return NULL;
-    }
-
-    if ((p->length > 0) && (p->offset >= p->length))
-    {
-        /* make sure that offset is valid */
-        return NULL;
-    }
-
-    if (needed > INT_MAX)
-    {
-        /* sizes bigger than INT_MAX are currently not supported */
-        return NULL;
-    }
-
-    needed += p->offset + 1;
-    if (needed <= p->length)
-    {
-        return p->buffer + p->offset;
-    }
-
-    if (p->noalloc) {
-        return NULL;
-    }
-
-    /* calculate new buffer size */
-    if (needed > (INT_MAX / 2))
-    {
-        /* overflow of int, use INT_MAX if possible */
-        if (needed <= INT_MAX)
-        {
-            newsize = INT_MAX;
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        newsize = needed * 2;
-    }
-
-    if (p->hooks.reallocate != NULL)
-    {
-        /* reallocate with realloc if available */
-        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
-        if (newbuffer == NULL)
-        {
-            p->hooks.deallocate(p->buffer);
-            p->length = 0;
-            p->buffer = NULL;
-
-            return NULL;
-        }
-    }
-    else
-    {
-        /* otherwise reallocate manually */
-        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
-        if (!newbuffer)
-        {
-            p->hooks.deallocate(p->buffer);
-            p->length = 0;
-            p->buffer = NULL;
-
-            return NULL;
-        }
-        if (newbuffer)
-        {
-            memcpy(newbuffer, p->buffer, p->offset + 1);
-        }
-        p->hooks.deallocate(p->buffer);
-    }
-    p->length = newsize;
-    p->buffer = newbuffer;
-
-    return newbuffer + p->offset;
-}
-
-/* calculate the new length of the string in a printbuffer and update the offset */
-static void update_offset(printbuffer * const buffer)
-{
-    const unsigned char *buffer_pointer = NULL;
-    if ((buffer == NULL) || (buffer->buffer == NULL))
-    {
-        return;
-    }
-    buffer_pointer = buffer->buffer + buffer->offset;
-
-    buffer->offset += strlen((const char*)buffer_pointer);
-}
-
-/* Render the number nicely from the given item into a string. */
-static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    float d = item->valuefloat;
-    int length = 0;
-    size_t i = 0;
-    unsigned char number_buffer[26]; /* temporary buffer to print the number into */
-    unsigned char decimal_point = get_decimal_point();
-    float test;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* This checks for NaN and Infinity */
-    if ((d * 0) != 0)
-    {
-        length = sprintf((char*)number_buffer, "null");
-    }
-    else
-    {
-        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
-        //length = sprintf((char*)number_buffer, "%1.15g", d);
-        length = sprintf((char*)number_buffer, "%1.7g", d);
-
-        /* Check whether the original float can be recovered */
-        //if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d))
-        if ((sscanf((char*)number_buffer, "%g", &test) != 1) || ((float)test != d))
-        {
-            /* If not, print with 17 decimal places of precision */
-            //length = sprintf((char*)number_buffer, "%1.17g", d);
-            length = sprintf((char*)number_buffer, "%1.9g", d);
-        }
-    }
-
-    /* sprintf failed or buffer overrun occured */
-    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
-    {
-        return false;
-    }
-
-    /* reserve appropriate space in the output */
-    output_pointer = ensure(output_buffer, (size_t)length + sizeof(""));
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    /* copy the printed number to the output and replace locale
-     * dependent decimal point with '.' */
-    for (i = 0; i < ((size_t)length); i++)
-    {
-        if (number_buffer[i] == decimal_point)
-        {
-            output_pointer[i] = '.';
-            continue;
-        }
-
-        output_pointer[i] = number_buffer[i];
-    }
-    output_pointer[i] = '\0';
-
-    output_buffer->offset += (size_t)length;
-
-    return true;
-}
-
-/* parse 4 digit hexadecimal number */
-static unsigned parse_hex4(const unsigned char * const input)
-{
-    unsigned int h = 0;
-    size_t i = 0;
-
-    for (i = 0; i < 4; i++)
-    {
-        /* parse digit */
-        if ((input[i] >= '0') && (input[i] <= '9'))
-        {
-            h += (unsigned int) input[i] - '0';
-        }
-        else if ((input[i] >= 'A') && (input[i] <= 'F'))
-        {
-            h += (unsigned int) 10 + input[i] - 'A';
-        }
-        else if ((input[i] >= 'a') && (input[i] <= 'f'))
-        {
-            h += (unsigned int) 10 + input[i] - 'a';
-        }
-        else /* invalid */
-        {
-            return 0;
-        }
-
-        if (i < 3)
-        {
-            /* shift left to make place for the next nibble */
-            h = h << 4;
-        }
-    }
-
-    return h;
-}
-
-/* converts a UTF-16 literal to UTF-8
- * A literal can be one or two sequences of the form \uXXXX */
-static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
-{
-    long unsigned int codepoint = 0;
-    unsigned int first_code = 0;
-    const unsigned char *first_sequence = input_pointer;
-    unsigned char utf8_length = 0;
-    unsigned char utf8_position = 0;
-    unsigned char sequence_length = 0;
-    unsigned char first_byte_mark = 0;
-
-    if ((input_end - first_sequence) < 6)
-    {
-        /* input ends unexpectedly */
-        goto fail;
-    }
-
-    /* get the first utf16 sequence */
-    first_code = parse_hex4(first_sequence + 2);
-
-    /* check that the code is valid */
-    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
-    {
-        goto fail;
-    }
-
-    /* UTF16 surrogate pair */
-    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
-    {
-        const unsigned char *second_sequence = first_sequence + 6;
-        unsigned int second_code = 0;
-        sequence_length = 12; /* \uXXXX\uXXXX */
-
-        if ((input_end - second_sequence) < 6)
-        {
-            /* input ends unexpectedly */
-            goto fail;
-        }
-
-        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
-        {
-            /* missing second half of the surrogate pair */
-            goto fail;
-        }
-
-        /* get the second utf16 sequence */
-        second_code = parse_hex4(second_sequence + 2);
-        /* check that the code is valid */
-        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
-        {
-            /* invalid second half of the surrogate pair */
-            goto fail;
-        }
-
-
-        /* calculate the unicode codepoint from the surrogate pair */
-        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
-    }
-    else
-    {
-        sequence_length = 6; /* \uXXXX */
-        codepoint = first_code;
-    }
-
-    /* encode as UTF-8
-     * takes at maximum 4 bytes to encode:
-     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
-    if (codepoint < 0x80)
-    {
-        /* normal ascii, encoding 0xxxxxxx */
-        utf8_length = 1;
-    }
-    else if (codepoint < 0x800)
-    {
-        /* two bytes, encoding 110xxxxx 10xxxxxx */
-        utf8_length = 2;
-        first_byte_mark = 0xC0; /* 11000000 */
-    }
-    else if (codepoint < 0x10000)
-    {
-        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
-        utf8_length = 3;
-        first_byte_mark = 0xE0; /* 11100000 */
-    }
-    else if (codepoint <= 0x10FFFF)
-    {
-        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
-        utf8_length = 4;
-        first_byte_mark = 0xF0; /* 11110000 */
-    }
-    else
-    {
-        /* invalid unicode codepoint */
-        goto fail;
-    }
-
-    /* encode as utf8 */
-    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
-    {
-        /* 10xxxxxx */
-        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
-        codepoint >>= 6;
-    }
-    /* encode first byte */
-    if (utf8_length > 1)
-    {
-        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
-    }
-    else
-    {
-        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
-    }
-
-    *output_pointer += utf8_length;
-
-    return sequence_length;
-
-fail:
-    return 0;
-}
-
-/* Parse the input text into an unescaped cinput, and populate item. */
-static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
-{
-    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
-    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
-    unsigned char *output_pointer = NULL;
-    unsigned char *output = NULL;
-
-    /* not a string */
-    if (buffer_at_offset(input_buffer)[0] != '\"')
-    {
-        goto fail;
-    }
-
-    {
-        /* calculate approximate size of the output (overestimate) */
-        size_t allocation_length = 0;
-        size_t skipped_bytes = 0;
-        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
-        {
-            /* is escape sequence */
-            if (input_end[0] == '\\')
-            {
-                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
-                {
-                    /* prevent buffer overflow when last input character is a backslash */
-                    goto fail;
-                }
-                skipped_bytes++;
-                input_end++;
-            }
-            input_end++;
-        }
-        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
-        {
-            goto fail; /* string ended unexpectedly */
-        }
-
-        /* This is at most how much we need for the output */
-        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
-        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
-        if (output == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-    }
-
-    output_pointer = output;
-    /* loop through the string literal */
-    while (input_pointer < input_end)
-    {
-        if (*input_pointer != '\\')
-        {
-            *output_pointer++ = *input_pointer++;
-        }
-        /* escape sequence */
-        else
-        {
-            unsigned char sequence_length = 2;
-            if ((input_end - input_pointer) < 1)
-            {
-                goto fail;
-            }
-
-            switch (input_pointer[1])
-            {
-                case 'b':
-                    *output_pointer++ = '\b';
-                    break;
-                case 'f':
-                    *output_pointer++ = '\f';
-                    break;
-                case 'n':
-                    *output_pointer++ = '\n';
-                    break;
-                case 'r':
-                    *output_pointer++ = '\r';
-                    break;
-                case 't':
-                    *output_pointer++ = '\t';
-                    break;
-                case '\"':
-                case '\\':
-                case '/':
-                    *output_pointer++ = input_pointer[1];
-                    break;
-
-                /* UTF-16 literal */
-                case 'u':
-                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
-                    if (sequence_length == 0)
-                    {
-                        /* failed to convert UTF16-literal to UTF-8 */
-                        goto fail;
-                    }
-                    break;
-
-                default:
-                    goto fail;
-            }
-            input_pointer += sequence_length;
-        }
-    }
-
-    /* zero terminate the output */
-    *output_pointer = '\0';
-
-    item->type = cJSON_String;
-    item->valuestring = (char*)output;
-
-    input_buffer->offset = (size_t) (input_end - input_buffer->content);
-    input_buffer->offset++;
-
-    return true;
-
-fail:
-    if (output != NULL)
-    {
-        input_buffer->hooks.deallocate(output);
-    }
-
-    if (input_pointer != NULL)
-    {
-        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
-    }
-
-    return false;
-}
-
-/* Render the cstring provided to an escaped version that can be printed. */
-static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
-{
-    const unsigned char *input_pointer = NULL;
-    unsigned char *output = NULL;
-    unsigned char *output_pointer = NULL;
-    size_t output_length = 0;
-    /* numbers of additional characters needed for escaping */
-    size_t escape_characters = 0;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* empty string */
-    if (input == NULL)
-    {
-        output = ensure(output_buffer, sizeof("\"\""));
-        if (output == NULL)
-        {
-            return false;
-        }
-        strcpy((char*)output, "\"\"");
-
-        return true;
-    }
-
-    /* set "flag" to 1 if something needs to be escaped */
-    for (input_pointer = input; *input_pointer; input_pointer++)
-    {
-        switch (*input_pointer)
-        {
-            case '\"':
-            case '\\':
-            case '\b':
-            case '\f':
-            case '\n':
-            case '\r':
-            case '\t':
-                /* one character escape sequence */
-                escape_characters++;
-                break;
-            default:
-                if (*input_pointer < 32)
-                {
-                    /* UTF-16 escape sequence uXXXX */
-                    escape_characters += 5;
-                }
-                break;
-        }
-    }
-    output_length = (size_t)(input_pointer - input) + escape_characters;
-
-    output = ensure(output_buffer, output_length + sizeof("\"\""));
-    if (output == NULL)
-    {
-        return false;
-    }
-
-    /* no characters have to be escaped */
-    if (escape_characters == 0)
-    {
-        output[0] = '\"';
-        memcpy(output + 1, input, output_length);
-        output[output_length + 1] = '\"';
-        output[output_length + 2] = '\0';
-
-        return true;
-    }
-
-    output[0] = '\"';
-    output_pointer = output + 1;
-    /* copy the string */
-    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
-    {
-        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
-        {
-            /* normal character, copy */
-            *output_pointer = *input_pointer;
-        }
-        else
-        {
-            /* character needs to be escaped */
-            *output_pointer++ = '\\';
-            switch (*input_pointer)
-            {
-                case '\\':
-                    *output_pointer = '\\';
-                    break;
-                case '\"':
-                    *output_pointer = '\"';
-                    break;
-                case '\b':
-                    *output_pointer = 'b';
-                    break;
-                case '\f':
-                    *output_pointer = 'f';
-                    break;
-                case '\n':
-                    *output_pointer = 'n';
-                    break;
-                case '\r':
-                    *output_pointer = 'r';
-                    break;
-                case '\t':
-                    *output_pointer = 't';
-                    break;
-                default:
-                    /* escape and print as unicode codepoint */
-                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
-                    output_pointer += 4;
-                    break;
-            }
-        }
-    }
-    output[output_length + 1] = '\"';
-    output[output_length + 2] = '\0';
-
-    return true;
-}
-
-/* Invoke print_string_ptr (which is useful) on an item. */
-static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
-{
-    return print_string_ptr((unsigned char*)item->valuestring, p);
-}
-
-/* Predeclare these prototypes. */
-static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
-static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
-static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
-
-/* Utility to jump whitespace and cr/lf */
-static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
-{
-    if ((buffer == NULL) || (buffer->content == NULL))
-    {
-        return NULL;
-    }
-
-    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
-    {
-       buffer->offset++;
-    }
-
-    if (buffer->offset == buffer->length)
-    {
-        buffer->offset--;
-    }
-
-    return buffer;
-}
-
-/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
-static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
-{
-    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
-    {
-        return NULL;
-    }
-
-    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
-    {
-        buffer->offset += 3;
-    }
-
-    return buffer;
-}
-
-/* Parse an object - create a new root, and populate. */
-CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    cJSON *item = NULL;
-
-    /* reset error position */
-    global_error.json = NULL;
-    global_error.position = 0;
-
-    if (value == NULL)
-    {
-        goto fail;
-    }
-
-    buffer.content = (const unsigned char*)value;
-    buffer.length = strlen((const char*)value) + sizeof("");
-    buffer.offset = 0;
-    buffer.hooks = global_hooks;
-
-    item = cJSON_New_Item(&global_hooks);
-    if (item == NULL) /* memory fail */
-    {
-        goto fail;
-    }
-
-    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
-    {
-        /* parse failure. ep is set. */
-        goto fail;
-    }
-
-    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
-    if (require_null_terminated)
-    {
-        buffer_skip_whitespace(&buffer);
-        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
-        {
-            goto fail;
-        }
-    }
-    if (return_parse_end)
-    {
-        *return_parse_end = (const char*)buffer_at_offset(&buffer);
-    }
-
-    return item;
-
-fail:
-    if (item != NULL)
-    {
-        cJSON_Delete(item);
-    }
-
-    if (value != NULL)
-    {
-        error local_error;
-        local_error.json = (const unsigned char*)value;
-        local_error.position = 0;
-
-        if (buffer.offset < buffer.length)
-        {
-            local_error.position = buffer.offset;
-        }
-        else if (buffer.length > 0)
-        {
-            local_error.position = buffer.length - 1;
-        }
-
-        if (return_parse_end != NULL)
-        {
-            *return_parse_end = (const char*)local_error.json + local_error.position;
-        }
-
-        global_error = local_error;
-    }
-
-    return NULL;
-}
-
-/* Default options for cJSON_Parse */
-CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
-{
-    return cJSON_ParseWithOpts(value, 0, 0);
-}
-
-#define cjson_min(a, b) ((a < b) ? a : b)
-
-static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
-{
-    static const size_t default_buffer_size = 256;
-    printbuffer buffer[1];
-    unsigned char *printed = NULL;
-
-    memset(buffer, 0, sizeof(buffer));
-
-    /* create buffer */
-    buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size);
-    buffer->length = default_buffer_size;
-    buffer->format = format;
-    buffer->hooks = *hooks;
-    if (buffer->buffer == NULL)
-    {
-        goto fail;
-    }
-
-    /* print the value */
-    if (!print_value(item, buffer))
-    {
-        goto fail;
-    }
-    update_offset(buffer);
-
-    /* check if reallocate is available */
-    if (hooks->reallocate != NULL)
-    {
-        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
-        if (printed == NULL) {
-            goto fail;
-        }
-        buffer->buffer = NULL;
-    }
-    else /* otherwise copy the JSON over to a new buffer */
-    {
-        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
-        if (printed == NULL)
-        {
-            goto fail;
-        }
-        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
-        printed[buffer->offset] = '\0'; /* just to be sure */
-
-        /* free the buffer */
-        hooks->deallocate(buffer->buffer);
-    }
-
-    return printed;
-
-fail:
-    if (buffer->buffer != NULL)
-    {
-        hooks->deallocate(buffer->buffer);
-    }
-
-    if (printed != NULL)
-    {
-        hooks->deallocate(printed);
-    }
-
-    return NULL;
-}
-
-/* Render a cJSON item/entity/structure to text. */
-CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
-{
-    return (char*)print(item, true, &global_hooks);
-}
-
-CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
-{
-    return (char*)print(item, false, &global_hooks);
-}
-
-CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
-{
-    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-
-    if (prebuffer < 0)
-    {
-        return NULL;
-    }
-
-    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
-    if (!p.buffer)
-    {
-        return NULL;
-    }
-
-    p.length = (size_t)prebuffer;
-    p.offset = 0;
-    p.noalloc = false;
-    p.format = fmt;
-    p.hooks = global_hooks;
-
-    if (!print_value(item, &p))
-    {
-        global_hooks.deallocate(p.buffer);
-        return NULL;
-    }
-
-    return (char*)p.buffer;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt)
-{
-    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-
-    if ((len < 0) || (buf == NULL))
-    {
-        return false;
-    }
-
-    p.buffer = (unsigned char*)buf;
-    p.length = (size_t)len;
-    p.offset = 0;
-    p.noalloc = true;
-    p.format = fmt;
-    p.hooks = global_hooks;
-
-    return print_value(item, &p);
-}
-
-/* Parser core - when encountering text, process appropriately. */
-static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
-{
-    if ((input_buffer == NULL) || (input_buffer->content == NULL))
-    {
-        return false; /* no input */
-    }
-
-    /* parse the different types of values */
-    /* null */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
-    {
-        item->type = cJSON_NULL;
-        input_buffer->offset += 4;
-        return true;
-    }
-    /* false */
-    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
-    {
-        item->type = cJSON_False;
-        input_buffer->offset += 5;
-        return true;
-    }
-    /* true */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
-    {
-        item->type = cJSON_True;
-        input_buffer->offset += 4;
-        return true;
-    }
-    /* string */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
-    {
-        return parse_string(item, input_buffer);
-    }
-    /* number */
-    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
-    {
-        return parse_number(item, input_buffer);
-    }
-    /* array */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
-    {
-        return parse_array(item, input_buffer);
-    }
-    /* object */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
-    {
-        return parse_object(item, input_buffer);
-    }
-
-    return false;
-}
-
-/* Render a value to text. */
-static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output = NULL;
-
-    if ((item == NULL) || (output_buffer == NULL))
-    {
-        return false;
-    }
-
-    switch ((item->type) & 0xFF)
-    {
-        case cJSON_NULL:
-            output = ensure(output_buffer, 5);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "null");
-            return true;
-
-        case cJSON_False:
-            output = ensure(output_buffer, 6);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "false");
-            return true;
-
-        case cJSON_True:
-            output = ensure(output_buffer, 5);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "true");
-            return true;
-
-        case cJSON_Number:
-            return print_number(item, output_buffer);
-
-        case cJSON_Raw:
-        {
-            size_t raw_length = 0;
-            if (item->valuestring == NULL)
-            {
-                return false;
-            }
-
-            raw_length = strlen(item->valuestring) + sizeof("");
-            output = ensure(output_buffer, raw_length);
-            if (output == NULL)
-            {
-                return false;
-            }
-            memcpy(output, item->valuestring, raw_length);
-            return true;
-        }
-
-        case cJSON_String:
-            return print_string(item, output_buffer);
-
-        case cJSON_Array:
-            return print_array(item, output_buffer);
-
-        case cJSON_Object:
-            return print_object(item, output_buffer);
-
-        default:
-            return false;
-    }
-}
-
-/* Build an array from input text. */
-static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
-{
-    cJSON *head = NULL; /* head of the linked list */
-    cJSON *current_item = NULL;
-
-    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
-    {
-        return false; /* to deeply nested */
-    }
-    input_buffer->depth++;
-
-    if (buffer_at_offset(input_buffer)[0] != '[')
-    {
-        /* not an array */
-        goto fail;
-    }
-
-    input_buffer->offset++;
-    buffer_skip_whitespace(input_buffer);
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
-    {
-        /* empty array */
-        goto success;
-    }
-
-    /* check if we skipped to the end of the buffer */
-    if (cannot_access_at_index(input_buffer, 0))
-    {
-        input_buffer->offset--;
-        goto fail;
-    }
-
-    /* step back to character in front of the first element */
-    input_buffer->offset--;
-    /* loop through the comma separated array elements */
-    do
-    {
-        /* allocate next item */
-        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
-        if (new_item == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-
-        /* attach next item to list */
-        if (head == NULL)
-        {
-            /* start the linked list */
-            current_item = head = new_item;
-        }
-        else
-        {
-            /* add to the end and advance */
-            current_item->next = new_item;
-            new_item->prev = current_item;
-            current_item = new_item;
-        }
-
-        /* parse next value */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_value(current_item, input_buffer))
-        {
-            goto fail; /* failed to parse value */
-        }
-        buffer_skip_whitespace(input_buffer);
-    }
-    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
-
-    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
-    {
-        goto fail; /* expected end of array */
-    }
-
-success:
-    input_buffer->depth--;
-
-    item->type = cJSON_Array;
-    item->child = head;
-
-    input_buffer->offset++;
-
-    return true;
-
-fail:
-    if (head != NULL)
-    {
-        cJSON_Delete(head);
-    }
-
-    return false;
-}
-
-/* Render an array to text */
-static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    size_t length = 0;
-    cJSON *current_element = item->child;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* Compose the output array. */
-    /* opening square bracket */
-    output_pointer = ensure(output_buffer, 1);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    *output_pointer = '[';
-    output_buffer->offset++;
-    output_buffer->depth++;
-
-    while (current_element != NULL)
-    {
-        if (!print_value(current_element, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-        if (current_element->next)
-        {
-            length = (size_t) (output_buffer->format ? 2 : 1);
-            output_pointer = ensure(output_buffer, length + 1);
-            if (output_pointer == NULL)
-            {
-                return false;
-            }
-            *output_pointer++ = ',';
-            if(output_buffer->format)
-            {
-                *output_pointer++ = ' ';
-            }
-            *output_pointer = '\0';
-            output_buffer->offset += length;
-        }
-        current_element = current_element->next;
-    }
-
-    output_pointer = ensure(output_buffer, 2);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-    *output_pointer++ = ']';
-    *output_pointer = '\0';
-    output_buffer->depth--;
-
-    return true;
-}
-
-/* Build an object from the text. */
-static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
-{
-    cJSON *head = NULL; /* linked list head */
-    cJSON *current_item = NULL;
-
-    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
-    {
-        return false; /* to deeply nested */
-    }
-    input_buffer->depth++;
-
-    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
-    {
-        goto fail; /* not an object */
-    }
-
-    input_buffer->offset++;
-    buffer_skip_whitespace(input_buffer);
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
-    {
-        goto success; /* empty object */
-    }
-
-    /* check if we skipped to the end of the buffer */
-    if (cannot_access_at_index(input_buffer, 0))
-    {
-        input_buffer->offset--;
-        goto fail;
-    }
-
-    /* step back to character in front of the first element */
-    input_buffer->offset--;
-    /* loop through the comma separated array elements */
-    do
-    {
-        /* allocate next item */
-        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
-        if (new_item == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-
-        /* attach next item to list */
-        if (head == NULL)
-        {
-            /* start the linked list */
-            current_item = head = new_item;
-        }
-        else
-        {
-            /* add to the end and advance */
-            current_item->next = new_item;
-            new_item->prev = current_item;
-            current_item = new_item;
-        }
-
-        /* parse the name of the child */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_string(current_item, input_buffer))
-        {
-            goto fail; /* faile to parse name */
-        }
-        buffer_skip_whitespace(input_buffer);
-
-        /* swap valuestring and string, because we parsed the name */
-        current_item->string = current_item->valuestring;
-        current_item->valuestring = NULL;
-
-        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
-        {
-            goto fail; /* invalid object */
-        }
-
-        /* parse the value */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_value(current_item, input_buffer))
-        {
-            goto fail; /* failed to parse value */
-        }
-        buffer_skip_whitespace(input_buffer);
-    }
-    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
-
-    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
-    {
-        goto fail; /* expected end of object */
-    }
-
-success:
-    input_buffer->depth--;
-
-    item->type = cJSON_Object;
-    item->child = head;
-
-    input_buffer->offset++;
-    return true;
-
-fail:
-    if (head != NULL)
-    {
-        cJSON_Delete(head);
-    }
-
-    return false;
-}
-
-/* Render an object to text. */
-static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    size_t length = 0;
-    cJSON *current_item = item->child;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* Compose the output: */
-    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
-    output_pointer = ensure(output_buffer, length + 1);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    *output_pointer++ = '{';
-    output_buffer->depth++;
-    if (output_buffer->format)
-    {
-        *output_pointer++ = '\n';
-    }
-    output_buffer->offset += length;
-
-    while (current_item)
-    {
-        if (output_buffer->format)
-        {
-            size_t i;
-            output_pointer = ensure(output_buffer, output_buffer->depth);
-            if (output_pointer == NULL)
-            {
-                return false;
-            }
-            for (i = 0; i < output_buffer->depth; i++)
-            {
-                *output_pointer++ = '\t';
-            }
-            output_buffer->offset += output_buffer->depth;
-        }
-
-        /* print key */
-        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-
-        length = (size_t) (output_buffer->format ? 2 : 1);
-        output_pointer = ensure(output_buffer, length);
-        if (output_pointer == NULL)
-        {
-            return false;
-        }
-        *output_pointer++ = ':';
-        if (output_buffer->format)
-        {
-            *output_pointer++ = '\t';
-        }
-        output_buffer->offset += length;
-
-        /* print value */
-        if (!print_value(current_item, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-
-        /* print comma if not last */
-        length = (size_t) ((output_buffer->format ? 1 : 0) + (current_item->next ? 1 : 0));
-        output_pointer = ensure(output_buffer, length + 1);
-        if (output_pointer == NULL)
-        {
-            return false;
-        }
-        if (current_item->next)
-        {
-            *output_pointer++ = ',';
-        }
-
-        if (output_buffer->format)
-        {
-            *output_pointer++ = '\n';
-        }
-        *output_pointer = '\0';
-        output_buffer->offset += length;
-
-        current_item = current_item->next;
-    }
-
-    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-    if (output_buffer->format)
-    {
-        size_t i;
-        for (i = 0; i < (output_buffer->depth - 1); i++)
-        {
-            *output_pointer++ = '\t';
-        }
-    }
-    *output_pointer++ = '}';
-    *output_pointer = '\0';
-    output_buffer->depth--;
-
-    return true;
-}
-
-/* Get Array size/item / object item. */
-CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
-{
-    cJSON *child = NULL;
-    size_t size = 0;
-
-    if (array == NULL)
-    {
-        return 0;
-    }
-
-    child = array->child;
-
-    while(child != NULL)
-    {
-        size++;
-        child = child->next;
-    }
-
-    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
-
-    return (int)size;
-}
-
-static cJSON* get_array_item(const cJSON *array, size_t index)
-{
-    cJSON *current_child = NULL;
-
-    if (array == NULL)
-    {
-        return NULL;
-    }
-
-    current_child = array->child;
-    while ((current_child != NULL) && (index > 0))
-    {
-        index--;
-        current_child = current_child->next;
-    }
-
-    return current_child;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
-{
-    if (index < 0)
-    {
-        return NULL;
-    }
-
-    return get_array_item(array, (size_t)index);
-}
-
-static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
-{
-    cJSON *current_element = NULL;
-
-    if ((object == NULL) || (name == NULL))
-    {
-        return NULL;
-    }
-
-    current_element = object->child;
-    if (case_sensitive)
-    {
-        while ((current_element != NULL) && ( !current_element->string || (strcmp(name, current_element->string) != 0) ))
-        {
-            current_element = current_element->next;
-        }
-    }
-    else
-    {
-        while ((current_element != NULL) && ( !current_element->string || (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0)) )
-        {
-            current_element = current_element->next;
-        }
-    }
-
-    return current_element;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
-{
-    return get_object_item(object, string, false);
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
-{
-    return get_object_item(object, string, true);
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
-{
-    return cJSON_GetObjectItem(object, string) ? 1 : 0;
-}
-
-/* Utility for array list handling. */
-static void suffix_object(cJSON *prev, cJSON *item)
-{
-    prev->next = item;
-    item->prev = prev;
-}
-
-/* Utility for handling references. */
-static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
-{
-    cJSON *reference = NULL;
-    if (item == NULL)
-    {
-        return NULL;
-    }
-
-    reference = cJSON_New_Item(hooks);
-    if (reference == NULL)
-    {
-        return NULL;
-    }
-
-    memcpy(reference, item, sizeof(cJSON));
-    reference->string = NULL;
-    reference->type |= cJSON_IsReference;
-    reference->next = reference->prev = NULL;
-    return reference;
-}
-
-static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
-{
-    cJSON *child = NULL;
-
-    if ((item == NULL) || (array == NULL))
-    {
-        return false;
-    }
-
-    child = array->child;
-
-    if (child == NULL)
-    {
-        /* list is empty, start new one */
-        array->child = item;
-    }
-    else
-    {
-        /* append to the end */
-        while (child->next)
-        {
-            child = child->next;
-        }
-        suffix_object(child, item);
-    }
-
-    return true;
-}
-
-/* Add item to array/object. */
-CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item)
-{
-    add_item_to_array(array, item);
-}
-
-#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
-    #pragma GCC diagnostic push
-#endif
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-/* helper function to cast away const */
-static void* cast_away_const(const void* string)
-{
-    return (void*)string;
-}
-#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
-    #pragma GCC diagnostic pop
-#endif
-
-
-static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
-{
-    char *new_key = NULL;
-    int new_type = cJSON_Invalid;
-
-    if ((object == NULL) || (string == NULL) || (item == NULL))
-    {
-        return false;
-    }
-
-    if (constant_key)
-    {
-        new_key = (char*)cast_away_const(string);
-        new_type = item->type | cJSON_StringIsConst;
-    }
-    else
-    {
-        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
-        if (new_key == NULL)
-        {
-            return false;
-        }
-
-        new_type = item->type & ~cJSON_StringIsConst;
-    }
-
-    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
-    {
-        hooks->deallocate(item->string);
-    }
-
-    item->string = new_key;
-    item->type = new_type;
-
-    return add_item_to_array(object, item);
-}
-
-CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
-{
-    add_item_to_object(object, string, item, &global_hooks, false);
-}
-
-/* Add an item to an object with constant string as key */
-CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
-{
-    add_item_to_object(object, string, item, &global_hooks, true);
-}
-
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
-{
-    if (array == NULL)
-    {
-        return;
-    }
-
-    add_item_to_array(array, create_reference(item, &global_hooks));
-}
-
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
-{
-    if ((object == NULL) || (string == NULL))
-    {
-        return;
-    }
-
-    add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
-{
-    cJSON *null = cJSON_CreateNull();
-    if (add_item_to_object(object, name, null, &global_hooks, false))
-    {
-        return null;
-    }
-
-    cJSON_Delete(null);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name)
-{
-    cJSON *true_item = cJSON_CreateTrue();
-    if (add_item_to_object(object, name, true_item, &global_hooks, false))
-    {
-        return true_item;
-    }
-
-    cJSON_Delete(true_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name)
-{
-    cJSON *false_item = cJSON_CreateFalse();
-    if (add_item_to_object(object, name, false_item, &global_hooks, false))
-    {
-        return false_item;
-    }
-
-    cJSON_Delete(false_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean)
-{
-    cJSON *bool_item = cJSON_CreateBool(boolean);
-    if (add_item_to_object(object, name, bool_item, &global_hooks, false))
-    {
-        return bool_item;
-    }
-
-    cJSON_Delete(bool_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const float number)
-{
-    cJSON *number_item = cJSON_CreateNumber(number);
-    if (add_item_to_object(object, name, number_item, &global_hooks, false))
-    {
-        return number_item;
-    }
-
-    cJSON_Delete(number_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
-{
-    cJSON *string_item = cJSON_CreateString(string);
-    if (add_item_to_object(object, name, string_item, &global_hooks, false))
-    {
-        return string_item;
-    }
-
-    cJSON_Delete(string_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw)
-{
-    cJSON *raw_item = cJSON_CreateRaw(raw);
-    if (add_item_to_object(object, name, raw_item, &global_hooks, false))
-    {
-        return raw_item;
-    }
-
-    cJSON_Delete(raw_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name)
-{
-    cJSON *object_item = cJSON_CreateObject();
-    if (add_item_to_object(object, name, object_item, &global_hooks, false))
-    {
-        return object_item;
-    }
-
-    cJSON_Delete(object_item);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name)
-{
-    cJSON *array = cJSON_CreateArray();
-    if (add_item_to_object(object, name, array, &global_hooks, false))
-    {
-        return array;
-    }
-
-    cJSON_Delete(array);
-    return NULL;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
-{
-    if ((parent == NULL) || (item == NULL))
-    {
-        return NULL;
-    }
-
-    if (item->prev != NULL)
-    {
-        /* not the first element */
-        item->prev->next = item->next;
-    }
-    if (item->next != NULL)
-    {
-        /* not the last element */
-        item->next->prev = item->prev;
-    }
-
-    if (item == parent->child)
-    {
-        /* first element */
-        parent->child = item->next;
-    }
-    /* make sure the detached item doesn't point anywhere anymore */
-    item->prev = NULL;
-    item->next = NULL;
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
-{
-    if (which < 0)
-    {
-        return NULL;
-    }
-
-    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
-{
-    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
-{
-    cJSON *to_detach = cJSON_GetObjectItem(object, string);
-
-    return cJSON_DetachItemViaPointer(object, to_detach);
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
-{
-    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
-
-    return cJSON_DetachItemViaPointer(object, to_detach);
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
-{
-    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
-{
-    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
-}
-
-/* Replace array/object items with new ones. */
-CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
-{
-    cJSON *after_inserted = NULL;
-
-    if (which < 0)
-    {
-        return;
-    }
-
-    after_inserted = get_array_item(array, (size_t)which);
-    if (after_inserted == NULL)
-    {
-        add_item_to_array(array, newitem);
-        return;
-    }
-
-    newitem->next = after_inserted;
-    newitem->prev = after_inserted->prev;
-    after_inserted->prev = newitem;
-    if (after_inserted == array->child)
-    {
-        array->child = newitem;
-    }
-    else
-    {
-        newitem->prev->next = newitem;
-    }
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
-{
-    if ((parent == NULL) || (replacement == NULL) || (item == NULL))
-    {
-        return false;
-    }
-
-    if (replacement == item)
-    {
-        return true;
-    }
-
-    replacement->next = item->next;
-    replacement->prev = item->prev;
-
-    if (replacement->next != NULL)
-    {
-        replacement->next->prev = replacement;
-    }
-    if (replacement->prev != NULL)
-    {
-        replacement->prev->next = replacement;
-    }
-    if (parent->child == item)
-    {
-        parent->child = replacement;
-    }
-
-    item->next = NULL;
-    item->prev = NULL;
-    cJSON_Delete(item);
-
-    return true;
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
-{
-    if (which < 0)
-    {
-        return;
-    }
-
-    cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
-}
-
-static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
-{
-    if ((replacement == NULL) || (string == NULL))
-    {
-        return false;
-    }
-
-    /* replace the name in the replacement */
-    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
-    {
-        cJSON_free(replacement->string);
-    }
-    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
-    replacement->type &= ~cJSON_StringIsConst;
-
-    cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
-
-    return true;
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
-{
-    replace_item_in_object(object, string, newitem, false);
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
-{
-    replace_item_in_object(object, string, newitem, true);
-}
-
-/* Create basic types: */
-CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_NULL;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_True;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_False;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool b)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = b ? cJSON_True : cJSON_False;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(float num)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item)
-    {
-        item->type = cJSON_Number;
-        item->valuefloat = num;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item)
-    {
-        item->type = cJSON_String;
-        item->valuestring = (char*) cJSON_strdup((const unsigned char*) string, &global_hooks);
-        if (!item->valuestring)
-        {
-            cJSON_Delete(item);
-            return NULL;
-        }
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item != NULL)
-    {
-        item->type = cJSON_String | cJSON_IsReference;
-        item->valuestring = (char*)cast_away_const(string);
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item != NULL) {
-        item->type = cJSON_Object | cJSON_IsReference;
-        item->child = (cJSON*)cast_away_const(child);
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) {
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item != NULL) {
-        item->type = cJSON_Array | cJSON_IsReference;
-        item->child = (cJSON*)cast_away_const(child);
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_Raw;
-        item->valuestring = (char*) cJSON_strdup((const unsigned char*) raw, &global_hooks);
-        if(!item->valuestring)
-        {
-            cJSON_Delete(item);
-            return NULL;
-        }
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type=cJSON_Array;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item)
-    {
-        item->type = cJSON_Object;
-    }
-
-    return item;
-}
-
-/* Create Arrays: */
-CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-    for(i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber((float) numbers[i]);
-        if (!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for(i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber(numbers[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for(i = 0;a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber((float) numbers[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (strings == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for (i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateString(strings[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p,n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-/* Duplication */
-CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
-{
-    cJSON *newitem = NULL;
-    cJSON *child = NULL;
-    cJSON *next = NULL;
-    cJSON *newchild = NULL;
-
-    /* Bail on bad ptr */
-    if (!item)
-    {
-        goto fail;
-    }
-    /* Create new item */
-    newitem = cJSON_New_Item(&global_hooks);
-    if (!newitem)
-    {
-        goto fail;
-    }
-    /* Copy over all vars */
-    newitem->type = item->type & (~cJSON_IsReference);
-    if (cJSON_IsString(item) || cJSON_IsRaw(item))
-    {
-        if (item->valuestring)
-        {
-            newitem->valuestring = (char*) cJSON_strdup((unsigned char*) item->valuestring, &global_hooks);
-            if (!newitem->valuestring)
-            {
-                goto fail;
-            }
-        }
-    } else {
-        newitem->valuefloat = item->valuefloat;
-    }
-    if (item->string)
-    {
-        newitem->string = (item->type & cJSON_StringIsConst) ? item->string : (char*) cJSON_strdup((unsigned char*) item->string, &global_hooks);
-        if (!newitem->string)
-        {
-            goto fail;
-        }
-    }
-    /* If non-recursive, then we're done! */
-    if (!recurse)
-    {
-        return newitem;
-    }
-    /* Walk the ->next chain for the child. */
-    child = item->child;
-    while (child != NULL)
-    {
-        newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */
-        if (!newchild)
-        {
-            goto fail;
-        }
-        if (next != NULL)
-        {
-            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
-            next->next = newchild;
-            newchild->prev = next;
-            next = newchild;
-        }
-        else
-        {
-            /* Set newitem->child and move to it */
-            newitem->child = newchild;
-            next = newchild;
-        }
-        child = child->next;
-    }
-
-    return newitem;
-
-fail:
-    if (newitem != NULL)
-    {
-        cJSON_Delete(newitem);
-    }
-
-    return NULL;
-}
-
-CJSON_PUBLIC(void) cJSON_Minify(char *json)
-{
-    unsigned char *into = (unsigned char*)json;
-
-    if (json == NULL)
-    {
-        return;
-    }
-
-    while (*json)
-    {
-        if (*json == ' ')
-        {
-            json++;
-        }
-        else if (*json == '\t')
-        {
-            /* Whitespace characters. */
-            json++;
-        }
-        else if (*json == '\r')
-        {
-            json++;
-        }
-        else if (*json=='\n')
-        {
-            json++;
-        }
-        else if ((*json == '/') && (json[1] == '/'))
-        {
-            /* double-slash comments, to end of line. */
-            while (*json && (*json != '\n'))
-            {
-                json++;
-            }
-        }
-        else if ((*json == '/') && (json[1] == '*'))
-        {
-            /* multiline comments. */
-            while (*json && !((*json == '*') && (json[1] == '/')))
-            {
-                json++;
-            }
-            json += 2;
-        }
-        else if (*json == '\"')
-        {
-            /* string literals, which are \" sensitive. */
-            *into++ = (unsigned char)*json++;
-            while (*json && (*json != '\"'))
-            {
-                if (*json == '\\')
-                {
-                    *into++ = (unsigned char)*json++;
-                }
-                *into++ = (unsigned char)*json++;
-            }
-            *into++ = (unsigned char)*json++;
-        }
-        else
-        {
-            /* All other characters. */
-            *into++ = (unsigned char)*json++;
-        }
-    }
-
-    /* and null-terminate. */
-    *into = '\0';
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Invalid;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_False;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xff) == cJSON_True;
-}
-
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & (cJSON_True | cJSON_False)) != 0;
-}
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_NULL;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Number;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_String;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Array;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Object;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Raw;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
-{
-    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)) || cJSON_IsInvalid(a))
-    {
-        return false;
-    }
-
-    /* check if type is valid */
-    switch (a->type & 0xFF)
-    {
-        case cJSON_False:
-        case cJSON_True:
-        case cJSON_NULL:
-        case cJSON_Number:
-        case cJSON_String:
-        case cJSON_Raw:
-        case cJSON_Array:
-        case cJSON_Object:
-            break;
-
-        default:
-            return false;
-    }
-
-    /* identical objects are equal */
-    if (a == b)
-    {
-        return true;
-    }
-
-    switch (a->type & 0xFF)
-    {
-        /* in these cases and equal type is enough */
-        case cJSON_False:
-        case cJSON_True:
-        case cJSON_NULL:
-            return true;
-
-        case cJSON_Number:
-            if (a->valuefloat == b->valuefloat)
-            {
-                return true;
-            }
-            return false;
-
-        case cJSON_String:
-        case cJSON_Raw:
-            if ((a->valuestring == NULL) || (b->valuestring == NULL))
-            {
-                return false;
-            }
-            if (strcmp(a->valuestring, b->valuestring) == 0)
-            {
-                return true;
-            }
-
-            return false;
-
-        case cJSON_Array:
-        {
-            cJSON *a_element = a->child;
-            cJSON *b_element = b->child;
-
-            for (; (a_element != NULL) && (b_element != NULL);)
-            {
-                if (!cJSON_Compare(a_element, b_element, case_sensitive))
-                {
-                    return false;
-                }
-
-                a_element = a_element->next;
-                b_element = b_element->next;
-            }
-
-            /* one of the arrays is longer than the other */
-            if (a_element != b_element) {
-                return false;
-            }
-
-            return true;
-        }
-
-        case cJSON_Object:
-        {
-            cJSON *a_element = NULL;
-            cJSON *b_element = NULL;
-            cJSON_ArrayForEach(a_element, a)
-            {
-                /* TODO This has O(n^2) runtime, which is horrible! */
-                b_element = get_object_item(b, a_element->string, case_sensitive);
-                if (b_element == NULL)
-                {
-                    return false;
-                }
-
-                if (!cJSON_Compare(a_element, b_element, case_sensitive))
-                {
-                    return false;
-                }
-            }
-
-            /* doing this twice, once on a and b to prevent true comparison if a subset of b
-             * TODO: Do this the proper way, this is just a fix for now */
-            cJSON_ArrayForEach(b_element, b)
-            {
-                a_element = get_object_item(a, b_element->string, case_sensitive);
-                if (a_element == NULL)
-                {
-                    return false;
-                }
-
-                if (!cJSON_Compare(b_element, a_element, case_sensitive))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        default:
-            return false;
-    }
-}
-
-CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
-{
-    return global_hooks.allocate(size);
-}
-
-CJSON_PUBLIC(void) cJSON_free(void *object)
-{
-    global_hooks.deallocate(object);
-}
diff --git a/external_libs/cJSON/cJSON/cJSON.h b/external_libs/cJSON/cJSON/cJSON.h
deleted file mode 100644
index b6812b8d..00000000
--- a/external_libs/cJSON/cJSON/cJSON.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#ifndef cJSON__h
-#define cJSON__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* project version */
-#define CJSON_VERSION_MAJOR 1
-#define CJSON_VERSION_MINOR 7
-#define CJSON_VERSION_PATCH 7
-
-#include <stddef.h>
-
-/* cJSON Types: */
-#define cJSON_Invalid (0)
-#define cJSON_False  (1 << 0)
-#define cJSON_True   (1 << 1)
-#define cJSON_NULL   (1 << 2)
-#define cJSON_Number (1 << 3)
-#define cJSON_String (1 << 4)
-#define cJSON_Array  (1 << 5)
-#define cJSON_Object (1 << 6)
-#define cJSON_Raw    (1 << 7) /* raw json */
-
-#define cJSON_IsReference 256
-#define cJSON_StringIsConst 512
-
-/* The cJSON structure: */
-typedef struct cJSON
-{
-    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
-    struct cJSON *next;
-    struct cJSON *prev;
-    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
-    struct cJSON *child;
-
-    /* The type of the item, as above. */
-    int32_t type;
-    
-    union {
-        /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
-        char *valuestring;
-        /* The item's number, if type==cJSON_Number */
-        float valuefloat;
-    };
-    
-    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
-    char *string;
-} cJSON;
-
-typedef struct cJSON_Hooks
-{
-      void *(*malloc_fn)(size_t sz);
-      void (*free_fn)(void *ptr);
-} cJSON_Hooks;
-
-typedef int cJSON_bool;
-
-#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
-#define __WINDOWS__
-#endif
-#ifdef __WINDOWS__
-
-/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 2 define options:
-
-CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
-CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
-CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
-
-For *nix builds that support visibility attribute, you can define similar behavior by
-
-setting default visibility to hidden by adding
--fvisibility=hidden (for gcc)
-or
--xldscope=hidden (for sun cc)
-to CFLAGS
-
-then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
-
-*/
-
-/* export symbols by default, this is necessary for copy pasting the C and header file */
-#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_EXPORT_SYMBOLS
-#endif
-
-#if defined(CJSON_HIDE_SYMBOLS)
-#define CJSON_PUBLIC(type)   type __stdcall
-#elif defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllexport) type __stdcall
-#elif defined(CJSON_IMPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllimport) type __stdcall
-#endif
-#else /* !WIN32 */
-#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
-#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
-#else
-#define CJSON_PUBLIC(type) type
-#endif
-#endif
-
-/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
- * This is to prevent stack overflows. */
-#ifndef CJSON_NESTING_LIMIT
-#define CJSON_NESTING_LIMIT 1000
-#endif
-
-/* returns the version of cJSON as a string */
-CJSON_PUBLIC(const char*) cJSON_Version(void);
-
-/* Supply malloc, realloc and free functions to cJSON */
-CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
-
-/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
-/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
-CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
-/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
-CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
-
-/* Render a cJSON entity to text for transfer/storage. */
-CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any formatting. */
-CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
-/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
-CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
-/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
-/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
-CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
-/* Delete a cJSON entity and all subentities. */
-CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
-
-/* Returns the number of items in an array (or object). */
-CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
-/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
-CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
-/* Get item "string" from object. Case insensitive. */
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
-CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
-/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
-CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
-
-/* Check if the item is a string and return its valuestring */
-CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item);
-
-/* These functions check the type of an item */
-CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
-
-/* These calls create a cJSON item of the appropriate type. */
-CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
-CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(float num);
-CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
-/* raw json */
-CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
-CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
-
-/* Create a string where valuestring references a string so
- * it will not be freed by cJSON_Delete */
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
-/* Create an object/arrray that only references it's elements so
- * they will not be freed by cJSON_Delete */
-CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
-CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
-
-/* These utilities create an Array of count items. */
-CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
-
-/* Append item to the specified array/object. */
-CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
-/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
- * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
- * writing to `item->string` */
-CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
-/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
-
-/* Remove/Detatch items from Arrays/Objects. */
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
-
-/* Update array items. */
-CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
-CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
-
-/* Duplicate a cJSON item */
-CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
-/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
-need to be released. With recurse!=0, it will duplicate any children connected to the item.
-The item->next and ->prev pointers are always zero on return from Duplicate. */
-/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
- * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
-CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
-
-
-CJSON_PUBLIC(void) cJSON_Minify(char *json);
-
-/* Helper functions for creating and adding items to an object at the same time.
- * They return the added item or NULL on failure. */
-CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
-CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const float number);
-CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
-CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
-CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
-
-/* When assigning an integer value, it needs to be propagated to valuefloat. */
-#define cJSON_SetIntValue(object, number) ((object) ? (object)->valuefloat = (number) : (number))
-/* helper for the cJSON_SetNumberValue macro */
-CJSON_PUBLIC(float) cJSON_SetNumberHelper(cJSON *object, float number);
-#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (float) number) : (number))
-
-/* Macro for iterating over an array or object */
-#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
-
-/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
-CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
-CJSON_PUBLIC(void) cJSON_free(void *object);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external_libs/cJSON/cJSON/cJSON_Utils.c b/external_libs/cJSON/cJSON/cJSON_Utils.c
deleted file mode 100644
index 76808795..00000000
--- a/external_libs/cJSON/cJSON/cJSON_Utils.c
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-/* disable warnings about old C89 functions in MSVC */
-#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-#ifdef __GNUCC__
-#pragma GCC visibility push(default)
-#endif
-#if defined(_MSC_VER)
-#pragma warning (push)
-/* disable warning about single line comments in system headers */
-#pragma warning (disable : 4001)
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-#ifdef __GNUCC__
-#pragma GCC visibility pop
-#endif
-
-#include "cJSON_Utils.h"
-
-/* define our own boolean type */
-#define true ((cJSON_bool)1)
-#define false ((cJSON_bool)0)
-
-static unsigned char* cJSONUtils_strdup(const unsigned char* const string)
-{
-    size_t length = 0;
-    unsigned char *copy = NULL;
-
-    length = strlen((const char*)string) + sizeof("");
-    copy = (unsigned char*) cJSON_malloc(length);
-    if (copy == NULL)
-    {
-        return NULL;
-    }
-    memcpy(copy, string, length);
-
-    return copy;
-}
-
-/* string comparison which doesn't consider NULL pointers equal */
-static int compare_strings(const unsigned char *string1, const unsigned char *string2, const cJSON_bool case_sensitive)
-{
-    if ((string1 == NULL) || (string2 == NULL))
-    {
-        return 1;
-    }
-
-    if (string1 == string2)
-    {
-        return 0;
-    }
-
-    if (case_sensitive)
-    {
-        return strcmp((const char*)string1, (const char*)string2);
-    }
-
-    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
-    {
-        if (*string1 == '\0')
-        {
-            return 0;
-        }
-    }
-
-    return tolower(*string1) - tolower(*string2);
-}
-
-/* Compare the next path element of two JSON pointers, two NULL pointers are considered unequal: */
-static cJSON_bool compare_pointers(const unsigned char *name, const unsigned char *pointer, const cJSON_bool case_sensitive)
-{
-    if ((name == NULL) || (pointer == NULL))
-    {
-        return false;
-    }
-
-    for (; (*name != '\0') && (*pointer != '\0') && (*pointer != '/'); (void)name++, pointer++) /* compare until next '/' */
-    {
-        if (*pointer == '~')
-        {
-            /* check for escaped '~' (~0) and '/' (~1) */
-            if (((pointer[1] != '0') || (*name != '~')) && ((pointer[1] != '1') || (*name != '/')))
-            {
-                /* invalid escape sequence or wrong character in *name */
-                return false;
-            }
-            else
-            {
-                pointer++;
-            }
-        }
-        else if ((!case_sensitive && (tolower(*name) != tolower(*pointer))) || (case_sensitive && (*name != *pointer)))
-        {
-            return false;
-        }
-    }
-    if (((*pointer != 0) && (*pointer != '/')) != (*name != 0))
-    {
-        /* one string has ended, the other not */
-        return false;;
-    }
-
-    return true;
-}
-
-/* calculate the length of a string if encoded as JSON pointer with ~0 and ~1 escape sequences */
-static size_t pointer_encoded_length(const unsigned char *string)
-{
-    size_t length;
-    for (length = 0; *string != '\0'; (void)string++, length++)
-    {
-        /* character needs to be escaped? */
-        if ((*string == '~') || (*string == '/'))
-        {
-            length++;
-        }
-    }
-
-    return length;
-}
-
-/* copy a string while escaping '~' and '/' with ~0 and ~1 JSON pointer escape codes */
-static void encode_string_as_pointer(unsigned char *destination, const unsigned char *source)
-{
-    for (; source[0] != '\0'; (void)source++, destination++)
-    {
-        if (source[0] == '/')
-        {
-            destination[1] = '1';
-            destination++;
-        }
-        else if (source[0] == '~')
-        {
-            destination[0] = '~';
-            destination[1] = '1';
-            destination++;
-        }
-        else
-        {
-            destination[0] = source[0];
-        }
-    }
-
-    destination[0] = '\0';
-}
-
-CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(const cJSON * const object, const cJSON * const target)
-{
-    size_t child_index = 0;
-    cJSON *current_child = 0;
-
-    if ((object == NULL) || (target == NULL))
-    {
-        return NULL;
-    }
-
-    if (object == target)
-    {
-        /* found */
-        return (char*)cJSONUtils_strdup((const unsigned char*)"");
-    }
-
-    /* recursively search all children of the object or array */
-    for (current_child = object->child; current_child != NULL; (void)(current_child = current_child->next), child_index++)
-    {
-        unsigned char *target_pointer = (unsigned char*)cJSONUtils_FindPointerFromObjectTo(current_child, target);
-        /* found the target? */
-        if (target_pointer != NULL)
-        {
-            if (cJSON_IsArray(object))
-            {
-                /* reserve enough memory for a 64 bit integer + '/' and '\0' */
-                unsigned char *full_pointer = (unsigned char*)cJSON_malloc(strlen((char*)target_pointer) + 20 + sizeof("/"));
-                /* check if conversion to unsigned long is valid
-                 * This should be eliminated at compile time by dead code elimination
-                 * if size_t is an alias of unsigned long, or if it is bigger */
-                if (child_index > ULONG_MAX)
-                {
-                    cJSON_free(target_pointer);
-                    return NULL;
-                }
-                sprintf((char*)full_pointer, "/%lu%s", (unsigned long)child_index, target_pointer); /* /<array_index><path> */
-                cJSON_free(target_pointer);
-
-                return (char*)full_pointer;
-            }
-
-            if (cJSON_IsObject(object))
-            {
-                unsigned char *full_pointer = (unsigned char*)cJSON_malloc(strlen((char*)target_pointer) + pointer_encoded_length((unsigned char*)current_child->string) + 2);
-                full_pointer[0] = '/';
-                encode_string_as_pointer(full_pointer + 1, (unsigned char*)current_child->string);
-                strcat((char*)full_pointer, (char*)target_pointer);
-                cJSON_free(target_pointer);
-
-                return (char*)full_pointer;
-            }
-
-            /* reached leaf of the tree, found nothing */
-            cJSON_free(target_pointer);
-            return NULL;
-        }
-    }
-
-    /* not found */
-    return NULL;
-}
-
-/* non broken version of cJSON_GetArrayItem */
-static cJSON *get_array_item(const cJSON *array, size_t item)
-{
-    cJSON *child = array ? array->child : NULL;
-    while ((child != NULL) && (item > 0))
-    {
-        item--;
-        child = child->next;
-    }
-
-    return child;
-}
-
-static cJSON_bool decode_array_index_from_pointer(const unsigned char * const pointer, size_t * const index)
-{
-    size_t parsed_index = 0;
-    size_t position = 0;
-
-    if ((pointer[0] == '0') && ((pointer[1] != '\0') && (pointer[1] != '/')))
-    {
-        /* leading zeroes are not permitted */
-        return 0;
-    }
-
-    for (position = 0; (pointer[position] >= '0') && (pointer[0] <= '9'); position++)
-    {
-        parsed_index = (10 * parsed_index) + (size_t)(pointer[position] - '0');
-
-    }
-
-    if ((pointer[position] != '\0') && (pointer[position] != '/'))
-    {
-        return 0;
-    }
-
-    *index = parsed_index;
-
-    return 1;
-}
-
-static cJSON *get_item_from_pointer(cJSON * const object, const char * pointer, const cJSON_bool case_sensitive)
-{
-    cJSON *current_element = object;
-
-    if (pointer == NULL)
-    {
-        return NULL;
-    }
-
-    /* follow path of the pointer */
-    while ((pointer[0] == '/') && (current_element != NULL))
-    {
-        pointer++;
-        if (cJSON_IsArray(current_element))
-        {
-            size_t index = 0;
-            if (!decode_array_index_from_pointer((const unsigned char*)pointer, &index))
-            {
-                return NULL;
-            }
-
-            current_element = get_array_item(current_element, index);
-        }
-        else if (cJSON_IsObject(current_element))
-        {
-            current_element = current_element->child;
-            /* GetObjectItem. */
-            while ((current_element != NULL) && !compare_pointers((unsigned char*)current_element->string, (const unsigned char*)pointer, case_sensitive))
-            {
-                current_element = current_element->next;
-            }
-        }
-        else
-        {
-            return NULL;
-        }
-
-        /* skip to the next path token or end of string */
-        while ((pointer[0] != '\0') && (pointer[0] != '/'))
-        {
-            pointer++;
-        }
-    }
-
-    return current_element;
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON * const object, const char *pointer)
-{
-    return get_item_from_pointer(object, pointer, false);
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointerCaseSensitive(cJSON * const object, const char *pointer)
-{
-    return get_item_from_pointer(object, pointer, true);
-}
-
-/* JSON Patch implementation. */
-static void decode_pointer_inplace(unsigned char *string)
-{
-    unsigned char *decoded_string = string;
-
-    if (string == NULL) {
-        return;
-    }
-
-    for (; *string; (void)decoded_string++, string++)
-    {
-        if (string[0] == '~')
-        {
-            if (string[1] == '0')
-            {
-                decoded_string[0] = '~';
-            }
-            else if (string[1] == '1')
-            {
-                decoded_string[1] = '/';
-            }
-            else
-            {
-                /* invalid escape sequence */
-                return;
-            }
-
-            string++;
-        }
-    }
-
-    decoded_string[0] = '\0';
-}
-
-/* non-broken cJSON_DetachItemFromArray */
-static cJSON *detach_item_from_array(cJSON *array, size_t which)
-{
-    cJSON *c = array->child;
-    while (c && (which > 0))
-    {
-        c = c->next;
-        which--;
-    }
-    if (!c)
-    {
-        /* item doesn't exist */
-        return NULL;
-    }
-    if (c->prev)
-    {
-        /* not the first element */
-        c->prev->next = c->next;
-    }
-    if (c->next)
-    {
-        c->next->prev = c->prev;
-    }
-    if (c==array->child)
-    {
-        array->child = c->next;
-    }
-    /* make sure the detached item doesn't point anywhere anymore */
-    c->prev = c->next = NULL;
-
-    return c;
-}
-
-/* detach an item at the given path */
-static cJSON *detach_path(cJSON *object, const unsigned char *path, const cJSON_bool case_sensitive)
-{
-    unsigned char *parent_pointer = NULL;
-    unsigned char *child_pointer = NULL;
-    cJSON *parent = NULL;
-    cJSON *detached_item = NULL;
-
-    /* copy path and split it in parent and child */
-    parent_pointer = cJSONUtils_strdup(path);
-    if (parent_pointer == NULL) {
-        goto cleanup;
-    }
-
-    child_pointer = (unsigned char*)strrchr((char*)parent_pointer, '/'); /* last '/' */
-    if (child_pointer == NULL)
-    {
-        goto cleanup;
-    }
-    /* split strings */
-    child_pointer[0] = '\0';
-    child_pointer++;
-
-    parent = get_item_from_pointer(object, (char*)parent_pointer, case_sensitive);
-    decode_pointer_inplace(child_pointer);
-
-    if (cJSON_IsArray(parent))
-    {
-        size_t index = 0;
-        if (!decode_array_index_from_pointer(child_pointer, &index))
-        {
-            goto cleanup;
-        }
-        detached_item = detach_item_from_array(parent, index);
-    }
-    else if (cJSON_IsObject(parent))
-    {
-        detached_item = cJSON_DetachItemFromObject(parent, (char*)child_pointer);
-    }
-    else
-    {
-        /* Couldn't find object to remove child from. */
-        goto cleanup;
-    }
-
-cleanup:
-    if (parent_pointer != NULL)
-    {
-        cJSON_free(parent_pointer);
-    }
-
-    return detached_item;
-}
-
-/* sort lists using mergesort */
-static cJSON *sort_list(cJSON *list, const cJSON_bool case_sensitive)
-{
-    cJSON *first = list;
-    cJSON *second = list;
-    cJSON *current_item = list;
-    cJSON *result = list;
-    cJSON *result_tail = NULL;
-
-    if ((list == NULL) || (list->next == NULL))
-    {
-        /* One entry is sorted already. */
-        return result;
-    }
-
-    while ((current_item != NULL) && (current_item->next != NULL) && (compare_strings((unsigned char*)current_item->string, (unsigned char*)current_item->next->string, case_sensitive) < 0))
-    {
-        /* Test for list sorted. */
-        current_item = current_item->next;
-    }
-    if ((current_item == NULL) || (current_item->next == NULL))
-    {
-        /* Leave sorted lists unmodified. */
-        return result;
-    }
-
-    /* reset pointer to the beginning */
-    current_item = list;
-    while (current_item != NULL)
-    {
-        /* Walk two pointers to find the middle. */
-        second = second->next;
-        current_item = current_item->next;
-        /* advances current_item two steps at a time */
-        if (current_item != NULL)
-        {
-            current_item = current_item->next;
-        }
-    }
-    if ((second != NULL) && (second->prev != NULL))
-    {
-        /* Split the lists */
-        second->prev->next = NULL;
-    }
-
-    /* Recursively sort the sub-lists. */
-    first = sort_list(first, case_sensitive);
-    second = sort_list(second, case_sensitive);
-    result = NULL;
-
-    /* Merge the sub-lists */
-    while ((first != NULL) && (second != NULL))
-    {
-        cJSON *smaller = NULL;
-        if (compare_strings((unsigned char*)first->string, (unsigned char*)second->string, false) < 0)
-        {
-            smaller = first;
-        }
-        else
-        {
-            smaller = second;
-        }
-
-        if (result == NULL)
-        {
-            /* start merged list with the smaller element */
-            result_tail = smaller;
-            result = smaller;
-        }
-        else
-        {
-            /* add smaller element to the list */
-            result_tail->next = smaller;
-            smaller->prev = result_tail;
-            result_tail = smaller;
-        }
-
-        if (first == smaller)
-        {
-            first = first->next;
-        }
-        else
-        {
-            second = second->next;
-        }
-    }
-
-    if (first != NULL)
-    {
-        /* Append rest of first list. */
-        if (result == NULL)
-        {
-            return first;
-        }
-        result_tail->next = first;
-        first->prev = result_tail;
-    }
-    if (second != NULL)
-    {
-        /* Append rest of second list */
-        if (result == NULL)
-        {
-            return second;
-        }
-        result_tail->next = second;
-        second->prev = result_tail;
-    }
-
-    return result;
-}
-
-static void sort_object(cJSON * const object, const cJSON_bool case_sensitive)
-{
-    if (object == NULL)
-    {
-        return;
-    }
-    object->child = sort_list(object->child, case_sensitive);
-}
-
-static cJSON_bool compare_json(cJSON *a, cJSON *b, const cJSON_bool case_sensitive)
-{
-    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)))
-    {
-        /* mismatched type. */
-        return false;
-    }
-    switch (a->type & 0xFF)
-    {
-        case cJSON_Number:
-            /* numeric mismatch. */
-            if (a->valuefloat != b->valuefloat)
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-
-        case cJSON_String:
-            /* string mismatch. */
-            if (strcmp(a->valuestring, b->valuestring) != 0)
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-
-        case cJSON_Array:
-            for ((void)(a = a->child), b = b->child; (a != NULL) && (b != NULL); (void)(a = a->next), b = b->next)
-            {
-                cJSON_bool identical = compare_json(a, b, case_sensitive);
-                if (!identical)
-                {
-                    return false;
-                }
-            }
-
-            /* array size mismatch? (one of both children is not NULL) */
-            if ((a != NULL) || (b != NULL))
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-
-        case cJSON_Object:
-            sort_object(a, case_sensitive);
-            sort_object(b, case_sensitive);
-            for ((void)(a = a->child), b = b->child; (a != NULL) && (b != NULL); (void)(a = a->next), b = b->next)
-            {
-                cJSON_bool identical = false;
-                /* compare object keys */
-                if (compare_strings((unsigned char*)a->string, (unsigned char*)b->string, case_sensitive))
-                {
-                    /* missing member */
-                    return false;
-                }
-                identical = compare_json(a, b, case_sensitive);
-                if (!identical)
-                {
-                    return false;
-                }
-            }
-
-            /* object length mismatch (one of both children is not null) */
-            if ((a != NULL) || (b != NULL))
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-
-        default:
-            break;
-    }
-
-    /* null, true or false */
-    return true;
-}
-
-/* non broken version of cJSON_InsertItemInArray */
-static cJSON_bool insert_item_in_array(cJSON *array, size_t which, cJSON *newitem)
-{
-    cJSON *child = array->child;
-    while (child && (which > 0))
-    {
-        child = child->next;
-        which--;
-    }
-    if (which > 0)
-    {
-        /* item is after the end of the array */
-        return 0;
-    }
-    if (child == NULL)
-    {
-        cJSON_AddItemToArray(array, newitem);
-        return 1;
-    }
-
-    /* insert into the linked list */
-    newitem->next = child;
-    newitem->prev = child->prev;
-    child->prev = newitem;
-
-    /* was it at the beginning */
-    if (child == array->child)
-    {
-        array->child = newitem;
-    }
-    else
-    {
-        newitem->prev->next = newitem;
-    }
-
-    return 1;
-}
-
-static cJSON *get_object_item(const cJSON * const object, const char* name, const cJSON_bool case_sensitive)
-{
-    if (case_sensitive)
-    {
-        return cJSON_GetObjectItemCaseSensitive(object, name);
-    }
-
-    return cJSON_GetObjectItem(object, name);
-}
-
-enum patch_operation { INVALID, ADD, REMOVE, REPLACE, MOVE, COPY, TEST };
-
-static enum patch_operation decode_patch_operation(const cJSON * const patch, const cJSON_bool case_sensitive)
-{
-    cJSON *operation = get_object_item(patch, "op", case_sensitive);
-    if (!cJSON_IsString(operation))
-    {
-        return INVALID;
-    }
-
-    if (strcmp(operation->valuestring, "add") == 0)
-    {
-        return ADD;
-    }
-
-    if (strcmp(operation->valuestring, "remove") == 0)
-    {
-        return REMOVE;
-    }
-
-    if (strcmp(operation->valuestring, "replace") == 0)
-    {
-        return REPLACE;
-    }
-
-    if (strcmp(operation->valuestring, "move") == 0)
-    {
-        return MOVE;
-    }
-
-    if (strcmp(operation->valuestring, "copy") == 0)
-    {
-        return COPY;
-    }
-
-    if (strcmp(operation->valuestring, "test") == 0)
-    {
-        return TEST;
-    }
-
-    return INVALID;
-}
-
-/* overwrite and existing item with another one and free resources on the way */
-static void overwrite_item(cJSON * const root, const cJSON replacement)
-{
-    if (root == NULL)
-    {
-        return;
-    }
-
-    if (root->string != NULL)
-    {
-        cJSON_free(root->string);
-    }
-    if ((cJSON_IsString(root) || cJSON_IsRaw(root)) && root->valuestring != NULL)
-    {
-        cJSON_free(root->valuestring);
-    }
-    if (root->child != NULL)
-    {
-        cJSON_Delete(root->child);
-    }
-
-    memcpy(root, &replacement, sizeof(cJSON));
-}
-
-static int apply_patch(cJSON *object, const cJSON *patch, const cJSON_bool case_sensitive)
-{
-    cJSON *path = NULL;
-    cJSON *value = NULL;
-    cJSON *parent = NULL;
-    enum patch_operation opcode = INVALID;
-    unsigned char *parent_pointer = NULL;
-    unsigned char *child_pointer = NULL;
-    int status = 0;
-
-    path = get_object_item(patch, "path", case_sensitive);
-    if (!cJSON_IsString(path))
-    {
-        /* malformed patch. */
-        status = 2;
-        goto cleanup;
-    }
-
-    opcode = decode_patch_operation(patch, case_sensitive);
-    if (opcode == INVALID)
-    {
-        status = 3;
-        goto cleanup;
-    }
-    else if (opcode == TEST)
-    {
-        /* compare value: {...} with the given path */
-        status = !compare_json(get_item_from_pointer(object, path->valuestring, case_sensitive), get_object_item(patch, "value", case_sensitive), case_sensitive);
-        goto cleanup;
-    }
-
-    /* special case for replacing the root */
-    if (path->valuestring[0] == '\0')
-    {
-        if (opcode == REMOVE)
-        {
-            static const cJSON invalid = { NULL, NULL, NULL, cJSON_Invalid, { 0 }, NULL};
-
-            overwrite_item(object, invalid);
-
-            status = 0;
-            goto cleanup;
-        }
-
-        if ((opcode == REPLACE) || (opcode == ADD))
-        {
-            value = get_object_item(patch, "value", case_sensitive);
-            if (value == NULL)
-            {
-                /* missing "value" for add/replace. */
-                status = 7;
-                goto cleanup;
-            }
-
-            value = cJSON_Duplicate(value, 1);
-            if (value == NULL)
-            {
-                /* out of memory for add/replace. */
-                status = 8;
-                goto cleanup;
-            }
-
-            overwrite_item(object, *value);
-
-            /* delete the duplicated value */
-            cJSON_free(value);
-            value = NULL;
-
-            /* the string "value" isn't needed */
-            if (object->string != NULL)
-            {
-                cJSON_free(object->string);
-                object->string = NULL;
-            }
-
-            status = 0;
-            goto cleanup;
-        }
-    }
-
-    if ((opcode == REMOVE) || (opcode == REPLACE))
-    {
-        /* Get rid of old. */
-        cJSON *old_item = detach_path(object, (unsigned char*)path->valuestring, case_sensitive);
-        if (old_item == NULL)
-        {
-            status = 13;
-            goto cleanup;
-        }
-        cJSON_Delete(old_item);
-        if (opcode == REMOVE)
-        {
-            /* For Remove, this job is done. */
-            status = 0;
-            goto cleanup;
-        }
-    }
-
-    /* Copy/Move uses "from". */
-    if ((opcode == MOVE) || (opcode == COPY))
-    {
-        cJSON *from = get_object_item(patch, "from", case_sensitive);
-        if (from == NULL)
-        {
-            /* missing "from" for copy/move. */
-            status = 4;
-            goto cleanup;
-        }
-
-        if (opcode == MOVE)
-        {
-            value = detach_path(object, (unsigned char*)from->valuestring, case_sensitive);
-        }
-        if (opcode == COPY)
-        {
-            value = get_item_from_pointer(object, from->valuestring, case_sensitive);
-        }
-        if (value == NULL)
-        {
-            /* missing "from" for copy/move. */
-            status = 5;
-            goto cleanup;
-        }
-        if (opcode == COPY)
-        {
-            value = cJSON_Duplicate(value, 1);
-        }
-        if (value == NULL)
-        {
-            /* out of memory for copy/move. */
-            status = 6;
-            goto cleanup;
-        }
-    }
-    else /* Add/Replace uses "value". */
-    {
-        value = get_object_item(patch, "value", case_sensitive);
-        if (value == NULL)
-        {
-            /* missing "value" for add/replace. */
-            status = 7;
-            goto cleanup;
-        }
-        value = cJSON_Duplicate(value, 1);
-        if (value == NULL)
-        {
-            /* out of memory for add/replace. */
-            status = 8;
-            goto cleanup;
-        }
-    }
-
-    /* Now, just add "value" to "path". */
-
-    /* split pointer in parent and child */
-    parent_pointer = cJSONUtils_strdup((unsigned char*)path->valuestring);
-    child_pointer = (unsigned char*)strrchr((char*)parent_pointer, '/');
-    if (child_pointer != NULL)
-    {
-        child_pointer[0] = '\0';
-        child_pointer++;
-    }
-    parent = get_item_from_pointer(object, (char*)parent_pointer, case_sensitive);
-    decode_pointer_inplace(child_pointer);
-
-    /* add, remove, replace, move, copy, test. */
-    if ((parent == NULL) || (child_pointer == NULL))
-    {
-        /* Couldn't find object to add to. */
-        status = 9;
-        goto cleanup;
-    }
-    else if (cJSON_IsArray(parent))
-    {
-        if (strcmp((char*)child_pointer, "-") == 0)
-        {
-            cJSON_AddItemToArray(parent, value);
-            value = NULL;
-        }
-        else
-        {
-            size_t index = 0;
-            if (!decode_array_index_from_pointer(child_pointer, &index))
-            {
-                status = 11;
-                goto cleanup;
-            }
-
-            if (!insert_item_in_array(parent, index, value))
-            {
-                status = 10;
-                goto cleanup;
-            }
-            value = NULL;
-        }
-    }
-    else if (cJSON_IsObject(parent))
-    {
-        if (case_sensitive)
-        {
-            cJSON_DeleteItemFromObjectCaseSensitive(parent, (char*)child_pointer);
-        }
-        else
-        {
-            cJSON_DeleteItemFromObject(parent, (char*)child_pointer);
-        }
-        cJSON_AddItemToObject(parent, (char*)child_pointer, value);
-        value = NULL;
-    }
-    else /* parent is not an object */
-    {
-        /* Couldn't find object to add to. */
-        status = 9;
-        goto cleanup;
-    }
-
-cleanup:
-    if (value != NULL)
-    {
-        cJSON_Delete(value);
-    }
-    if (parent_pointer != NULL)
-    {
-        cJSON_free(parent_pointer);
-    }
-
-    return status;
-}
-
-CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON * const object, const cJSON * const patches)
-{
-    const cJSON *current_patch = NULL;
-    int status = 0;
-
-    if (!cJSON_IsArray(patches))
-    {
-        /* malformed patches. */
-        return 1;
-    }
-
-    if (patches != NULL)
-    {
-        current_patch = patches->child;
-    }
-
-    while (current_patch != NULL)
-    {
-        status = apply_patch(object, current_patch, false);
-        if (status != 0)
-        {
-            return status;
-        }
-        current_patch = current_patch->next;
-    }
-
-    return 0;
-}
-
-CJSON_PUBLIC(int) cJSONUtils_ApplyPatchesCaseSensitive(cJSON * const object, const cJSON * const patches)
-{
-    const cJSON *current_patch = NULL;
-    int status = 0;
-
-    if (!cJSON_IsArray(patches))
-    {
-        /* malformed patches. */
-        return 1;
-    }
-
-    if (patches != NULL)
-    {
-        current_patch = patches->child;
-    }
-
-    while (current_patch != NULL)
-    {
-        status = apply_patch(object, current_patch, true);
-        if (status != 0)
-        {
-            return status;
-        }
-        current_patch = current_patch->next;
-    }
-
-    return 0;
-}
-
-static void compose_patch(cJSON * const patches, const unsigned char * const operation, const unsigned char * const path, const unsigned char *suffix, const cJSON * const value)
-{
-    cJSON *patch = NULL;
-
-    if ((patches == NULL) || (operation == NULL) || (path == NULL))
-    {
-        return;
-    }
-
-    patch = cJSON_CreateObject();
-    if (patch == NULL)
-    {
-        return;
-    }
-    cJSON_AddItemToObject(patch, "op", cJSON_CreateString((const char*)operation));
-
-    if (suffix == NULL)
-    {
-        cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)path));
-    }
-    else
-    {
-        size_t suffix_length = pointer_encoded_length(suffix);
-        size_t path_length = strlen((const char*)path);
-        unsigned char *full_path = (unsigned char*)cJSON_malloc(path_length + suffix_length + sizeof("/"));
-
-        sprintf((char*)full_path, "%s/", (const char*)path);
-        encode_string_as_pointer(full_path + path_length + 1, suffix);
-
-        cJSON_AddItemToObject(patch, "path", cJSON_CreateString((const char*)full_path));
-        cJSON_free(full_path);
-    }
-
-    if (value != NULL)
-    {
-        cJSON_AddItemToObject(patch, "value", cJSON_Duplicate(value, 1));
-    }
-    cJSON_AddItemToArray(patches, patch);
-}
-
-CJSON_PUBLIC(void) cJSONUtils_AddPatchToArray(cJSON * const array, const char * const operation, const char * const path, const cJSON * const value)
-{
-    compose_patch(array, (const unsigned char*)operation, (const unsigned char*)path, NULL, value);
-}
-
-static void create_patches(cJSON * const patches, const unsigned char * const path, cJSON * const from, cJSON * const to, const cJSON_bool case_sensitive)
-{
-    if ((from == NULL) || (to == NULL))
-    {
-        return;
-    }
-
-    if ((from->type & 0xFF) != (to->type & 0xFF))
-    {
-        compose_patch(patches, (const unsigned char*)"replace", path, 0, to);
-        return;
-    }
-
-    switch (from->type & 0xFF)
-    {
-        case cJSON_Number:
-            if (from->valuefloat != to->valuefloat)
-            {
-                compose_patch(patches, (const unsigned char*)"replace", path, NULL, to);
-            }
-            return;
-
-        case cJSON_String:
-            if (strcmp(from->valuestring, to->valuestring) != 0)
-            {
-                compose_patch(patches, (const unsigned char*)"replace", path, NULL, to);
-            }
-            return;
-
-        case cJSON_Array:
-        {
-            size_t index = 0;
-            cJSON *from_child = from->child;
-            cJSON *to_child = to->child;
-            unsigned char *new_path = (unsigned char*)cJSON_malloc(strlen((const char*)path) + 20 + sizeof("/")); /* Allow space for 64bit int. log10(2^64) = 20 */
-
-            /* generate patches for all array elements that exist in both "from" and "to" */
-            for (index = 0; (from_child != NULL) && (to_child != NULL); (void)(from_child = from_child->next), (void)(to_child = to_child->next), index++)
-            {
-                /* check if conversion to unsigned long is valid
-                 * This should be eliminated at compile time by dead code elimination
-                 * if size_t is an alias of unsigned long, or if it is bigger */
-                if (index > ULONG_MAX)
-                {
-                    cJSON_free(new_path);
-                    return;
-                }
-                sprintf((char*)new_path, "%s/%lu", path, (unsigned long)index); /* path of the current array element */
-                create_patches(patches, new_path, from_child, to_child, case_sensitive);
-            }
-
-            /* remove leftover elements from 'from' that are not in 'to' */
-            for (; (from_child != NULL); (void)(from_child = from_child->next))
-            {
-                /* check if conversion to unsigned long is valid
-                 * This should be eliminated at compile time by dead code elimination
-                 * if size_t is an alias of unsigned long, or if it is bigger */
-                if (index > ULONG_MAX)
-                {
-                    cJSON_free(new_path);
-                    return;
-                }
-                sprintf((char*)new_path, "%lu", (unsigned long)index);
-                compose_patch(patches, (const unsigned char*)"remove", path, new_path, NULL);
-            }
-            /* add new elements in 'to' that were not in 'from' */
-            for (; (to_child != NULL); (void)(to_child = to_child->next), index++)
-            {
-                compose_patch(patches, (const unsigned char*)"add", path, (const unsigned char*)"-", to_child);
-            }
-            cJSON_free(new_path);
-            return;
-        }
-
-        case cJSON_Object:
-        {
-            cJSON *from_child = NULL;
-            cJSON *to_child = NULL;
-            sort_object(from, case_sensitive);
-            sort_object(to, case_sensitive);
-
-            from_child = from->child;
-            to_child = to->child;
-            /* for all object values in the object with more of them */
-            while ((from_child != NULL) || (to_child != NULL))
-            {
-                int diff;
-                if (from_child == NULL)
-                {
-                    diff = 1;
-                }
-                else if (to_child == NULL)
-                {
-                    diff = -1;
-                }
-                else
-                {
-                    diff = compare_strings((unsigned char*)from_child->string, (unsigned char*)to_child->string, case_sensitive);
-                }
-
-                if (diff == 0)
-                {
-                    /* both object keys are the same */
-                    size_t path_length = strlen((const char*)path);
-                    size_t from_child_name_length = pointer_encoded_length((unsigned char*)from_child->string);
-                    unsigned char *new_path = (unsigned char*)cJSON_malloc(path_length + from_child_name_length + sizeof("/"));
-
-                    sprintf((char*)new_path, "%s/", path);
-                    encode_string_as_pointer(new_path + path_length + 1, (unsigned char*)from_child->string);
-
-                    /* create a patch for the element */
-                    create_patches(patches, new_path, from_child, to_child, case_sensitive);
-                    cJSON_free(new_path);
-
-                    from_child = from_child->next;
-                    to_child = to_child->next;
-                }
-                else if (diff < 0)
-                {
-                    /* object element doesn't exist in 'to' --> remove it */
-                    compose_patch(patches, (const unsigned char*)"remove", path, (unsigned char*)from_child->string, NULL);
-
-                    from_child = from_child->next;
-                }
-                else
-                {
-                    /* object element doesn't exist in 'from' --> add it */
-                    compose_patch(patches, (const unsigned char*)"add", path, (unsigned char*)to_child->string, to_child);
-
-                    to_child = to_child->next;
-                }
-            }
-            return;
-        }
-
-        default:
-            break;
-    }
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatches(cJSON * const from, cJSON * const to)
-{
-    cJSON *patches = NULL;
-
-    if ((from == NULL) || (to == NULL))
-    {
-        return NULL;
-    }
-
-    patches = cJSON_CreateArray();
-    create_patches(patches, (const unsigned char*)"", from, to, false);
-
-    return patches;
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatchesCaseSensitive(cJSON * const from, cJSON * const to)
-{
-    cJSON *patches = NULL;
-
-    if ((from == NULL) || (to == NULL))
-    {
-        return NULL;
-    }
-
-    patches = cJSON_CreateArray();
-    create_patches(patches, (const unsigned char*)"", from, to, true);
-
-    return patches;
-}
-
-CJSON_PUBLIC(void) cJSONUtils_SortObject(cJSON * const object)
-{
-    sort_object(object, false);
-}
-
-CJSON_PUBLIC(void) cJSONUtils_SortObjectCaseSensitive(cJSON * const object)
-{
-    sort_object(object, true);
-}
-
-static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_bool case_sensitive)
-{
-    cJSON *patch_child = NULL;
-
-    if (!cJSON_IsObject(patch))
-    {
-        /* scalar value, array or NULL, just duplicate */
-        cJSON_Delete(target);
-        return cJSON_Duplicate(patch, 1);
-    }
-
-    if (!cJSON_IsObject(target))
-    {
-        cJSON_Delete(target);
-        target = cJSON_CreateObject();
-    }
-
-    patch_child = patch->child;
-    while (patch_child != NULL)
-    {
-        if (cJSON_IsNull(patch_child))
-        {
-            /* NULL is the indicator to remove a value, see RFC7396 */
-            if (case_sensitive)
-            {
-                cJSON_DeleteItemFromObjectCaseSensitive(target, patch_child->string);
-            }
-            else
-            {
-                cJSON_DeleteItemFromObject(target, patch_child->string);
-            }
-        }
-        else
-        {
-            cJSON *replace_me = NULL;
-            cJSON *replacement = NULL;
-
-            if (case_sensitive)
-            {
-                replace_me = cJSON_DetachItemFromObjectCaseSensitive(target, patch_child->string);
-            }
-            else
-            {
-                replace_me = cJSON_DetachItemFromObject(target, patch_child->string);
-            }
-
-            replacement = merge_patch(replace_me, patch_child, case_sensitive);
-            if (replacement == NULL)
-            {
-                return NULL;
-            }
-
-            cJSON_AddItemToObject(target, patch_child->string, replacement);
-        }
-        patch_child = patch_child->next;
-    }
-    return target;
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatch(cJSON *target, const cJSON * const patch)
-{
-    return merge_patch(target, patch, false);
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatchCaseSensitive(cJSON *target, const cJSON * const patch)
-{
-    return merge_patch(target, patch, true);
-}
-
-static cJSON *generate_merge_patch(cJSON * const from, cJSON * const to, const cJSON_bool case_sensitive)
-{
-    cJSON *from_child = NULL;
-    cJSON *to_child = NULL;
-    cJSON *patch = NULL;
-    if (to == NULL)
-    {
-        /* patch to delete everything */
-        return cJSON_CreateNull();
-    }
-    if (!cJSON_IsObject(to) || !cJSON_IsObject(from))
-    {
-        return cJSON_Duplicate(to, 1);
-    }
-
-    sort_object(from, case_sensitive);
-    sort_object(to, case_sensitive);
-
-    from_child = from->child;
-    to_child = to->child;
-    patch = cJSON_CreateObject();
-    while (from_child || to_child)
-    {
-        int diff;
-        if (from_child != NULL)
-        {
-            if (to_child != NULL)
-            {
-                diff = strcmp(from_child->string, to_child->string);
-            }
-            else
-            {
-                diff = -1;
-            }
-        }
-        else
-        {
-            diff = 1;
-        }
-
-        if (diff < 0)
-        {
-            /* from has a value that to doesn't have -> remove */
-            cJSON_AddItemToObject(patch, from_child->string, cJSON_CreateNull());
-
-            from_child = from_child->next;
-        }
-        else if (diff > 0)
-        {
-            /* to has a value that from doesn't have -> add to patch */
-            cJSON_AddItemToObject(patch, to_child->string, cJSON_Duplicate(to_child, 1));
-
-            to_child = to_child->next;
-        }
-        else
-        {
-            /* object key exists in both objects */
-            if (!compare_json(from_child, to_child, case_sensitive))
-            {
-                /* not identical --> generate a patch */
-                cJSON_AddItemToObject(patch, to_child->string, cJSONUtils_GenerateMergePatch(from_child, to_child));
-            }
-
-            /* next key in the object */
-            from_child = from_child->next;
-            to_child = to_child->next;
-        }
-    }
-    if (patch->child == NULL)
-    {
-        /* no patch generated */
-        cJSON_Delete(patch);
-        return NULL;
-    }
-
-    return patch;
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatch(cJSON * const from, cJSON * const to)
-{
-    return generate_merge_patch(from, to, false);
-}
-
-CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatchCaseSensitive(cJSON * const from, cJSON * const to)
-{
-    return generate_merge_patch(from, to, true);
-}
diff --git a/external_libs/cJSON/cJSON/cJSON_Utils.h b/external_libs/cJSON/cJSON/cJSON_Utils.h
deleted file mode 100644
index a970c650..00000000
--- a/external_libs/cJSON/cJSON/cJSON_Utils.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#ifndef cJSON_Utils__h
-#define cJSON_Utils__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "cJSON.h"
-
-/* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */
-CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON * const object, const char *pointer);
-CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointerCaseSensitive(cJSON * const object, const char *pointer);
-
-/* Implement RFC6902 (https://tools.ietf.org/html/rfc6902) JSON Patch spec. */
-/* NOTE: This modifies objects in 'from' and 'to' by sorting the elements by their key */
-CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatches(cJSON * const from, cJSON * const to);
-CJSON_PUBLIC(cJSON *) cJSONUtils_GeneratePatchesCaseSensitive(cJSON * const from, cJSON * const to);
-/* Utility for generating patch array entries. */
-CJSON_PUBLIC(void) cJSONUtils_AddPatchToArray(cJSON * const array, const char * const operation, const char * const path, const cJSON * const value);
-/* Returns 0 for success. */
-CJSON_PUBLIC(int) cJSONUtils_ApplyPatches(cJSON * const object, const cJSON * const patches);
-CJSON_PUBLIC(int) cJSONUtils_ApplyPatchesCaseSensitive(cJSON * const object, const cJSON * const patches);
-
-/*
-// Note that ApplyPatches is NOT atomic on failure. To implement an atomic ApplyPatches, use:
-//int cJSONUtils_AtomicApplyPatches(cJSON **object, cJSON *patches)
-//{
-//    cJSON *modme = cJSON_Duplicate(*object, 1);
-//    int error = cJSONUtils_ApplyPatches(modme, patches);
-//    if (!error)
-//    {
-//        cJSON_Delete(*object);
-//        *object = modme;
-//    }
-//    else
-//    {
-//        cJSON_Delete(modme);
-//    }
-//
-//    return error;
-//}
-// Code not added to library since this strategy is a LOT slower.
-*/
-
-/* Implement RFC7386 (https://tools.ietf.org/html/rfc7396) JSON Merge Patch spec. */
-/* target will be modified by patch. return value is new ptr for target. */
-CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatch(cJSON *target, const cJSON * const patch);
-CJSON_PUBLIC(cJSON *) cJSONUtils_MergePatchCaseSensitive(cJSON *target, const cJSON * const patch);
-/* generates a patch to move from -> to */
-/* NOTE: This modifies objects in 'from' and 'to' by sorting the elements by their key */
-CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatch(cJSON * const from, cJSON * const to);
-CJSON_PUBLIC(cJSON *) cJSONUtils_GenerateMergePatchCaseSensitive(cJSON * const from, cJSON * const to);
-
-/* Given a root object and a target object, construct a pointer from one to the other. */
-CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(const cJSON * const object, const cJSON * const target);
-
-/* Sorts the members of the object into alphabetical order. */
-CJSON_PUBLIC(void) cJSONUtils_SortObject(cJSON * const object);
-CJSON_PUBLIC(void) cJSONUtils_SortObjectCaseSensitive(cJSON * const object);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external_libs/cJSON/cJSON/fuzzing/.gitignore b/external_libs/cJSON/cJSON/fuzzing/.gitignore
deleted file mode 100644
index c82a2620..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-afl-build
diff --git a/external_libs/cJSON/cJSON/fuzzing/CMakeLists.txt b/external_libs/cJSON/cJSON/fuzzing/CMakeLists.txt
deleted file mode 100644
index fdd7126e..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-option(ENABLE_FUZZING "Create executables and targets for fuzzing cJSON with afl." Off)
-if (ENABLE_FUZZING)
-    find_program(AFL_FUZZ afl-fuzz)
-    if ("${AFL_FUZZ}" MATCHES "AFL_FUZZ-NOTFOUND")
-        message(FATAL_ERROR "Couldn't find afl-fuzz.")
-    endif()
-
-    add_executable(afl-main afl.c)
-    target_link_libraries(afl-main "${CJSON_LIB}")
-
-    if (NOT ENABLE_SANITIZERS)
-        message(FATAL_ERROR "Enable sanitizers with -DENABLE_SANITIZERS=On to do fuzzing.")
-    endif()
-
-    option(ENABLE_FUZZING_PRINT "Fuzz printing functions together with parser." On)
-    set(fuzz_print_parameter "no")
-    if (ENABLE_FUZZING_PRINT)
-        set(fuzz_print_parameter "yes")
-    endif()
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
-
-    add_custom_target(afl
-        COMMAND "${AFL_FUZZ}" -i "${CMAKE_CURRENT_SOURCE_DIR}/inputs" -o "${CMAKE_CURRENT_BINARY_DIR}/findings" -x "${CMAKE_CURRENT_SOURCE_DIR}/json.dict" -- "${CMAKE_CURRENT_BINARY_DIR}/afl-main" "@@" "${fuzz_print_parameter}"
-        DEPENDS afl-main)
-
-
-endif()
diff --git a/external_libs/cJSON/cJSON/fuzzing/afl-prepare-linux.sh b/external_libs/cJSON/cJSON/fuzzing/afl-prepare-linux.sh
deleted file mode 100755
index 41c9b899..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/afl-prepare-linux.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -x
-echo core | sudo tee /proc/sys/kernel/core_pattern
-echo performance | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
diff --git a/external_libs/cJSON/cJSON/fuzzing/afl.c b/external_libs/cJSON/cJSON/fuzzing/afl.c
deleted file mode 100644
index 036ed14b..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/afl.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../cJSON.h"
-
-static char *read_file(const char *filename)
-{
-    FILE *file = NULL;
-    long length = 0;
-    char *content = NULL;
-    size_t read_chars = 0;
-
-    /* open in read binary mode */
-    file = fopen(filename, "rb");
-    if (file == NULL)
-    {
-        goto cleanup;
-    }
-
-    /* get the length */
-    if (fseek(file, 0, SEEK_END) != 0)
-    {
-        goto cleanup;
-    }
-    length = ftell(file);
-    if (length < 0)
-    {
-        goto cleanup;
-    }
-    if (fseek(file, 0, SEEK_SET) != 0)
-    {
-        goto cleanup;
-    }
-
-    /* allocate content buffer */
-    content = (char*)malloc((size_t)length + sizeof(""));
-    if (content == NULL)
-    {
-        goto cleanup;
-    }
-
-    /* read the file into memory */
-    read_chars = fread(content, sizeof(char), (size_t)length, file);
-    if ((long)read_chars != length)
-    {
-        free(content);
-        content = NULL;
-        goto cleanup;
-    }
-    content[read_chars] = '\0';
-
-
-cleanup:
-    if (file != NULL)
-    {
-        fclose(file);
-    }
-
-    return content;
-}
-
-int main(int argc, char** argv)
-{
-    const char *filename = NULL;
-    cJSON *item = NULL;
-    char *json = NULL;
-    int status = EXIT_FAILURE;
-    char *printed_json = NULL;
-
-    if ((argc < 2) || (argc > 3))
-    {
-        printf("Usage:\n");
-        printf("%s input_file [enable_printing]\n", argv[0]);
-        printf("\t input_file: file containing the test data\n");
-        printf("\t enable_printing: print after parsing, 'yes' or 'no', defaults to 'no'\n");
-        goto cleanup;
-    }
-
-    filename = argv[1];
-
-#if __AFL_HAVE_MANUAL_CONTROL
-    while (__AFL_LOOP(1000))
-    {
-#endif
-    status = EXIT_SUCCESS;
-
-    json = read_file(filename);
-    if ((json == NULL) || (json[0] == '\0') || (json[1] == '\0'))
-    {
-        status = EXIT_FAILURE;
-        goto cleanup;
-    }
-    item = cJSON_Parse(json + 2);
-    if (item == NULL)
-    {
-        goto cleanup;
-    }
-
-    if ((argc == 3) && (strncmp(argv[2], "yes", 3) == 0))
-    {
-        int do_format = 0;
-        if (json[1] == 'f')
-        {
-            do_format = 1;
-        }
-
-        if (json[0] == 'b')
-        {
-            /* buffered printing */
-            printed_json = cJSON_PrintBuffered(item, 1, do_format);
-        }
-        else
-        {
-            /* unbuffered printing */
-            if (do_format)
-            {
-                printed_json = cJSON_Print(item);
-            }
-            else
-            {
-                printed_json = cJSON_PrintUnformatted(item);
-            }
-        }
-        if (printed_json == NULL)
-        {
-            status = EXIT_FAILURE;
-            goto cleanup;
-        }
-        printf("%s\n", printed_json);
-    }
-
-cleanup:
-    if (item != NULL)
-    {
-        cJSON_Delete(item);
-        item = NULL;
-    }
-    if (json != NULL)
-    {
-        free(json);
-        json = NULL;
-    }
-    if (printed_json != NULL)
-    {
-        free(printed_json);
-        printed_json = NULL;
-    }
-#if __AFL_HAVE_MANUAL_CONTROL
-    }
-#endif
-
-    return status;
-}
diff --git a/external_libs/cJSON/cJSON/fuzzing/afl.sh b/external_libs/cJSON/cJSON/fuzzing/afl.sh
deleted file mode 100755
index 8f0f02fb..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/afl.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-mkdir -p afl-build || exit 1
-cd afl-build || exit 1
-#cleanup
-rm -r -- *
-
-CC=afl-clang-fast cmake ../.. -DENABLE_FUZZING=On -DENABLE_SANITIZERS=On -DBUILD_SHARED_LIBS=Off
-make afl
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test1 b/external_libs/cJSON/cJSON/fuzzing/inputs/test1
deleted file mode 100644
index 6a0c0d7c..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test1
+++ /dev/null
@@ -1,22 +0,0 @@
-bf{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test10 b/external_libs/cJSON/cJSON/fuzzing/inputs/test10
deleted file mode 100644
index 01e9a82f..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test10
+++ /dev/null
@@ -1 +0,0 @@
-bf["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test11 b/external_libs/cJSON/cJSON/fuzzing/inputs/test11
deleted file mode 100644
index e81d60d7..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test11
+++ /dev/null
@@ -1,8 +0,0 @@
-bf{
-"name": "Jack (\"Bee\") Nimble",
-"format": {"type":       "rect",
-"width":      1920,
-"height":     1080,
-"interlace":  false,"frame rate": 24
-}
-}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test2 b/external_libs/cJSON/cJSON/fuzzing/inputs/test2
deleted file mode 100644
index 3fdf8cb7..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test2
+++ /dev/null
@@ -1,11 +0,0 @@
-bf{"menu": {
-  "id": "file",
-  "value": "File",
-  "popup": {
-    "menuitem": [
-      {"value": "New", "onclick": "CreateNewDoc()"},
-      {"value": "Open", "onclick": "OpenDoc()"},
-      {"value": "Close", "onclick": "CloseDoc()"}
-    ]
-  }
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test3 b/external_libs/cJSON/cJSON/fuzzing/inputs/test3
deleted file mode 100644
index 11edd2f2..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test3
+++ /dev/null
@@ -1,26 +0,0 @@
-bf{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": {
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.bu b/external_libs/cJSON/cJSON/fuzzing/inputs/test3.bu
deleted file mode 100644
index eaac4e31..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.bu
+++ /dev/null
@@ -1,26 +0,0 @@
-bu{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": {
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uf b/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uf
deleted file mode 100644
index edad9778..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uf
+++ /dev/null
@@ -1,26 +0,0 @@
-uf{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": {
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uu b/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uu
deleted file mode 100644
index 1356b6d9..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test3.uu
+++ /dev/null
@@ -1,26 +0,0 @@
-uu{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": {
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test4 b/external_libs/cJSON/cJSON/fuzzing/inputs/test4
deleted file mode 100644
index 943943d2..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test4
+++ /dev/null
@@ -1,88 +0,0 @@
-bf{"web-app": {
-  "servlet": [
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
-
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
-
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test5 b/external_libs/cJSON/cJSON/fuzzing/inputs/test5
deleted file mode 100644
index f6cc84e1..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test5
+++ /dev/null
@@ -1,27 +0,0 @@
-bf{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test6 b/external_libs/cJSON/cJSON/fuzzing/inputs/test6
deleted file mode 100644
index af279752..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test6
+++ /dev/null
@@ -1,16 +0,0 @@
-bf<!DOCTYPE html>
-    <html>
-    <head>
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-      <style type="text/css">
-        html, body, iframe { margin: 0; padding: 0; height: 100%; }
-        iframe { display: block; width: 100%; border: none; }
-      </style>
-    <title>Application Error</title>
-    </head>
-    <body>
-      <iframe src="//s3.amazonaws.com/heroku_pages/error.html">
-        <p>Application Error</p>
-      </iframe>
-    </body>
-    </html>
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test7 b/external_libs/cJSON/cJSON/fuzzing/inputs/test7
deleted file mode 100644
index 4a3c0b7a..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test7
+++ /dev/null
@@ -1,22 +0,0 @@
-bf[
-	 {
-	 "precision": "zip",
-	 "Latitude":  37.7668,
-	 "Longitude": -122.3959,
-	 "Address":   "",
-	 "City":      "SAN FRANCISCO",
-	 "State":     "CA",
-	 "Zip":       "94107",
-	 "Country":   "US"
-	 },
-	 {
-	 "precision": "zip",
-	 "Latitude":  37.371991,
-	 "Longitude": -122.026020,
-	 "Address":   "",
-	 "City":      "SUNNYVALE",
-	 "State":     "CA",
-	 "Zip":       "94085",
-	 "Country":   "US"
-	 }
-	 ]
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test8 b/external_libs/cJSON/cJSON/fuzzing/inputs/test8
deleted file mode 100644
index 3ffe570c..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test8
+++ /dev/null
@@ -1,13 +0,0 @@
-bf{
-		"Image": {
-			"Width":  800,
-			"Height": 600,
-			"Title":  "View from 15th Floor",
-			"Thumbnail": {
-				"Url":    "http:/*www.example.com/image/481989943",
-				"Height": 125,
-				"Width":  "100"
-			},
-			"IDs": [116, 943, 234, 38793]
-		}
-	}
diff --git a/external_libs/cJSON/cJSON/fuzzing/inputs/test9 b/external_libs/cJSON/cJSON/fuzzing/inputs/test9
deleted file mode 100644
index 28c9033a..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/inputs/test9
+++ /dev/null
@@ -1,5 +0,0 @@
-bf[
-    [0, -1, 0],
-    [1, 0, 0],
-    [0, 0, 1]
-	]
diff --git a/external_libs/cJSON/cJSON/fuzzing/json.dict b/external_libs/cJSON/cJSON/fuzzing/json.dict
deleted file mode 100644
index 9bb03d7f..00000000
--- a/external_libs/cJSON/cJSON/fuzzing/json.dict
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# AFL dictionary for JSON
-# -----------------------------
-#
-
-object_start="{"
-object_end="}"
-object_empty="{}"
-object_one_element="{\"one\":1}"
-object_two_elements="{\"1\":1,\"2\":2}"
-object_separator=":"
-
-array_start="["
-array_end="]"
-array_empty="[]"
-array_one_element="[1]"
-array_two_elements="[1,2]"
-
-separator=","
-
-escape_sequence_b="\\b"
-escape_sequence_f="\\f"
-escape_sequence_n="\\n"
-escape_sequence_r="\\r"
-escape_sequence_t="\\t"
-escape_sequence_quote="\\\""
-escape_sequence_backslash="\\\\"
-escape_sequence_slash="\\/"
-escape_sequence_utf16_base="\\u"
-escape_sequence_utf16="\\u12ab"
-
-number_integer="1"
-number_double="1.0"
-number_negative_integer="-1"
-number_negative_double="-1.0"
-number_engineering1="1e1"
-number_engineering2="1e-1"
-number_positive_integer="+1"
-number_positive_double="+1.0"
-number_e="e"
-number_plus="+"
-number_minus="-"
-number_separator="."
-
-null="null"
-true="true"
-false="false"
diff --git a/external_libs/cJSON/cJSON/library_config/cJSONConfig.cmake.in b/external_libs/cJSON/cJSON/library_config/cJSONConfig.cmake.in
deleted file mode 100644
index 909f7a9a..00000000
--- a/external_libs/cJSON/cJSON/library_config/cJSONConfig.cmake.in
+++ /dev/null
@@ -1,29 +0,0 @@
-# Whether the utils lib was build.
-set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
-
-# The include directories used by cJSON
-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-
-get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-# The cJSON library
-set(CJSON_LIBRARY "@CJSON_LIB@")
-if(@ENABLE_TARGET_EXPORT@)
-  # Include the target
-  include("${_dir}/cjson.cmake")
-endif()
-
-if(CJSON_UTILS_FOUND)
-  # The cJSON utils library
-  set(CJSON_UTILS_LIBRARY @CJSON_UTILS_LIB@)
-  # All cJSON libraries
-  set(CJSON_LIBRARIES "@CJSON_UTILS_LIB@" "@CJSON_LIB@")
-  if(@ENABLE_TARGET_EXPORT@)
-    # Include the target
-    include("${_dir}/cjson_utils.cmake")
-  endif()
-else()
-  # All cJSON libraries
-  set(CJSON_LIBRARIES "@CJSON_LIB@")
-endif()
diff --git a/external_libs/cJSON/cJSON/library_config/cJSONConfigVersion.cmake.in b/external_libs/cJSON/cJSON/library_config/cJSONConfigVersion.cmake.in
deleted file mode 100644
index 22ffec0f..00000000
--- a/external_libs/cJSON/cJSON/library_config/cJSONConfigVersion.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PACKAGE_VERSION "@PROJECT_VERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
diff --git a/external_libs/cJSON/cJSON/library_config/libcjson.pc.in b/external_libs/cJSON/cJSON/library_config/libcjson.pc.in
deleted file mode 100644
index 7e616bbd..00000000
--- a/external_libs/cJSON/cJSON/library_config/libcjson.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: libcjson
-Version: @PROJECT_VERSION@
-Description: Ultralightweight JSON parser in ANSI C
-URL: https://github.com/DaveGamble/cJSON
-Libs: -L${libdir} -lcjson
-Libs.Private: -lm
-Cflags: -I${includedir}
diff --git a/external_libs/cJSON/cJSON/library_config/libcjson_utils.pc.in b/external_libs/cJSON/cJSON/library_config/libcjson_utils.pc.in
deleted file mode 100644
index 830259fa..00000000
--- a/external_libs/cJSON/cJSON/library_config/libcjson_utils.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: libcjson_utils
-Version: @PROJECT_VERSION@
-Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
-URL: https://github.com/DaveGamble/cJSON
-Libs: -L${libdir} -lcjson_utils
-Cflags: -I${includedir}
-Requires: libcjson
diff --git a/external_libs/cJSON/cJSON/test.c b/external_libs/cJSON/cJSON/test.c
deleted file mode 100644
index 66154e04..00000000
--- a/external_libs/cJSON/cJSON/test.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "cJSON.h"
-
-/* Used by some code below as an example datatype. */
-struct record
-{
-    const char *precision;
-    double lat;
-    double lon;
-    const char *address;
-    const char *city;
-    const char *state;
-    const char *zip;
-    const char *country;
-};
-
-
-/* Create a bunch of objects as demonstration. */
-static int print_preallocated(cJSON *root)
-{
-    /* declarations */
-    char *out = NULL;
-    char *buf = NULL;
-    char *buf_fail = NULL;
-    size_t len = 0;
-    size_t len_fail = 0;
-
-    /* formatted print */
-    out = cJSON_Print(root);
-
-    /* create buffer to succeed */
-    /* the extra 5 bytes are because of inaccuracies when reserving memory */
-    len = strlen(out) + 5;
-    buf = (char*)malloc(len);
-    if (buf == NULL)
-    {
-        printf("Failed to allocate memory.\n");
-        exit(1);
-    }
-
-    /* create buffer to fail */
-    len_fail = strlen(out);
-    buf_fail = (char*)malloc(len_fail);
-    if (buf_fail == NULL)
-    {
-        printf("Failed to allocate memory.\n");
-        exit(1);
-    }
-
-    /* Print to buffer */
-    if (!cJSON_PrintPreallocated(root, buf, (int)len, 1)) {
-        printf("cJSON_PrintPreallocated failed!\n");
-        if (strcmp(out, buf) != 0) {
-            printf("cJSON_PrintPreallocated not the same as cJSON_Print!\n");
-            printf("cJSON_Print result:\n%s\n", out);
-            printf("cJSON_PrintPreallocated result:\n%s\n", buf);
-        }
-        free(out);
-        free(buf_fail);
-        free(buf);
-        return -1;
-    }
-
-    /* success */
-    printf("%s\n", buf);
-
-    /* force it to fail */
-    if (cJSON_PrintPreallocated(root, buf_fail, (int)len_fail, 1)) {
-        printf("cJSON_PrintPreallocated failed to show error with insufficient memory!\n");
-        printf("cJSON_Print result:\n%s\n", out);
-        printf("cJSON_PrintPreallocated result:\n%s\n", buf_fail);
-        free(out);
-        free(buf_fail);
-        free(buf);
-        return -1;
-    }
-
-    free(out);
-    free(buf_fail);
-    free(buf);
-    return 0;
-}
-
-/* Create a bunch of objects as demonstration. */
-static void create_objects(void)
-{
-    /* declare a few. */
-    cJSON *root = NULL;
-    cJSON *fmt = NULL;
-    cJSON *img = NULL;
-    cJSON *thm = NULL;
-    cJSON *fld = NULL;
-    int i = 0;
-
-    /* Our "days of the week" array: */
-    const char *strings[7] =
-    {
-        "Sunday",
-        "Monday",
-        "Tuesday",
-        "Wednesday",
-        "Thursday",
-        "Friday",
-        "Saturday"
-    };
-    /* Our matrix: */
-    int numbers[3][3] =
-    {
-        {0, -1, 0},
-        {1, 0, 0},
-        {0 ,0, 1}
-    };
-    /* Our "gallery" item: */
-    int ids[4] = { 116, 943, 234, 38793 };
-    /* Our array of "records": */
-    struct record fields[2] =
-    {
-        {
-            "zip",
-            37.7668,
-            -1.223959e+2,
-            "",
-            "SAN FRANCISCO",
-            "CA",
-            "94107",
-            "US"
-        },
-        {
-            "zip",
-            37.371991,
-            -1.22026e+2,
-            "",
-            "SUNNYVALE",
-            "CA",
-            "94085",
-            "US"
-        }
-    };
-    volatile double zero = 0.0;
-
-    /* Here we construct some JSON standards, from the JSON site. */
-
-    /* Our "Video" datatype: */
-    root = cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
-    cJSON_AddItemToObject(root, "format", fmt = cJSON_CreateObject());
-    cJSON_AddStringToObject(fmt, "type", "rect");
-    cJSON_AddNumberToObject(fmt, "width", 1920);
-    cJSON_AddNumberToObject(fmt, "height", 1080);
-    cJSON_AddFalseToObject (fmt, "interlace");
-    cJSON_AddNumberToObject(fmt, "frame rate", 24);
-
-    /* Print to text */
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-
-    /* Our "days of the week" array: */
-    root = cJSON_CreateStringArray(strings, 7);
-
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-
-    /* Our matrix: */
-    root = cJSON_CreateArray();
-    for (i = 0; i < 3; i++)
-    {
-        cJSON_AddItemToArray(root, cJSON_CreateIntArray(numbers[i], 3));
-    }
-
-    /* cJSON_ReplaceItemInArray(root, 1, cJSON_CreateString("Replacement")); */
-
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-
-    /* Our "gallery" item: */
-    root = cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "Image", img = cJSON_CreateObject());
-    cJSON_AddNumberToObject(img, "Width", 800);
-    cJSON_AddNumberToObject(img, "Height", 600);
-    cJSON_AddStringToObject(img, "Title", "View from 15th Floor");
-    cJSON_AddItemToObject(img, "Thumbnail", thm = cJSON_CreateObject());
-    cJSON_AddStringToObject(thm, "Url", "http:/*www.example.com/image/481989943");
-    cJSON_AddNumberToObject(thm, "Height", 125);
-    cJSON_AddStringToObject(thm, "Width", "100");
-    cJSON_AddItemToObject(img, "IDs", cJSON_CreateIntArray(ids, 4));
-
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-
-    /* Our array of "records": */
-    root = cJSON_CreateArray();
-    for (i = 0; i < 2; i++)
-    {
-        cJSON_AddItemToArray(root, fld = cJSON_CreateObject());
-        cJSON_AddStringToObject(fld, "precision", fields[i].precision);
-        cJSON_AddNumberToObject(fld, "Latitude", fields[i].lat);
-        cJSON_AddNumberToObject(fld, "Longitude", fields[i].lon);
-        cJSON_AddStringToObject(fld, "Address", fields[i].address);
-        cJSON_AddStringToObject(fld, "City", fields[i].city);
-        cJSON_AddStringToObject(fld, "State", fields[i].state);
-        cJSON_AddStringToObject(fld, "Zip", fields[i].zip);
-        cJSON_AddStringToObject(fld, "Country", fields[i].country);
-    }
-
-    /* cJSON_ReplaceItemInObject(cJSON_GetArrayItem(root, 1), "City", cJSON_CreateIntArray(ids, 4)); */
-
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-
-    root = cJSON_CreateObject();
-    cJSON_AddNumberToObject(root, "number", 1.0 / zero);
-
-    if (print_preallocated(root) != 0) {
-        cJSON_Delete(root);
-        exit(EXIT_FAILURE);
-    }
-    cJSON_Delete(root);
-}
-
-int main(void)
-{
-    /* print the version */
-    printf("Version: %s\n", cJSON_Version());
-
-    /* Now some samplecode for building objects concisely: */
-    create_objects();
-
-    return 0;
-}
diff --git a/external_libs/cJSON/cJSON/tests/CMakeLists.txt b/external_libs/cJSON/cJSON/tests/CMakeLists.txt
deleted file mode 100644
index 79672927..00000000
--- a/external_libs/cJSON/cJSON/tests/CMakeLists.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-if(ENABLE_CJSON_TEST)
-    add_library(unity "${CJSON_LIBRARY_TYPE}" unity/src/unity.c)
-
-    # Disable -Werror for Unity
-    if (FLAG_SUPPORTED_Werror)
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
-        else()
-            target_compile_options(unity PRIVATE "-Wno-error")
-        endif()
-    endif()
-    # Disable -fvisibility=hidden for Unity
-    if (FLAG_SUPPORTED_fvisibilityhidden)
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default")
-        else()
-            target_compile_options(unity PRIVATE "-fvisibility=default")
-        endif()
-    endif()
-    # Disable -fsanitize=float-divide-by-zero for Unity (GCC bug on x86 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80097)
-    if (FLAG_SUPPORTED_fsanitizefloatdividebyzero AND (CMAKE_C_COMPILER_ID STREQUAL "GNU"))
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=float-divide-by-zero")
-        else()
-            target_compile_options(unity PRIVATE "-fno-sanitize=float-divide-by-zero")
-        endif()
-    endif()
-    # Disable -Wswitch-enum for Unity
-    if (FLAG_SUPPORTED_Wswitchenum)
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-switch-enum")
-        else()
-            target_compile_options(unity PRIVATE "-Wno-switch-enum")
-        endif()
-    endif()
-
-    #copy test files
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/inputs")
-    file(GLOB test_files "inputs/*")
-    file(COPY ${test_files} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/inputs/")
-
-    set(unity_tests
-        parse_examples
-        parse_number
-        parse_hex4
-        parse_string
-        parse_array
-        parse_object
-        parse_value
-        print_string
-        print_number
-        print_array
-        print_object
-        print_value
-        misc_tests
-        parse_with_opts
-        compare_tests
-        cjson_add
-        readme_examples
-    )
-
-    option(ENABLE_VALGRIND OFF "Enable the valgrind memory checker for the tests.")
-    if (ENABLE_VALGRIND)
-        find_program(MEMORYCHECK_COMMAND valgrind)
-        if ("${MEMORYCHECK_COMMAND}" MATCHES "MEMORYCHECK_COMMAND-NOTFOUND")
-            message(WARNING "Valgrind couldn't be found.")
-            unset(MEMORYCHECK_COMMAND)
-        else()
-            set(MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes --leak-check=full --error-exitcode=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../valgrind.supp)
-        endif()
-    endif()
-
-    foreach(unity_test ${unity_tests})
-        add_executable("${unity_test}" "${unity_test}.c")
-        target_link_libraries("${unity_test}" "${CJSON_LIB}" unity)
-        if(MEMORYCHECK_COMMAND)
-            add_test(NAME "${unity_test}"
-                COMMAND "${MEMORYCHECK_COMMAND}" ${MEMORYCHECK_COMMAND_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${unity_test}")
-        else()
-            add_test(NAME "${unity_test}"
-                COMMAND "./${unity_test}")
-        endif()
-    endforeach()
-
-    add_dependencies(check ${unity_tests})
-
-    if (ENABLE_CJSON_UTILS)
-        #copy test files
-        file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/json-patch-tests")
-        file(GLOB test_files "json-patch-tests/*")
-        file(COPY ${test_files} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/json-patch-tests/")
-
-        set (cjson_utils_tests
-            json_patch_tests
-            old_utils_tests
-            misc_utils_tests)
-
-        foreach (cjson_utils_test ${cjson_utils_tests})
-            add_executable("${cjson_utils_test}" "${cjson_utils_test}.c")
-            target_link_libraries("${cjson_utils_test}" "${CJSON_LIB}" "${CJSON_UTILS_LIB}" unity)
-            if(MEMORYCHECK_COMMAND)
-                add_test(NAME "${cjson_utils_test}"
-                    COMMAND "${MEMORYCHECK_COMMAND}" ${MEMORYCHECK_COMMAND_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${cjson_utils_test}")
-            else()
-                add_test(NAME "${cjson_utils_test}"
-                    COMMAND "./${cjson_utils_test}")
-            endif()
-        endforeach()
-
-        add_dependencies(check ${cjson_utils_tests})
-    endif()
-endif()
diff --git a/external_libs/cJSON/cJSON/tests/cjson_add.c b/external_libs/cJSON/cJSON/tests/cjson_add.c
deleted file mode 100644
index 01668a94..00000000
--- a/external_libs/cJSON/cJSON/tests/cjson_add.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void *failing_malloc(size_t size)
-{
-    (void)size;
-    return NULL;
-}
-
-static cJSON_Hooks failing_hooks = {
-    failing_malloc,
-    free
-};
-
-static void cjson_add_null_should_add_null(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *null = NULL;
-
-    cJSON_AddNullToObject(root, "null");
-
-    TEST_ASSERT_NOT_NULL(null = cJSON_GetObjectItemCaseSensitive(root, "null"));
-    TEST_ASSERT_EQUAL_INT(null->type, cJSON_NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_null_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddNullToObject(NULL, "null"));
-    TEST_ASSERT_NULL(cJSON_AddNullToObject(root, NULL));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_null_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddNullToObject(root, "null"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_true_should_add_true(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *true_item = NULL;
-
-    cJSON_AddTrueToObject(root, "true");
-
-    TEST_ASSERT_NOT_NULL(true_item = cJSON_GetObjectItemCaseSensitive(root, "true"));
-    TEST_ASSERT_EQUAL_INT(true_item->type, cJSON_True);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_true_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddTrueToObject(NULL, "true"));
-    TEST_ASSERT_NULL(cJSON_AddTrueToObject(root, NULL));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_true_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddTrueToObject(root, "true"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_false_should_add_false(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *false_item = NULL;
-
-    cJSON_AddFalseToObject(root, "false");
-
-    TEST_ASSERT_NOT_NULL(false_item = cJSON_GetObjectItemCaseSensitive(root, "false"));
-    TEST_ASSERT_EQUAL_INT(false_item->type, cJSON_False);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_false_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddFalseToObject(NULL, "false"));
-    TEST_ASSERT_NULL(cJSON_AddFalseToObject(root, NULL));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_false_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddFalseToObject(root, "false"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_bool_should_add_bool(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *true_item = NULL;
-    cJSON *false_item = NULL;
-
-    /* true */
-    cJSON_AddBoolToObject(root, "true", true);
-    TEST_ASSERT_NOT_NULL(true_item = cJSON_GetObjectItemCaseSensitive(root, "true"));
-    TEST_ASSERT_EQUAL_INT(true_item->type, cJSON_True);
-
-    /* false */
-    cJSON_AddBoolToObject(root, "false", false);
-    TEST_ASSERT_NOT_NULL(false_item = cJSON_GetObjectItemCaseSensitive(root, "false"));
-    TEST_ASSERT_EQUAL_INT(false_item->type, cJSON_False);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_bool_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddBoolToObject(NULL, "false", false));
-    TEST_ASSERT_NULL(cJSON_AddBoolToObject(root, NULL, false));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_bool_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddBoolToObject(root, "false", false));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_number_should_add_number(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *number = NULL;
-
-    cJSON_AddNumberToObject(root, "number", 42);
-
-    TEST_ASSERT_NOT_NULL(number = cJSON_GetObjectItemCaseSensitive(root, "number"));
-
-    TEST_ASSERT_EQUAL_INT(number->type, cJSON_Number);
-    TEST_ASSERT_EQUAL_DOUBLE(number->valuedouble, 42);
-    TEST_ASSERT_EQUAL_INT(number->valueint, 42);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_number_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddNumberToObject(NULL, "number", 42));
-    TEST_ASSERT_NULL(cJSON_AddNumberToObject(root, NULL, 42));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_number_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddNumberToObject(root, "number", 42));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_string_should_add_string(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *string = NULL;
-
-    cJSON_AddStringToObject(root, "string", "Hello World!");
-
-    TEST_ASSERT_NOT_NULL(string = cJSON_GetObjectItemCaseSensitive(root, "string"));
-    TEST_ASSERT_EQUAL_INT(string->type, cJSON_String);
-    TEST_ASSERT_EQUAL_STRING(string->valuestring, "Hello World!");
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_string_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddStringToObject(NULL, "string", "string"));
-    TEST_ASSERT_NULL(cJSON_AddStringToObject(root, NULL, "string"));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_string_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddStringToObject(root, "string", "string"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_raw_should_add_raw(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *raw = NULL;
-
-    cJSON_AddRawToObject(root, "raw", "{}");
-
-    TEST_ASSERT_NOT_NULL(raw = cJSON_GetObjectItemCaseSensitive(root, "raw"));
-    TEST_ASSERT_EQUAL_INT(raw->type, cJSON_Raw);
-    TEST_ASSERT_EQUAL_STRING(raw->valuestring, "{}");
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_raw_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddRawToObject(NULL, "raw", "{}"));
-    TEST_ASSERT_NULL(cJSON_AddRawToObject(root, NULL, "{}"));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_raw_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddRawToObject(root, "raw", "{}"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cJSON_add_object_should_add_object(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *object = NULL;
-
-    cJSON_AddObjectToObject(root, "object");
-    TEST_ASSERT_NOT_NULL(object = cJSON_GetObjectItemCaseSensitive(root, "object"));
-    TEST_ASSERT_EQUAL_INT(object->type, cJSON_Object);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_object_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddObjectToObject(NULL, "object"));
-    TEST_ASSERT_NULL(cJSON_AddObjectToObject(root, NULL));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_object_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddObjectToObject(root, "object"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-static void cJSON_add_array_should_add_array(void)
-{
-    cJSON *root = cJSON_CreateObject();
-    cJSON *array = NULL;
-
-    cJSON_AddArrayToObject(root, "array");
-    TEST_ASSERT_NOT_NULL(array = cJSON_GetObjectItemCaseSensitive(root, "array"));
-    TEST_ASSERT_EQUAL_INT(array->type, cJSON_Array);
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_array_should_fail_with_null_pointers(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    TEST_ASSERT_NULL(cJSON_AddArrayToObject(NULL, "array"));
-    TEST_ASSERT_NULL(cJSON_AddArrayToObject(root, NULL));
-
-    cJSON_Delete(root);
-}
-
-static void cjson_add_array_should_fail_on_allocation_failure(void)
-{
-    cJSON *root = cJSON_CreateObject();
-
-    cJSON_InitHooks(&failing_hooks);
-
-    TEST_ASSERT_NULL(cJSON_AddArrayToObject(root, "array"));
-
-    cJSON_InitHooks(NULL);
-
-    cJSON_Delete(root);
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_add_null_should_add_null);
-    RUN_TEST(cjson_add_null_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_null_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_true_should_add_true);
-    RUN_TEST(cjson_add_true_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_true_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_false_should_add_false);
-    RUN_TEST(cjson_add_false_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_false_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_bool_should_add_bool);
-    RUN_TEST(cjson_add_bool_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_bool_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_number_should_add_number);
-    RUN_TEST(cjson_add_number_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_number_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_string_should_add_string);
-    RUN_TEST(cjson_add_string_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_string_should_fail_on_allocation_failure);
-
-    RUN_TEST(cjson_add_raw_should_add_raw);
-    RUN_TEST(cjson_add_raw_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_raw_should_fail_on_allocation_failure);
-
-    RUN_TEST(cJSON_add_object_should_add_object);
-    RUN_TEST(cjson_add_object_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_object_should_fail_on_allocation_failure);
-
-    RUN_TEST(cJSON_add_array_should_add_array);
-    RUN_TEST(cjson_add_array_should_fail_with_null_pointers);
-    RUN_TEST(cjson_add_array_should_fail_on_allocation_failure);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/common.h b/external_libs/cJSON/cJSON/tests/common.h
deleted file mode 100644
index 4db6bf8c..00000000
--- a/external_libs/cJSON/cJSON/tests/common.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#ifndef CJSON_TESTS_COMMON_H
-#define CJSON_TESTS_COMMON_H
-
-#include "../cJSON.c"
-
-void reset(cJSON *item);
-void reset(cJSON *item) {
-    if ((item != NULL) && (item->child != NULL))
-    {
-        cJSON_Delete(item->child);
-    }
-    if ((item->valuestring != NULL) && !(item->type & cJSON_IsReference))
-    {
-        global_hooks.deallocate(item->valuestring);
-    }
-    if ((item->string != NULL) && !(item->type & cJSON_StringIsConst))
-    {
-        global_hooks.deallocate(item->string);
-    }
-
-    memset(item, 0, sizeof(cJSON));
-}
-
-char* read_file(const char *filename);
-char* read_file(const char *filename) {
-    FILE *file = NULL;
-    long length = 0;
-    char *content = NULL;
-    size_t read_chars = 0;
-
-    /* open in read binary mode */
-    file = fopen(filename, "rb");
-    if (file == NULL)
-    {
-        goto cleanup;
-    }
-
-    /* get the length */
-    if (fseek(file, 0, SEEK_END) != 0)
-    {
-        goto cleanup;
-    }
-    length = ftell(file);
-    if (length < 0)
-    {
-        goto cleanup;
-    }
-    if (fseek(file, 0, SEEK_SET) != 0)
-    {
-        goto cleanup;
-    }
-
-    /* allocate content buffer */
-    content = (char*)malloc((size_t)length + sizeof(""));
-    if (content == NULL)
-    {
-        goto cleanup;
-    }
-
-    /* read the file into memory */
-    read_chars = fread(content, sizeof(char), (size_t)length, file);
-    if ((long)read_chars != length)
-    {
-        free(content);
-        content = NULL;
-        goto cleanup;
-    }
-    content[read_chars] = '\0';
-
-
-cleanup:
-    if (file != NULL)
-    {
-        fclose(file);
-    }
-
-    return content;
-}
-
-/* assertion helper macros */
-#define assert_has_type(item, item_type) TEST_ASSERT_BITS_MESSAGE(0xFF, item_type, item->type, "Item doesn't have expected type.")
-#define assert_has_no_reference(item) TEST_ASSERT_BITS_MESSAGE(cJSON_IsReference, 0, item->type, "Item should not have a string as reference.")
-#define assert_has_no_const_string(item) TEST_ASSERT_BITS_MESSAGE(cJSON_StringIsConst, 0, item->type, "Item should not have a const string.")
-#define assert_has_valuestring(item) TEST_ASSERT_NOT_NULL_MESSAGE(item->valuestring, "Valuestring is NULL.")
-#define assert_has_no_valuestring(item) TEST_ASSERT_NULL_MESSAGE(item->valuestring, "Valuestring is not NULL.")
-#define assert_has_string(item) TEST_ASSERT_NOT_NULL_MESSAGE(item->string, "String is NULL")
-#define assert_has_no_string(item) TEST_ASSERT_NULL_MESSAGE(item->string, "String is not NULL.")
-#define assert_not_in_list(item) \
-	TEST_ASSERT_NULL_MESSAGE(item->next, "Linked list next pointer is not NULL.");\
-	TEST_ASSERT_NULL_MESSAGE(item->prev, "Linked list previous pointer is not NULL.")
-#define assert_has_child(item) TEST_ASSERT_NOT_NULL_MESSAGE(item->child, "Item doesn't have a child.")
-#define assert_has_no_child(item) TEST_ASSERT_NULL_MESSAGE(item->child, "Item has a child.")
-#define assert_is_invalid(item) \
-	assert_has_type(item, cJSON_Invalid);\
-	assert_not_in_list(item);\
-	assert_has_no_child(item);\
-	assert_has_no_string(item);\
-	assert_has_no_valuestring(item)
-
-#endif
diff --git a/external_libs/cJSON/cJSON/tests/compare_tests.c b/external_libs/cJSON/cJSON/tests/compare_tests.c
deleted file mode 100644
index 63b6d4a0..00000000
--- a/external_libs/cJSON/cJSON/tests/compare_tests.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON_bool compare_from_string(const char * const a, const char * const b, const cJSON_bool case_sensitive)
-{
-    cJSON *a_json = NULL;
-    cJSON *b_json = NULL;
-    cJSON_bool result = false;
-
-    a_json = cJSON_Parse(a);
-    TEST_ASSERT_NOT_NULL_MESSAGE(a_json, "Failed to parse a.");
-    b_json = cJSON_Parse(b);
-    TEST_ASSERT_NOT_NULL_MESSAGE(b_json, "Failed to parse b.");
-
-    result = cJSON_Compare(a_json, b_json, case_sensitive);
-
-    cJSON_Delete(a_json);
-    cJSON_Delete(b_json);
-
-    return result;
-}
-
-static void cjson_compare_should_compare_null_pointer_as_not_equal(void)
-{
-    TEST_ASSERT_FALSE(cJSON_Compare(NULL, NULL, true));
-    TEST_ASSERT_FALSE(cJSON_Compare(NULL, NULL, false));
-}
-
-static void cjson_compare_should_compare_invalid_as_not_equal(void)
-{
-    cJSON invalid[1];
-    memset(invalid, '\0', sizeof(invalid));
-
-    TEST_ASSERT_FALSE(cJSON_Compare(invalid, invalid, false));
-    TEST_ASSERT_FALSE(cJSON_Compare(invalid, invalid, true));
-}
-
-static void cjson_compare_should_compare_numbers(void)
-{
-    TEST_ASSERT_TRUE(compare_from_string("1", "1", true));
-    TEST_ASSERT_TRUE(compare_from_string("1", "1", false));
-    TEST_ASSERT_TRUE(compare_from_string("0.0001", "0.0001", true));
-    TEST_ASSERT_TRUE(compare_from_string("0.0001", "0.0001", false));
-
-    TEST_ASSERT_FALSE(compare_from_string("1", "2", true));
-    TEST_ASSERT_FALSE(compare_from_string("1", "2", false));
-}
-
-static void cjson_compare_should_compare_booleans(void)
-{
-    /* true */
-    TEST_ASSERT_TRUE(compare_from_string("true", "true", true));
-    TEST_ASSERT_TRUE(compare_from_string("true", "true", false));
-
-    /* false */
-    TEST_ASSERT_TRUE(compare_from_string("false", "false", true));
-    TEST_ASSERT_TRUE(compare_from_string("false", "false", false));
-
-    /* mixed */
-    TEST_ASSERT_FALSE(compare_from_string("true", "false", true));
-    TEST_ASSERT_FALSE(compare_from_string("true", "false", false));
-    TEST_ASSERT_FALSE(compare_from_string("false", "true", true));
-    TEST_ASSERT_FALSE(compare_from_string("false", "true", false));
-}
-
-static void cjson_compare_should_compare_null(void)
-{
-    TEST_ASSERT_TRUE(compare_from_string("null", "null", true));
-    TEST_ASSERT_TRUE(compare_from_string("null", "null", false));
-
-    TEST_ASSERT_FALSE(compare_from_string("null", "true", true));
-    TEST_ASSERT_FALSE(compare_from_string("null", "true", false));
-}
-
-static void cjson_compare_should_not_accept_invalid_types(void)
-{
-    cJSON invalid[1];
-    memset(invalid, '\0', sizeof(invalid));
-
-    invalid->type = cJSON_Number | cJSON_String;
-
-    TEST_ASSERT_FALSE(cJSON_Compare(invalid, invalid, true));
-    TEST_ASSERT_FALSE(cJSON_Compare(invalid, invalid, false));
-}
-
-static void cjson_compare_should_compare_strings(void)
-{
-    TEST_ASSERT_TRUE(compare_from_string("\"abcdefg\"", "\"abcdefg\"", true));
-    TEST_ASSERT_TRUE(compare_from_string("\"abcdefg\"", "\"abcdefg\"", false));
-
-    TEST_ASSERT_FALSE(compare_from_string("\"ABCDEFG\"", "\"abcdefg\"", true));
-    TEST_ASSERT_FALSE(compare_from_string("\"ABCDEFG\"", "\"abcdefg\"", false));
-}
-
-static void cjson_compare_should_compare_raw(void)
-{
-    cJSON *raw1 = NULL;
-    cJSON *raw2 = NULL;
-
-    raw1 = cJSON_Parse("\"[true, false]\"");
-    TEST_ASSERT_NOT_NULL(raw1);
-    raw2 = cJSON_Parse("\"[true, false]\"");
-    TEST_ASSERT_NOT_NULL(raw2);
-
-    raw1->type = cJSON_Raw;
-    raw2->type = cJSON_Raw;
-
-    TEST_ASSERT_TRUE(cJSON_Compare(raw1, raw2, true));
-    TEST_ASSERT_TRUE(cJSON_Compare(raw1, raw2, false));
-
-    cJSON_Delete(raw1);
-    cJSON_Delete(raw2);
-}
-
-static void cjson_compare_should_compare_arrays(void)
-{
-    TEST_ASSERT_TRUE(compare_from_string("[]", "[]", true));
-    TEST_ASSERT_TRUE(compare_from_string("[]", "[]", false));
-
-    TEST_ASSERT_TRUE(compare_from_string("[false,true,null,42,\"string\",[],{}]", "[false, true, null, 42, \"string\", [], {}]", true));
-    TEST_ASSERT_TRUE(compare_from_string("[false,true,null,42,\"string\",[],{}]", "[false, true, null, 42, \"string\", [], {}]", false));
-
-    TEST_ASSERT_TRUE(compare_from_string("[[[1], 2]]", "[[[1], 2]]", true));
-    TEST_ASSERT_TRUE(compare_from_string("[[[1], 2]]", "[[[1], 2]]", false));
-
-    TEST_ASSERT_FALSE(compare_from_string("[true,null,42,\"string\",[],{}]", "[false, true, null, 42, \"string\", [], {}]", true));
-    TEST_ASSERT_FALSE(compare_from_string("[true,null,42,\"string\",[],{}]", "[false, true, null, 42, \"string\", [], {}]", false));
-
-    /* Arrays that are a prefix of another array */
-    TEST_ASSERT_FALSE(compare_from_string("[1,2,3]", "[1,2]", true));
-    TEST_ASSERT_FALSE(compare_from_string("[1,2,3]", "[1,2]", false));
-}
-
-static void cjson_compare_should_compare_objects(void)
-{
-    TEST_ASSERT_TRUE(compare_from_string("{}", "{}", true));
-    TEST_ASSERT_TRUE(compare_from_string("{}", "{}", false));
-
-    TEST_ASSERT_TRUE(compare_from_string(
-                "{\"false\": false, \"true\": true, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                "{\"true\": true, \"false\": false, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                true));
-    TEST_ASSERT_FALSE(compare_from_string(
-                "{\"False\": false, \"true\": true, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                "{\"true\": true, \"false\": false, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                true));
-    TEST_ASSERT_TRUE(compare_from_string(
-                "{\"False\": false, \"true\": true, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                "{\"true\": true, \"false\": false, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                false));
-    TEST_ASSERT_FALSE(compare_from_string(
-                "{\"Flse\": false, \"true\": true, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                "{\"true\": true, \"false\": false, \"null\": null, \"number\": 42, \"string\": \"string\", \"array\": [], \"object\": {}}",
-                false));
-    /* test objects that are a subset of each other */
-    TEST_ASSERT_FALSE(compare_from_string(
-                "{\"one\": 1, \"two\": 2}",
-                "{\"one\": 1, \"two\": 2, \"three\": 3}",
-                true))
-    TEST_ASSERT_FALSE(compare_from_string(
-                "{\"one\": 1, \"two\": 2}",
-                "{\"one\": 1, \"two\": 2, \"three\": 3}",
-                false))
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_compare_should_compare_null_pointer_as_not_equal);
-    RUN_TEST(cjson_compare_should_compare_invalid_as_not_equal);
-    RUN_TEST(cjson_compare_should_compare_numbers);
-    RUN_TEST(cjson_compare_should_compare_booleans);
-    RUN_TEST(cjson_compare_should_compare_null);
-    RUN_TEST(cjson_compare_should_not_accept_invalid_types);
-    RUN_TEST(cjson_compare_should_compare_strings);
-    RUN_TEST(cjson_compare_should_compare_raw);
-    RUN_TEST(cjson_compare_should_compare_arrays);
-    RUN_TEST(cjson_compare_should_compare_objects);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test1 b/external_libs/cJSON/cJSON/tests/inputs/test1
deleted file mode 100644
index eacfbf5e..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test1
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test1.expected b/external_libs/cJSON/cJSON/tests/inputs/test1.expected
deleted file mode 100644
index a5839e84..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test1.expected
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"glossary":	{
-		"title":	"example glossary",
-		"GlossDiv":	{
-			"title":	"S",
-			"GlossList":	{
-				"GlossEntry":	{
-					"ID":	"SGML",
-					"SortAs":	"SGML",
-					"GlossTerm":	"Standard Generalized Markup Language",
-					"Acronym":	"SGML",
-					"Abbrev":	"ISO 8879:1986",
-					"GlossDef":	{
-						"para":	"A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso":	["GML", "XML"]
-					},
-					"GlossSee":	"markup"
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test10 b/external_libs/cJSON/cJSON/tests/inputs/test10
deleted file mode 100644
index d19eb8b5..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test10
+++ /dev/null
@@ -1 +0,0 @@
-["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test10.expected b/external_libs/cJSON/cJSON/tests/inputs/test10.expected
deleted file mode 100644
index 747ba62c..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test10.expected
+++ /dev/null
@@ -1 +0,0 @@
-["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test11 b/external_libs/cJSON/cJSON/tests/inputs/test11
deleted file mode 100644
index 039c61b9..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test11
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"name": "Jack (\"Bee\") Nimble",
-"format": {"type":       "rect",
-"width":      1920,
-"height":     1080,
-"interlace":  false,"frame rate": 24
-}
-}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test11.expected b/external_libs/cJSON/cJSON/tests/inputs/test11.expected
deleted file mode 100644
index 24e72ece..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test11.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"name":	"Jack (\"Bee\") Nimble",
-	"format":	{
-		"type":	"rect",
-		"width":	1920,
-		"height":	1080,
-		"interlace":	false,
-		"frame rate":	24
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test2 b/external_libs/cJSON/cJSON/tests/inputs/test2
deleted file mode 100644
index 5600991a..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test2
+++ /dev/null
@@ -1,11 +0,0 @@
-{"menu": {
-  "id": "file",
-  "value": "File",
-  "popup": {
-    "menuitem": [
-      {"value": "New", "onclick": "CreateNewDoc()"},
-      {"value": "Open", "onclick": "OpenDoc()"},
-      {"value": "Close", "onclick": "CloseDoc()"}
-    ]
-  }
-}}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test2.expected b/external_libs/cJSON/cJSON/tests/inputs/test2.expected
deleted file mode 100644
index d42a0170..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test2.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"menu":	{
-		"id":	"file",
-		"value":	"File",
-		"popup":	{
-			"menuitem":	[{
-					"value":	"New",
-					"onclick":	"CreateNewDoc()"
-				}, {
-					"value":	"Open",
-					"onclick":	"OpenDoc()"
-				}, {
-					"value":	"Close",
-					"onclick":	"CloseDoc()"
-				}]
-		}
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test3 b/external_libs/cJSON/cJSON/tests/inputs/test3
deleted file mode 100644
index 7f74acaa..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test3
+++ /dev/null
@@ -1,26 +0,0 @@
-{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": {
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}   
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test3.expected b/external_libs/cJSON/cJSON/tests/inputs/test3.expected
deleted file mode 100644
index a9b9c55a..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test3.expected
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"widget":	{
-		"debug":	"on",
-		"window":	{
-			"title":	"Sample Konfabulator Widget",
-			"name":	"main_window",
-			"width":	500,
-			"height":	500
-		},
-		"image":	{
-			"src":	"Images/Sun.png",
-			"name":	"sun1",
-			"hOffset":	250,
-			"vOffset":	250,
-			"alignment":	"center"
-		},
-		"text":	{
-			"data":	"Click Here",
-			"size":	36,
-			"style":	"bold",
-			"name":	"text1",
-			"hOffset":	250,
-			"vOffset":	100,
-			"alignment":	"center",
-			"onMouseUp":	"sun1.opacity = (sun1.opacity / 100) * 90;"
-		}
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test4 b/external_libs/cJSON/cJSON/tests/inputs/test4
deleted file mode 100644
index 55cd56b1..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test4
+++ /dev/null
@@ -1,88 +0,0 @@
-{"web-app": {
-  "servlet": [  
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
-
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
-
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test4.expected b/external_libs/cJSON/cJSON/tests/inputs/test4.expected
deleted file mode 100644
index 3648a95b..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test4.expected
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-	"web-app":	{
-		"servlet":	[{
-				"servlet-name":	"cofaxCDS",
-				"servlet-class":	"org.cofax.cds.CDSServlet",
-				"init-param":	{
-					"configGlossary:installationAt":	"Philadelphia, PA",
-					"configGlossary:adminEmail":	"ksm@pobox.com",
-					"configGlossary:poweredBy":	"Cofax",
-					"configGlossary:poweredByIcon":	"/images/cofax.gif",
-					"configGlossary:staticPath":	"/content/static",
-					"templateProcessorClass":	"org.cofax.WysiwygTemplate",
-					"templateLoaderClass":	"org.cofax.FilesTemplateLoader",
-					"templatePath":	"templates",
-					"templateOverridePath":	"",
-					"defaultListTemplate":	"listTemplate.htm",
-					"defaultFileTemplate":	"articleTemplate.htm",
-					"useJSP":	false,
-					"jspListTemplate":	"listTemplate.jsp",
-					"jspFileTemplate":	"articleTemplate.jsp",
-					"cachePackageTagsTrack":	200,
-					"cachePackageTagsStore":	200,
-					"cachePackageTagsRefresh":	60,
-					"cacheTemplatesTrack":	100,
-					"cacheTemplatesStore":	50,
-					"cacheTemplatesRefresh":	15,
-					"cachePagesTrack":	200,
-					"cachePagesStore":	100,
-					"cachePagesRefresh":	10,
-					"cachePagesDirtyRead":	10,
-					"searchEngineListTemplate":	"forSearchEnginesList.htm",
-					"searchEngineFileTemplate":	"forSearchEngines.htm",
-					"searchEngineRobotsDb":	"WEB-INF/robots.db",
-					"useDataStore":	true,
-					"dataStoreClass":	"org.cofax.SqlDataStore",
-					"redirectionClass":	"org.cofax.SqlRedirection",
-					"dataStoreName":	"cofax",
-					"dataStoreDriver":	"com.microsoft.jdbc.sqlserver.SQLServerDriver",
-					"dataStoreUrl":	"jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-					"dataStoreUser":	"sa",
-					"dataStorePassword":	"dataStoreTestQuery",
-					"dataStoreTestQuery":	"SET NOCOUNT ON;select test='test';",
-					"dataStoreLogFile":	"/usr/local/tomcat/logs/datastore.log",
-					"dataStoreInitConns":	10,
-					"dataStoreMaxConns":	100,
-					"dataStoreConnUsageLimit":	100,
-					"dataStoreLogLevel":	"debug",
-					"maxUrlLength":	500
-				}
-			}, {
-				"servlet-name":	"cofaxEmail",
-				"servlet-class":	"org.cofax.cds.EmailServlet",
-				"init-param":	{
-					"mailHost":	"mail1",
-					"mailHostOverride":	"mail2"
-				}
-			}, {
-				"servlet-name":	"cofaxAdmin",
-				"servlet-class":	"org.cofax.cds.AdminServlet"
-			}, {
-				"servlet-name":	"fileServlet",
-				"servlet-class":	"org.cofax.cds.FileServlet"
-			}, {
-				"servlet-name":	"cofaxTools",
-				"servlet-class":	"org.cofax.cms.CofaxToolsServlet",
-				"init-param":	{
-					"templatePath":	"toolstemplates/",
-					"log":	1,
-					"logLocation":	"/usr/local/tomcat/logs/CofaxTools.log",
-					"logMaxSize":	"",
-					"dataLog":	1,
-					"dataLogLocation":	"/usr/local/tomcat/logs/dataLog.log",
-					"dataLogMaxSize":	"",
-					"removePageCache":	"/content/admin/remove?cache=pages&id=",
-					"removeTemplateCache":	"/content/admin/remove?cache=templates&id=",
-					"fileTransferFolder":	"/usr/local/tomcat/webapps/content/fileTransferFolder",
-					"lookInContext":	1,
-					"adminGroupID":	4,
-					"betaServer":	true
-				}
-			}],
-		"servlet-mapping":	{
-			"cofaxCDS":	"/",
-			"cofaxEmail":	"/cofaxutil/aemail/*",
-			"cofaxAdmin":	"/admin/*",
-			"fileServlet":	"/static/*",
-			"cofaxTools":	"/tools/*"
-		},
-		"taglib":	{
-			"taglib-uri":	"cofax.tld",
-			"taglib-location":	"/WEB-INF/tlds/cofax.tld"
-		}
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test5 b/external_libs/cJSON/cJSON/tests/inputs/test5
deleted file mode 100644
index 49980ca2..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test5
+++ /dev/null
@@ -1,27 +0,0 @@
-{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test5.expected b/external_libs/cJSON/cJSON/tests/inputs/test5.expected
deleted file mode 100644
index 886ed58f..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test5.expected
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-	"menu":	{
-		"header":	"SVG Viewer",
-		"items":	[{
-				"id":	"Open"
-			}, {
-				"id":	"OpenNew",
-				"label":	"Open New"
-			}, null, {
-				"id":	"ZoomIn",
-				"label":	"Zoom In"
-			}, {
-				"id":	"ZoomOut",
-				"label":	"Zoom Out"
-			}, {
-				"id":	"OriginalView",
-				"label":	"Original View"
-			}, null, {
-				"id":	"Quality"
-			}, {
-				"id":	"Pause"
-			}, {
-				"id":	"Mute"
-			}, null, {
-				"id":	"Find",
-				"label":	"Find..."
-			}, {
-				"id":	"FindAgain",
-				"label":	"Find Again"
-			}, {
-				"id":	"Copy"
-			}, {
-				"id":	"CopyAgain",
-				"label":	"Copy Again"
-			}, {
-				"id":	"CopySVG",
-				"label":	"Copy SVG"
-			}, {
-				"id":	"ViewSVG",
-				"label":	"View SVG"
-			}, {
-				"id":	"ViewSource",
-				"label":	"View Source"
-			}, {
-				"id":	"SaveAs",
-				"label":	"Save As"
-			}, null, {
-				"id":	"Help"
-			}, {
-				"id":	"About",
-				"label":	"About Adobe CVG Viewer..."
-			}]
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test6 b/external_libs/cJSON/cJSON/tests/inputs/test6
deleted file mode 100644
index d5cb28f6..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test6
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-    <html>
-    <head>
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-      <style type="text/css">
-        html, body, iframe { margin: 0; padding: 0; height: 100%; }
-        iframe { display: block; width: 100%; border: none; }
-      </style>
-    <title>Application Error</title>
-    </head>
-    <body>
-      <iframe src="//s3.amazonaws.com/heroku_pages/error.html">
-        <p>Application Error</p>
-      </iframe>
-    </body>
-    </html>
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test7 b/external_libs/cJSON/cJSON/tests/inputs/test7
deleted file mode 100644
index 33085366..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test7
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-	 {
-	 "precision": "zip",
-	 "Latitude":  37.7668,
-	 "Longitude": -122.3959,
-	 "Address":   "",
-	 "City":      "SAN FRANCISCO",
-	 "State":     "CA",
-	 "Zip":       "94107",
-	 "Country":   "US"
-	 },
-	 {
-	 "precision": "zip",
-	 "Latitude":  37.371991,
-	 "Longitude": -122.026020,
-	 "Address":   "",
-	 "City":      "SUNNYVALE",
-	 "State":     "CA",
-	 "Zip":       "94085",
-	 "Country":   "US"
-	 }
-	 ]
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test7.expected b/external_libs/cJSON/cJSON/tests/inputs/test7.expected
deleted file mode 100644
index 15adf793..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test7.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-[{
-		"precision":	"zip",
-		"Latitude":	37.7668,
-		"Longitude":	-122.3959,
-		"Address":	"",
-		"City":	"SAN FRANCISCO",
-		"State":	"CA",
-		"Zip":	"94107",
-		"Country":	"US"
-	}, {
-		"precision":	"zip",
-		"Latitude":	37.371991,
-		"Longitude":	-122.02602,
-		"Address":	"",
-		"City":	"SUNNYVALE",
-		"State":	"CA",
-		"Zip":	"94085",
-		"Country":	"US"
-	}]
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test8 b/external_libs/cJSON/cJSON/tests/inputs/test8
deleted file mode 100644
index 4b1f5b97..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test8
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-		"Image": {
-			"Width":  800,
-			"Height": 600,
-			"Title":  "View from 15th Floor",
-			"Thumbnail": {
-				"Url":    "http:/*www.example.com/image/481989943",
-				"Height": 125,
-				"Width":  "100"
-			},
-			"IDs": [116, 943, 234, 38793]
-		}
-	}
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test8.expected b/external_libs/cJSON/cJSON/tests/inputs/test8.expected
deleted file mode 100644
index 2e6b731f..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test8.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"Image":	{
-		"Width":	800,
-		"Height":	600,
-		"Title":	"View from 15th Floor",
-		"Thumbnail":	{
-			"Url":	"http:/*www.example.com/image/481989943",
-			"Height":	125,
-			"Width":	"100"
-		},
-		"IDs":	[116, 943, 234, 38793]
-	}
-}
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test9 b/external_libs/cJSON/cJSON/tests/inputs/test9
deleted file mode 100644
index 2a939b96..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test9
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    [0, -1, 0],
-    [1, 0, 0],
-    [0, 0, 1]
-	]
diff --git a/external_libs/cJSON/cJSON/tests/inputs/test9.expected b/external_libs/cJSON/cJSON/tests/inputs/test9.expected
deleted file mode 100644
index 0eea3c94..00000000
--- a/external_libs/cJSON/cJSON/tests/inputs/test9.expected
+++ /dev/null
@@ -1 +0,0 @@
-[[0, -1, 0], [1, 0, 0], [0, 0, 1]]
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/.editorconfig b/external_libs/cJSON/cJSON/tests/json-patch-tests/.editorconfig
deleted file mode 100644
index dc79da48..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-trim_trailing_whitespace = true
-indent_style = space
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/.gitignore b/external_libs/cJSON/cJSON/tests/json-patch-tests/.gitignore
deleted file mode 100644
index cd2b23de..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*~
-\#*
-!.editorconfig
-!.gitignore
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/.npmignore b/external_libs/cJSON/cJSON/tests/json-patch-tests/.npmignore
deleted file mode 100644
index 2d6cdcb2..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.editorconfig
-.gitignore
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/README.md b/external_libs/cJSON/cJSON/tests/json-patch-tests/README.md
deleted file mode 100644
index fb9e4478..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-JSON Patch Tests
-================
-
-These are test cases for implementations of [IETF JSON Patch (RFC6902)](http://tools.ietf.org/html/rfc6902).
-
-Some implementations can be found at [jsonpatch.com](http://jsonpatch.com).
-
-
-Test Format
------------
-
-Each test file is a JSON document that contains an array of test records. A
-test record is an object with the following members:
-
-- doc: The JSON document to test against
-- patch: The patch(es) to apply
-- expected: The expected resulting document, OR
-- error: A string describing an expected error
-- comment: A string describing the test
-- disabled: True if the test should be skipped
-
-All fields except 'doc' and 'patch' are optional. Test records consisting only
-of a comment are also OK.
-
-
-Files
------
-
-- tests.json: the main test file
-- spec_tests.json: tests from the RFC6902 spec
-
-
-Writing Tests
--------------
-
-All tests should have a descriptive comment.  Tests should be as
-simple as possible - just what's required to test a specific piece of
-behavior.  If you want to test interacting behaviors, create tests for
-each behavior as well as the interaction.
-
-If an 'error' member is specified, the error text should describe the
-error the implementation should raise - *not* what's being tested.
-Implementation error strings will vary, but the suggested error should
-be easily matched to the implementation error string.  Try to avoid
-creating error tests that might pass because an incorrect error was
-reported.
-
-Please feel free to contribute!
-
-
-Credits
--------
-
-The seed test set was adapted from Byron Ruth's
-[jsonpatch-js](https://github.com/bruth/jsonpatch-js/blob/master/test.js) and
-extended by [Mike McCabe](https://github.com/mikemccabe).
-
-
-License
--------
-
-   Copyright 2014 The Authors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/cjson-utils-tests.json b/external_libs/cJSON/cJSON/tests/json-patch-tests/cjson-utils-tests.json
deleted file mode 100644
index 28a5e307..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/cjson-utils-tests.json
+++ /dev/null
@@ -1,91 +0,0 @@
-[
-    {
-	"comment": "1",
-	"doc": { "foo": "bar"},
-	"patch": [{ "op": "add", "path": "/baz", "value": "qux" }],
-	"expected": {"baz": "qux", "foo": "bar"}
-    },
-    {
-	"comment": "2",
-	"doc": { "foo": [ "bar", "baz" ] },
-	"patch": [{ "op": "add", "path": "/foo/1", "value": "qux" }],
-	"expected": {"foo": [ "bar", "qux", "baz" ] }
-    },
-    {
-	"comment": "3",
-	"doc": {"baz": "qux","foo": "bar"},
-	"patch": [{ "op": "remove", "path": "/baz" }],
-	"expected": {"foo": "bar" }
-    },
-    {
-	"comment": "4",
-	"doc": { "foo": [ "bar", "qux", "baz" ] },
-	"patch": [{ "op": "remove", "path": "/foo/1" }],
-	"expected": {"foo": [ "bar", "baz" ] }
-    },
-    {
-	"comment": "5",
-	"doc": { "baz": "qux","foo": "bar"},
-	"patch": [{ "op": "replace", "path": "/baz", "value": "boo" }],
-	"expected": {"baz": "boo","foo": "bar"}
-    },
-    {
-	"comment": "6",
-	"doc": {"foo": {"bar": "baz","waldo": "fred"},"qux": {"corge": "grault"}},
-	"patch": [{ "op": "move", "from": "/foo/waldo", "path": "/qux/thud" }],
-	"expected": {"foo": {"bar": "baz"},"qux": {"corge": "grault","thud": "fred"}}
-    },
-    {
-	"comment": "7",
-	"doc": { "foo": [ "all", "grass", "cows", "eat" ] },
-	"patch": [ { "op": "move", "from": "/foo/1", "path": "/foo/3" }],
-	"expected": { "foo": [ "all", "cows", "eat", "grass" ] }
-    },
-    {
-	"comment": "8",
-	"doc": {"baz": "qux","foo": [ "a", 2, "c" ]},
-	"patch": [{ "op": "test", "path": "/baz", "value": "qux" },{ "op": "test", "path": "/foo/1", "value": 2 }]
-    },
-    {
-	"comment": "9",
-	"doc": { "baz": "qux" },
-	"patch": [ { "op": "test", "path": "/baz", "value": "bar" }],
-	"error": "\"bar\" doesn't exist"
-    },
-    {
-	"comment": "10",
-	"doc": { "foo": "bar" },
-	"patch": [{ "op": "add", "path": "/child", "value": { "grandchild": { } } }],
-	"expected": {"foo": "bar","child": {"grandchild": {}}}
-    },
-    {
-	"comment": "11",
-	"doc": { "foo": "bar" },
-	"patch": [{ "op": "add", "path": "/baz", "value": "qux", "xyz": 123 }],
-	"expected": {"foo": "bar","baz": "qux"}
-    },
-    {
-	"comment": "12",
-	"doc": { "foo": "bar" },
-	"patch": [{ "op": "add", "path": "/baz/bat", "value": "qux" }],
-	"error": "Can't add to nonexistent object"
-    },
-    {
-	"comment": "13",
-	"doc": {"/": 9,"~1": 10},
-	"patch": [{"op": "test", "path": "/~01", "value": 10}]
-    },
-    {
-	"comment": "14",
-	"doc": { "foo": ["bar"] },
-	"patch": [ { "op": "add", "path": "/foo/-", "value": ["abc", "def"] }],
-	"expected": {"foo": ["bar", ["abc", "def"]] }
-    },
-
-    { 
-        "comment": "15",
-        "doc": {"foo": {"bar": 1}},
-        "patch": [{"op": "add", "path": "/foo/bar/baz", "value": "5"}],
-        "error": "attempting to add to subfield of non-object"
-    } 
-]
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/package.json b/external_libs/cJSON/cJSON/tests/json-patch-tests/package.json
deleted file mode 100644
index 256f9368..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "json-patch-test-suite",
-  "version": "1.1.0",
-  "description": "JSON Patch RFC 6902 test suite",
-  "repository": "github:json-patch/json-patch-tests",
-  "homepage": "https://github.com/json-patch/json-patch-tests",
-  "bugs": "https://github.com/json-patch/json-patch-tests/issues",
-  "keywords": [
-    "JSON",
-    "Patch",
-    "test",
-    "suite"
-  ],
-  "license": "Apache-2.0"
-}
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/spec_tests.json b/external_libs/cJSON/cJSON/tests/json-patch-tests/spec_tests.json
deleted file mode 100644
index c160535b..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/spec_tests.json
+++ /dev/null
@@ -1,233 +0,0 @@
-[
-  {
-    "comment": "4.1. add with missing object",
-    "doc": { "q": { "bar": 2 } },
-    "patch": [ {"op": "add", "path": "/a/b", "value": 1} ],
-    "error":
-       "path /a does not exist -- missing objects are not created recursively"
-  },
-
-  {
-    "comment": "A.1.  Adding an Object Member",
-    "doc": {
-  "foo": "bar"
-},
-    "patch": [
-  { "op": "add", "path": "/baz", "value": "qux" }
-],
-    "expected": {
-  "baz": "qux",
-  "foo": "bar"
-}
-  },
-
-  {
-    "comment": "A.2.  Adding an Array Element",
-    "doc": {
-  "foo": [ "bar", "baz" ]
-},
-    "patch": [
-  { "op": "add", "path": "/foo/1", "value": "qux" }
-],
-    "expected": {
-  "foo": [ "bar", "qux", "baz" ]
-}
-  },
-
-  {
-    "comment": "A.3.  Removing an Object Member",
-    "doc": {
-  "baz": "qux",
-  "foo": "bar"
-},
-    "patch": [
-  { "op": "remove", "path": "/baz" }
-],
-    "expected": {
-  "foo": "bar"
-}
-  },
-
-  {
-    "comment": "A.4.  Removing an Array Element",
-    "doc": {
-  "foo": [ "bar", "qux", "baz" ]
-},
-    "patch": [
-  { "op": "remove", "path": "/foo/1" }
-],
-    "expected": {
-  "foo": [ "bar", "baz" ]
-}
-  },
-
-  {
-    "comment": "A.5.  Replacing a Value",
-    "doc": {
-  "baz": "qux",
-  "foo": "bar"
-},
-    "patch": [
-  { "op": "replace", "path": "/baz", "value": "boo" }
-],
-    "expected": {
-  "baz": "boo",
-  "foo": "bar"
-}
-  },
-
-  {
-    "comment": "A.6.  Moving a Value",
-    "doc": {
-  "foo": {
-    "bar": "baz",
-    "waldo": "fred"
-  },
-  "qux": {
-    "corge": "grault"
-  }
-},
-    "patch": [
-  { "op": "move", "from": "/foo/waldo", "path": "/qux/thud" }
-],
-    "expected": {
-  "foo": {
-    "bar": "baz"
-  },
-  "qux": {
-    "corge": "grault",
-    "thud": "fred"
-  }
-}
-  },
-
-  {
-    "comment": "A.7.  Moving an Array Element",
-    "doc": {
-  "foo": [ "all", "grass", "cows", "eat" ]
-},
-    "patch": [
-  { "op": "move", "from": "/foo/1", "path": "/foo/3" }
-],
-    "expected": {
-  "foo": [ "all", "cows", "eat", "grass" ]
-}
-
-  },
-
-  {
-    "comment": "A.8.  Testing a Value: Success",
-    "doc": {
-  "baz": "qux",
-  "foo": [ "a", 2, "c" ]
-},
-    "patch": [
-  { "op": "test", "path": "/baz", "value": "qux" },
-  { "op": "test", "path": "/foo/1", "value": 2 }
-],
-    "expected": {
-     "baz": "qux",
-     "foo": [ "a", 2, "c" ]
-    }
-  },
-
-  {
-    "comment": "A.9.  Testing a Value: Error",
-    "doc": {
-  "baz": "qux"
-},
-    "patch": [
-  { "op": "test", "path": "/baz", "value": "bar" }
-],
-    "error": "string not equivalent"
-  },
-
-  {
-    "comment": "A.10.  Adding a nested Member Object",
-    "doc": {
-  "foo": "bar"
-},
-    "patch": [
-  { "op": "add", "path": "/child", "value": { "grandchild": { } } }
-],
-    "expected": {
-  "foo": "bar",
-  "child": {
-    "grandchild": {
-    }
-  }
-}
-  },
-
-  {
-    "comment": "A.11.  Ignoring Unrecognized Elements",
-    "doc": {
-  "foo":"bar"
-},
-    "patch": [
-  { "op": "add", "path": "/baz", "value": "qux", "xyz": 123 }
-],
-    "expected": {
-  "foo":"bar",
-  "baz":"qux"
-}
-  },
-
- {
-    "comment": "A.12.  Adding to a Non-existent Target",
-    "doc": {
-  "foo": "bar"
-},
-    "patch": [
-  { "op": "add", "path": "/baz/bat", "value": "qux" }
-],
-    "error": "add to a non-existent target"
-  },
-
- {
-    "comment": "A.13 Invalid JSON Patch Document",
-    "doc": {
-     "foo": "bar"
-    },
-    "patch": [
-  { "op": "add", "path": "/baz", "value": "qux", "op": "remove" }
-],
-    "error": "operation has two 'op' members",
-    "disabled": true
-  },
-
-  {
-    "comment": "A.14. ~ Escape Ordering",
-    "doc": {
-       "/": 9,
-       "~1": 10
-    },
-    "patch": [{"op": "test", "path": "/~01", "value": 10}],
-    "expected": {
-       "/": 9,
-       "~1": 10
-    }
-  },
-
-  {
-    "comment": "A.15. Comparing Strings and Numbers",
-    "doc": {
-       "/": 9,
-       "~1": 10
-    },
-    "patch": [{"op": "test", "path": "/~01", "value": "10"}],
-    "error": "number is not equal to string"
-  },
-
-  {
-    "comment": "A.16. Adding an Array Value",
-    "doc": {
-       "foo": ["bar"]
-    },
-    "patch": [{ "op": "add", "path": "/foo/-", "value": ["abc", "def"] }],
-    "expected": {
-      "foo": ["bar", ["abc", "def"]]
-    }
-  }
-
-]
diff --git a/external_libs/cJSON/cJSON/tests/json-patch-tests/tests.json b/external_libs/cJSON/cJSON/tests/json-patch-tests/tests.json
deleted file mode 100644
index 86305c16..00000000
--- a/external_libs/cJSON/cJSON/tests/json-patch-tests/tests.json
+++ /dev/null
@@ -1,434 +0,0 @@
-[
-    { "comment": "empty list, empty docs",
-      "doc": {},
-      "patch": [],
-      "expected": {} },
-
-    { "comment": "empty patch list",
-      "doc": {"foo": 1},
-      "patch": [],
-      "expected": {"foo": 1} },
-
-    { "comment": "rearrangements OK?",
-      "doc": {"foo": 1, "bar": 2},
-      "patch": [],
-      "expected": {"bar":2, "foo": 1} },
-
-    { "comment": "rearrangements OK?  How about one level down ... array",
-      "doc": [{"foo": 1, "bar": 2}],
-      "patch": [],
-      "expected": [{"bar":2, "foo": 1}] },
-
-    { "comment": "rearrangements OK?  How about one level down...",
-      "doc": {"foo":{"foo": 1, "bar": 2}},
-      "patch": [],
-      "expected": {"foo":{"bar":2, "foo": 1}} },
-
-    { "comment": "add replaces any existing field",
-      "doc": {"foo": null},
-      "patch": [{"op": "add", "path": "/foo", "value":1}],
-      "expected": {"foo": 1} },
-
-    { "comment": "toplevel array",
-      "doc": [],
-      "patch": [{"op": "add", "path": "/0", "value": "foo"}],
-      "expected": ["foo"] },
-
-    { "comment": "toplevel array, no change",
-      "doc": ["foo"],
-      "patch": [],
-      "expected": ["foo"] },
-
-    { "comment": "toplevel object, numeric string",
-      "doc": {},
-      "patch": [{"op": "add", "path": "/foo", "value": "1"}],
-      "expected": {"foo":"1"} },
-
-    { "comment": "toplevel object, integer",
-      "doc": {},
-      "patch": [{"op": "add", "path": "/foo", "value": 1}],
-      "expected": {"foo":1} },
-
-    { "comment": "Toplevel scalar values OK?",
-      "doc": "foo",
-      "patch": [{"op": "replace", "path": "", "value": "bar"}],
-      "expected": "bar",
-      "disabled": true },
-
-    { "comment": "replace object document with array document?",
-      "doc": {},
-      "patch": [{"op": "add", "path": "", "value": []}],
-      "expected": [] },
-
-    { "comment": "replace array document with object document?",
-      "doc": [],
-      "patch": [{"op": "add", "path": "", "value": {}}],
-      "expected": {} },
-
-    { "comment": "append to root array document?",
-      "doc": [],
-      "patch": [{"op": "add", "path": "/-", "value": "hi"}],
-      "expected": ["hi"] },
-
-    { "comment": "Add, / target",
-      "doc": {},
-      "patch": [ {"op": "add", "path": "/", "value":1 } ],
-      "expected": {"":1} },
-
-    { "comment": "Add, /foo/ deep target (trailing slash)",
-      "doc": {"foo": {}},
-      "patch": [ {"op": "add", "path": "/foo/", "value":1 } ],
-      "expected": {"foo":{"": 1}} },
-
-    { "comment": "Add composite value at top level",
-      "doc": {"foo": 1},
-      "patch": [{"op": "add", "path": "/bar", "value": [1, 2]}],
-      "expected": {"foo": 1, "bar": [1, 2]} },
-
-    { "comment": "Add into composite value",
-      "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "add", "path": "/baz/0/foo", "value": "world"}],
-      "expected": {"foo": 1, "baz": [{"qux": "hello", "foo": "world"}]} },
-
-    { "doc": {"bar": [1, 2]},
-      "patch": [{"op": "add", "path": "/bar/8", "value": "5"}],
-      "error": "Out of bounds (upper)" },
-
-    { "doc": {"bar": [1, 2]},
-      "patch": [{"op": "add", "path": "/bar/-1", "value": "5"}],
-      "error": "Out of bounds (lower)" },
-
-    { "doc": {"foo": 1},
-      "patch": [{"op": "add", "path": "/bar", "value": true}],
-      "expected": {"foo": 1, "bar": true} },
-
-    { "doc": {"foo": 1},
-      "patch": [{"op": "add", "path": "/bar", "value": false}],
-      "expected": {"foo": 1, "bar": false} },
-
-    { "doc": {"foo": 1},
-      "patch": [{"op": "add", "path": "/bar", "value": null}],
-      "expected": {"foo": 1, "bar": null} },
-
-    { "comment": "0 can be an array index or object element name",
-      "doc": {"foo": 1},
-      "patch": [{"op": "add", "path": "/0", "value": "bar"}],
-      "expected": {"foo": 1, "0": "bar" } },
-
-    { "doc": ["foo"],
-      "patch": [{"op": "add", "path": "/1", "value": "bar"}],
-      "expected": ["foo", "bar"] },
-
-    { "doc": ["foo", "sil"],
-      "patch": [{"op": "add", "path": "/1", "value": "bar"}],
-      "expected": ["foo", "bar", "sil"] },
-
-    { "doc": ["foo", "sil"],
-      "patch": [{"op": "add", "path": "/0", "value": "bar"}],
-      "expected": ["bar", "foo", "sil"] },
-
-    { "comment": "push item to array via last index + 1",
-      "doc": ["foo", "sil"],
-      "patch": [{"op":"add", "path": "/2", "value": "bar"}],
-      "expected": ["foo", "sil", "bar"] },
-
-    { "comment": "add item to array at index > length should fail",
-      "doc": ["foo", "sil"],
-      "patch": [{"op":"add", "path": "/3", "value": "bar"}],
-      "error": "index is greater than number of items in array" },
-      
-    { "comment": "test against implementation-specific numeric parsing",
-      "doc": {"1e0": "foo"},
-      "patch": [{"op": "test", "path": "/1e0", "value": "foo"}],
-      "expected": {"1e0": "foo"} },
-
-    { "comment": "test with bad number should fail",
-      "doc": ["foo", "bar"],
-      "patch": [{"op": "test", "path": "/1e0", "value": "bar"}],
-      "error": "test op shouldn't get array element 1" },
-
-    { "doc": ["foo", "sil"],
-      "patch": [{"op": "add", "path": "/bar", "value": 42}],
-      "error": "Object operation on array target" },
-
-    { "doc": ["foo", "sil"],
-      "patch": [{"op": "add", "path": "/1", "value": ["bar", "baz"]}],
-      "expected": ["foo", ["bar", "baz"], "sil"],
-      "comment": "value in array add not flattened" },
-
-    { "doc": {"foo": 1, "bar": [1, 2, 3, 4]},
-      "patch": [{"op": "remove", "path": "/bar"}],
-      "expected": {"foo": 1} },
-
-    { "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "remove", "path": "/baz/0/qux"}],
-      "expected": {"foo": 1, "baz": [{}]} },
-
-    { "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "replace", "path": "/foo", "value": [1, 2, 3, 4]}],
-      "expected": {"foo": [1, 2, 3, 4], "baz": [{"qux": "hello"}]} },
-
-    { "doc": {"foo": [1, 2, 3, 4], "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "replace", "path": "/baz/0/qux", "value": "world"}],
-      "expected": {"foo": [1, 2, 3, 4], "baz": [{"qux": "world"}]} },
-
-    { "doc": ["foo"],
-      "patch": [{"op": "replace", "path": "/0", "value": "bar"}],
-      "expected": ["bar"] },
-
-    { "doc": [""],
-      "patch": [{"op": "replace", "path": "/0", "value": 0}],
-      "expected": [0] },
-
-    { "doc": [""],
-      "patch": [{"op": "replace", "path": "/0", "value": true}],
-      "expected": [true] },
-
-    { "doc": [""],
-      "patch": [{"op": "replace", "path": "/0", "value": false}],
-      "expected": [false] },
-
-    { "doc": [""],
-      "patch": [{"op": "replace", "path": "/0", "value": null}],
-      "expected": [null] },
-
-    { "doc": ["foo", "sil"],
-      "patch": [{"op": "replace", "path": "/1", "value": ["bar", "baz"]}],
-      "expected": ["foo", ["bar", "baz"]],
-      "comment": "value in array replace not flattened" },
-
-    { "comment": "replace whole document",
-      "doc": {"foo": "bar"},
-      "patch": [{"op": "replace", "path": "", "value": {"baz": "qux"}}],
-      "expected": {"baz": "qux"} },
-
-    { "comment": "test replace with missing parent key should fail",
-      "doc": {"bar": "baz"},
-      "patch": [{"op": "replace", "path": "/foo/bar", "value": false}],
-      "error": "replace op should fail with missing parent key" },
-
-    { "comment": "spurious patch properties",
-      "doc": {"foo": 1},
-      "patch": [{"op": "test", "path": "/foo", "value": 1, "spurious": 1}],
-      "expected": {"foo": 1} },
-
-    { "doc": {"foo": null},
-      "patch": [{"op": "test", "path": "/foo", "value": null}],
-      "comment": "null value should be valid obj property" },
-
-    { "doc": {"foo": null},
-      "patch": [{"op": "replace", "path": "/foo", "value": "truthy"}],
-      "expected": {"foo": "truthy"},
-      "comment": "null value should be valid obj property to be replaced with something truthy" },
-
-    { "doc": {"foo": null},
-      "patch": [{"op": "move", "from": "/foo", "path": "/bar"}],
-      "expected": {"bar": null},
-      "comment": "null value should be valid obj property to be moved" },
-
-    { "doc": {"foo": null},
-      "patch": [{"op": "copy", "from": "/foo", "path": "/bar"}],
-      "expected": {"foo": null, "bar": null},
-      "comment": "null value should be valid obj property to be copied" },
-
-    { "doc": {"foo": null},
-      "patch": [{"op": "remove", "path": "/foo"}],
-      "expected": {},
-      "comment": "null value should be valid obj property to be removed" },
-
-    { "doc": {"foo": "bar"},
-      "patch": [{"op": "replace", "path": "/foo", "value": null}],
-      "expected": {"foo": null},
-      "comment": "null value should still be valid obj property replace other value" },
-
-    { "doc": {"foo": {"foo": 1, "bar": 2}},
-      "patch": [{"op": "test", "path": "/foo", "value": {"bar": 2, "foo": 1}}],
-      "comment": "test should pass despite rearrangement" },
-
-    { "doc": {"foo": [{"foo": 1, "bar": 2}]},
-      "patch": [{"op": "test", "path": "/foo", "value": [{"bar": 2, "foo": 1}]}],
-      "comment": "test should pass despite (nested) rearrangement" },
-
-    { "doc": {"foo": {"bar": [1, 2, 5, 4]}},
-      "patch": [{"op": "test", "path": "/foo", "value": {"bar": [1, 2, 5, 4]}}],
-      "comment": "test should pass - no error" },
-
-    { "doc": {"foo": {"bar": [1, 2, 5, 4]}},
-      "patch": [{"op": "test", "path": "/foo", "value": [1, 2]}],
-      "error": "test op should fail" },
-
-    { "comment": "Whole document",
-      "doc": { "foo": 1 },
-      "patch": [{"op": "test", "path": "", "value": {"foo": 1}}],
-      "disabled": true },
-
-    { "comment": "Empty-string element",
-      "doc": { "": 1 },
-      "patch": [{"op": "test", "path": "/", "value": 1}] },
-
-    { "doc": {
-            "foo": ["bar", "baz"],
-            "": 0,
-            "a/b": 1,
-            "c%d": 2,
-            "e^f": 3,
-            "g|h": 4,
-            "i\\j": 5,
-            "k\"l": 6,
-            " ": 7,
-            "m~n": 8
-            },
-      "patch": [{"op": "test", "path": "/foo", "value": ["bar", "baz"]},
-                {"op": "test", "path": "/foo/0", "value": "bar"},
-                {"op": "test", "path": "/", "value": 0},
-                {"op": "test", "path": "/a~1b", "value": 1},
-                {"op": "test", "path": "/c%d", "value": 2},
-                {"op": "test", "path": "/e^f", "value": 3},
-                {"op": "test", "path": "/g|h", "value": 4},
-                {"op": "test", "path":  "/i\\j", "value": 5},
-                {"op": "test", "path": "/k\"l", "value": 6},
-                {"op": "test", "path": "/ ", "value": 7},
-                {"op": "test", "path": "/m~0n", "value": 8}] },
-
-    { "comment": "Move to same location has no effect",
-      "doc": {"foo": 1},
-      "patch": [{"op": "move", "from": "/foo", "path": "/foo"}],
-      "expected": {"foo": 1} },
-
-    { "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "move", "from": "/foo", "path": "/bar"}],
-      "expected": {"baz": [{"qux": "hello"}], "bar": 1} },
-
-    { "doc": {"baz": [{"qux": "hello"}], "bar": 1},
-      "patch": [{"op": "move", "from": "/baz/0/qux", "path": "/baz/1"}],
-      "expected": {"baz": [{}, "hello"], "bar": 1} },
-
-    { "doc": {"baz": [{"qux": "hello"}], "bar": 1},
-      "patch": [{"op": "copy", "from": "/baz/0", "path": "/boo"}],
-      "expected": {"baz":[{"qux":"hello"}],"bar":1,"boo":{"qux":"hello"}} },
-
-    { "comment": "replacing the root of the document is possible with add",
-      "doc": {"foo": "bar"},
-      "patch": [{"op": "add", "path": "", "value": {"baz": "qux"}}],
-      "expected": {"baz":"qux"}},
-
-    { "comment": "Adding to \"/-\" adds to the end of the array",
-      "doc": [ 1, 2 ],
-      "patch": [ { "op": "add", "path": "/-", "value": { "foo": [ "bar", "baz" ] } } ],
-      "expected": [ 1, 2, { "foo": [ "bar", "baz" ] } ]},
-
-    { "comment": "Adding to \"/-\" adds to the end of the array, even n levels down",
-      "doc": [ 1, 2, [ 3, [ 4, 5 ] ] ],
-      "patch": [ { "op": "add", "path": "/2/1/-", "value": { "foo": [ "bar", "baz" ] } } ],
-      "expected": [ 1, 2, [ 3, [ 4, 5, { "foo": [ "bar", "baz" ] } ] ] ]},
-
-    { "comment": "test remove with bad number should fail",
-      "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
-      "patch": [{"op": "remove", "path": "/baz/1e0/qux"}],
-      "error": "remove op shouldn't remove from array with bad number" },
-
-    { "comment": "test remove on array",
-      "doc": [1, 2, 3, 4],
-      "patch": [{"op": "remove", "path": "/0"}],
-      "expected": [2, 3, 4] },
-
-    { "comment": "test repeated removes",
-      "doc": [1, 2, 3, 4],
-      "patch": [{ "op": "remove", "path": "/1" },
-                { "op": "remove", "path": "/2" }],
-      "expected": [1, 3] },
-
-    { "comment": "test remove with bad index should fail",
-      "doc": [1, 2, 3, 4],
-      "patch": [{"op": "remove", "path": "/1e0"}],
-      "error": "remove op shouldn't remove from array with bad number" },
-
-    { "comment": "test replace with bad number should fail",
-      "doc": [""],
-      "patch": [{"op": "replace", "path": "/1e0", "value": false}],
-      "error": "replace op shouldn't replace in array with bad number" },
-
-    { "comment": "test copy with bad number should fail",
-      "doc": {"baz": [1,2,3], "bar": 1},
-      "patch": [{"op": "copy", "from": "/baz/1e0", "path": "/boo"}],
-      "error": "copy op shouldn't work with bad number" },
-
-    { "comment": "test move with bad number should fail",
-      "doc": {"foo": 1, "baz": [1,2,3,4]},
-      "patch": [{"op": "move", "from": "/baz/1e0", "path": "/foo"}],
-      "error": "move op shouldn't work with bad number" },
-
-    { "comment": "test add with bad number should fail",
-      "doc": ["foo", "sil"],
-      "patch": [{"op": "add", "path": "/1e0", "value": "bar"}],
-      "error": "add op shouldn't add to array with bad number" },
-
-    { "comment": "missing 'value' parameter to add",
-      "doc": [ 1 ],
-      "patch": [ { "op": "add", "path": "/-" } ],
-      "error": "missing 'value' parameter" },
-
-    { "comment": "missing 'value' parameter to replace",
-      "doc": [ 1 ],
-      "patch": [ { "op": "replace", "path": "/0" } ],
-      "error": "missing 'value' parameter" },
-
-    { "comment": "missing 'value' parameter to test",
-      "doc": [ null ],
-      "patch": [ { "op": "test", "path": "/0" } ],
-      "error": "missing 'value' parameter" },
-
-    { "comment": "missing value parameter to test - where undef is falsy",
-      "doc": [ false ],
-      "patch": [ { "op": "test", "path": "/0" } ],
-      "error": "missing 'value' parameter" },
-
-    { "comment": "missing from parameter to copy",
-      "doc": [ 1 ],
-      "patch": [ { "op": "copy", "path": "/-" } ],
-      "error": "missing 'from' parameter" },
-
-    { "comment": "missing from parameter to move",
-      "doc": { "foo": 1 },
-      "patch": [ { "op": "move", "path": "" } ],
-      "error": "missing 'from' parameter" },
-
-    { "comment": "duplicate ops",
-      "doc": { "foo": "bar" },
-      "patch": [ { "op": "add", "path": "/baz", "value": "qux",
-                   "op": "move", "from":"/foo" } ],
-      "error": "patch has two 'op' members",
-      "disabled": true },
-
-    { "comment": "unrecognized op should fail",
-      "doc": {"foo": 1},
-      "patch": [{"op": "spam", "path": "/foo", "value": 1}],
-      "error": "Unrecognized op 'spam'" },
-
-    { "comment": "test with bad array number that has leading zeros",
-      "doc": ["foo", "bar"],
-      "patch": [{"op": "test", "path": "/00", "value": "foo"}],
-      "error": "test op should reject the array value, it has leading zeros" },
-
-    { "comment": "test with bad array number that has leading zeros",
-      "doc": ["foo", "bar"],
-      "patch": [{"op": "test", "path": "/01", "value": "bar"}],
-      "error": "test op should reject the array value, it has leading zeros" },
-
-    { "comment": "Removing nonexistent field",
-      "doc": {"foo" : "bar"},
-      "patch": [{"op": "remove", "path": "/baz"}],
-      "error": "removing a nonexistent field should fail" },
-
-    { "comment": "Removing nonexistent index",
-      "doc": ["foo", "bar"],
-      "patch": [{"op": "remove", "path": "/2"}],
-      "error": "removing a nonexistent index should fail" },
-
-    { "comment": "Patch with different capitalisation than doc",
-       "doc": {"foo":"bar"},
-       "patch": [{"op": "add", "path": "/FOO", "value": "BAR"}],
-       "expected": {"foo": "bar", "FOO": "BAR"}
-    }
-
-]
diff --git a/external_libs/cJSON/cJSON/tests/json_patch_tests.c b/external_libs/cJSON/cJSON/tests/json_patch_tests.c
deleted file mode 100644
index c2c88a4f..00000000
--- a/external_libs/cJSON/cJSON/tests/json_patch_tests.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-#include "../cJSON_Utils.h"
-
-static cJSON *parse_test_file(const char * const filename)
-{
-    char *file = NULL;
-    cJSON *json = NULL;
-
-    file = read_file(filename);
-    TEST_ASSERT_NOT_NULL_MESSAGE(file, "Failed to read file.");
-
-    json = cJSON_Parse(file);
-    TEST_ASSERT_NOT_NULL_MESSAGE(json, "Failed to parse test json.");
-    TEST_ASSERT_TRUE_MESSAGE(cJSON_IsArray(json), "Json is not an array.");
-
-    free(file);
-
-    return json;
-}
-
-static cJSON_bool test_apply_patch(const cJSON * const test)
-{
-    cJSON *doc = NULL;
-    cJSON *patch = NULL;
-    cJSON *expected = NULL;
-    cJSON *error_element = NULL;
-    cJSON *comment = NULL;
-    cJSON *disabled = NULL;
-
-    cJSON *object = NULL;
-    cJSON_bool successful = false;
-
-    /* extract all the data out of the test */
-    comment = cJSON_GetObjectItemCaseSensitive(test, "comment");
-    if (cJSON_IsString(comment))
-    {
-        printf("Testing \"%s\"\n", comment->valuestring);
-    }
-    else
-    {
-        printf("Testing unkown\n");
-    }
-
-    disabled = cJSON_GetObjectItemCaseSensitive(test, "disabled");
-    if (cJSON_IsTrue(disabled))
-    {
-        printf("SKIPPED\n");
-        return true;
-    }
-
-    doc = cJSON_GetObjectItemCaseSensitive(test, "doc");
-    TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test.");
-    patch = cJSON_GetObjectItemCaseSensitive(test, "patch");
-    TEST_ASSERT_NOT_NULL_MESSAGE(patch, "No \"patch\"in the test.");
-    /* Make a working copy of 'doc' */
-    object = cJSON_Duplicate(doc, true);
-    TEST_ASSERT_NOT_NULL(object);
-
-    expected = cJSON_GetObjectItemCaseSensitive(test, "expected");
-    error_element = cJSON_GetObjectItemCaseSensitive(test, "error");
-    if (error_element != NULL)
-    {
-        /* excepting an error */
-        TEST_ASSERT_TRUE_MESSAGE(0 != cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Test didn't fail as it's supposed to.");
-
-        successful = true;
-    }
-    else
-    {
-        /* apply the patch */
-        TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Failed to apply patches.");
-        successful = true;
-
-        if (expected != NULL)
-        {
-            successful = cJSON_Compare(object, expected, true);
-        }
-    }
-
-    cJSON_Delete(object);
-
-    if (successful)
-    {
-        printf("OK\n");
-    }
-    else
-    {
-        printf("FAILED\n");
-    }
-
-    return successful;
-}
-
-static cJSON_bool test_generate_test(cJSON *test)
-{
-    cJSON *doc = NULL;
-    cJSON *patch = NULL;
-    cJSON *expected = NULL;
-    cJSON *disabled = NULL;
-
-    cJSON *object = NULL;
-    cJSON_bool successful = false;
-
-    char *printed_patch = NULL;
-
-    disabled = cJSON_GetObjectItemCaseSensitive(test, "disabled");
-    if (cJSON_IsTrue(disabled))
-    {
-        printf("SKIPPED\n");
-        return true;
-    }
-
-    doc = cJSON_GetObjectItemCaseSensitive(test, "doc");
-    TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test.");
-
-    /* Make a working copy of 'doc' */
-    object = cJSON_Duplicate(doc, true);
-    TEST_ASSERT_NOT_NULL(object);
-
-    expected = cJSON_GetObjectItemCaseSensitive(test, "expected");
-    if (expected == NULL)
-    {
-        cJSON_Delete(object);
-        /* if there is no expected output, this test doesn't make sense */
-        return true;
-    }
-
-    patch = cJSONUtils_GeneratePatchesCaseSensitive(doc, expected);
-    TEST_ASSERT_NOT_NULL_MESSAGE(patch, "Failed to generate patches.");
-
-    printed_patch = cJSON_Print(patch);
-    printf("%s\n", printed_patch);
-    free(printed_patch);
-
-    /* apply the generated patch */
-    TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Failed to apply generated patch.");
-
-    successful = cJSON_Compare(object, expected, true);
-
-    cJSON_Delete(patch);
-    cJSON_Delete(object);
-
-    if (successful)
-    {
-        printf("generated patch: OK\n");
-    }
-    else
-    {
-        printf("generated patch: FAILED\n");
-    }
-
-    return successful;
-}
-
-static void cjson_utils_should_pass_json_patch_test_tests(void)
-{
-    cJSON *tests = parse_test_file("json-patch-tests/tests.json");
-    cJSON *test = NULL;
-
-    cJSON_bool failed = false;
-    cJSON_ArrayForEach(test, tests)
-    {
-        failed |= !test_apply_patch(test);
-        failed |= !test_generate_test(test);
-    }
-
-    cJSON_Delete(tests);
-
-    TEST_ASSERT_FALSE_MESSAGE(failed, "Some tests failed.");
-}
-
-static void cjson_utils_should_pass_json_patch_test_spec_tests(void)
-{
-    cJSON *tests = parse_test_file("json-patch-tests/spec_tests.json");
-    cJSON *test = NULL;
-
-    cJSON_bool failed = false;
-    cJSON_ArrayForEach(test, tests)
-    {
-        failed |= !test_apply_patch(test);
-        failed |= !test_generate_test(test);
-    }
-
-    cJSON_Delete(tests);
-
-    TEST_ASSERT_FALSE_MESSAGE(failed, "Some tests failed.");
-}
-
-static void cjson_utils_should_pass_json_patch_test_cjson_utils_tests(void)
-{
-    cJSON *tests = parse_test_file("json-patch-tests/cjson-utils-tests.json");
-    cJSON *test = NULL;
-
-    cJSON_bool failed = false;
-    cJSON_ArrayForEach(test, tests)
-    {
-        failed |= !test_apply_patch(test);
-        failed |= !test_generate_test(test);
-    }
-
-    cJSON_Delete(tests);
-
-    TEST_ASSERT_FALSE_MESSAGE(failed, "Some tests failed.");
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_utils_should_pass_json_patch_test_tests);
-    RUN_TEST(cjson_utils_should_pass_json_patch_test_spec_tests);
-    RUN_TEST(cjson_utils_should_pass_json_patch_test_cjson_utils_tests);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/misc_tests.c b/external_libs/cJSON/cJSON/tests/misc_tests.c
deleted file mode 100644
index a0b4f7eb..00000000
--- a/external_libs/cJSON/cJSON/tests/misc_tests.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-
-static void cjson_array_foreach_should_loop_over_arrays(void)
-{
-    cJSON array[1];
-    cJSON elements[10];
-    cJSON *element_pointer = NULL;
-    size_t i = 0;
-
-    memset(array, 0, sizeof(array));
-    memset(elements, 0, sizeof(elements));
-
-    /* create array */
-    array[0].child = &elements[0];
-    elements[0].prev = NULL;
-    elements[9].next = NULL;
-    for (i = 0; i < 9; i++)
-    {
-        elements[i].next = &elements[i + 1];
-        elements[i + 1].prev = &elements[i];
-    }
-
-    i = 0;
-    cJSON_ArrayForEach(element_pointer, array)
-    {
-        TEST_ASSERT_TRUE_MESSAGE(element_pointer == &elements[i], "Not iterating over array properly");
-        i++;
-    }
-}
-
-static void cjson_array_foreach_should_not_dereference_null_pointer(void)
-{
-    cJSON *array = NULL;
-    cJSON *element = NULL;
-    cJSON_ArrayForEach(element, array);
-}
-
-static void cjson_get_object_item_should_get_object_items(void)
-{
-    cJSON *item = NULL;
-    cJSON *found = NULL;
-
-    item = cJSON_Parse("{\"one\":1, \"Two\":2, \"tHree\":3}");
-
-    found = cJSON_GetObjectItem(NULL, "test");
-    TEST_ASSERT_NULL_MESSAGE(found, "Failed to fail on NULL pointer.");
-
-    found = cJSON_GetObjectItem(item, NULL);
-    TEST_ASSERT_NULL_MESSAGE(found, "Failed to fail on NULL string.");
-
-
-    found = cJSON_GetObjectItem(item, "one");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find first item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 1);
-
-    found = cJSON_GetObjectItem(item, "tWo");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find first item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 2);
-
-    found = cJSON_GetObjectItem(item, "three");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 3);
-
-    found = cJSON_GetObjectItem(item, "four");
-    TEST_ASSERT_NULL_MESSAGE(found, "Should not find something that isn't there.");
-
-    cJSON_Delete(item);
-}
-
-static void cjson_get_object_item_case_sensitive_should_get_object_items(void)
-{
-    cJSON *item = NULL;
-    cJSON *found = NULL;
-
-    item = cJSON_Parse("{\"one\":1, \"Two\":2, \"tHree\":3}");
-
-    found = cJSON_GetObjectItemCaseSensitive(NULL, "test");
-    TEST_ASSERT_NULL_MESSAGE(found, "Failed to fail on NULL pointer.");
-
-    found = cJSON_GetObjectItemCaseSensitive(item, NULL);
-    TEST_ASSERT_NULL_MESSAGE(found, "Failed to fail on NULL string.");
-
-    found = cJSON_GetObjectItemCaseSensitive(item, "one");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find first item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 1);
-
-    found = cJSON_GetObjectItemCaseSensitive(item, "Two");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find first item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 2);
-
-    found = cJSON_GetObjectItemCaseSensitive(item, "tHree");
-    TEST_ASSERT_NOT_NULL_MESSAGE(found, "Failed to find item.");
-    TEST_ASSERT_EQUAL_DOUBLE(found->valuedouble, 3);
-
-    found = cJSON_GetObjectItemCaseSensitive(item, "One");
-    TEST_ASSERT_NULL_MESSAGE(found, "Should not find something that isn't there.");
-
-    cJSON_Delete(item);
-}
-
-static void typecheck_functions_should_check_type(void)
-{
-    cJSON invalid[1];
-    cJSON item[1];
-    invalid->type = cJSON_Invalid;
-    invalid->type |= cJSON_StringIsConst;
-    item->type = cJSON_False;
-    item->type |= cJSON_StringIsConst;
-
-    TEST_ASSERT_FALSE(cJSON_IsInvalid(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsInvalid(item));
-    TEST_ASSERT_TRUE(cJSON_IsInvalid(invalid));
-
-    item->type = cJSON_False | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsFalse(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsFalse(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsFalse(item));
-    TEST_ASSERT_TRUE(cJSON_IsBool(item));
-
-    item->type = cJSON_True | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsTrue(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsTrue(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsTrue(item));
-    TEST_ASSERT_TRUE(cJSON_IsBool(item));
-
-    item->type = cJSON_NULL | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsNull(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsNull(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsNull(item));
-
-    item->type = cJSON_Number | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsNumber(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsNumber(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsNumber(item));
-
-    item->type = cJSON_String | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsString(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsString(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsString(item));
-
-    item->type = cJSON_Array | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsArray(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsArray(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsArray(item));
-
-    item->type = cJSON_Object | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsObject(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsObject(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsObject(item));
-
-    item->type = cJSON_Raw | cJSON_StringIsConst;
-    TEST_ASSERT_FALSE(cJSON_IsRaw(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsRaw(invalid));
-    TEST_ASSERT_TRUE(cJSON_IsRaw(item));
-}
-
-static void cjson_should_not_parse_to_deeply_nested_jsons(void)
-{
-    char deep_json[CJSON_NESTING_LIMIT + 1];
-    size_t position = 0;
-
-    for (position = 0; position < sizeof(deep_json); position++)
-    {
-        deep_json[position] = '[';
-    }
-    deep_json[sizeof(deep_json) - 1] = '\0';
-
-    TEST_ASSERT_NULL_MESSAGE(cJSON_Parse(deep_json), "To deep JSONs should not be parsed.");
-}
-
-static void cjson_set_number_value_should_set_numbers(void)
-{
-    cJSON number[1] = {{NULL, NULL, NULL, cJSON_Number, NULL, 0, 0, NULL}};
-
-    cJSON_SetNumberValue(number, 1.5);
-    TEST_ASSERT_EQUAL(1, number->valueint);
-    TEST_ASSERT_EQUAL_DOUBLE(1.5, number->valuedouble);
-
-    cJSON_SetNumberValue(number, -1.5);
-    TEST_ASSERT_EQUAL(-1, number->valueint);
-    TEST_ASSERT_EQUAL_DOUBLE(-1.5, number->valuedouble);
-
-    cJSON_SetNumberValue(number, 1 + (double)INT_MAX);
-    TEST_ASSERT_EQUAL(INT_MAX, number->valueint);
-    TEST_ASSERT_EQUAL_DOUBLE(1 + (double)INT_MAX, number->valuedouble);
-
-    cJSON_SetNumberValue(number, -1 + (double)INT_MIN);
-    TEST_ASSERT_EQUAL(INT_MIN, number->valueint);
-    TEST_ASSERT_EQUAL_DOUBLE(-1 + (double)INT_MIN, number->valuedouble);
-}
-
-static void cjson_detach_item_via_pointer_should_detach_items(void)
-{
-    cJSON list[4];
-    cJSON parent[1];
-
-    memset(list, '\0', sizeof(list));
-
-    /* link the list */
-    list[0].next = &(list[1]);
-    list[1].next = &(list[2]);
-    list[2].next = &(list[3]);
-
-    list[3].prev = &(list[2]);
-    list[2].prev = &(list[1]);
-    list[1].prev = &(list[0]);
-
-    parent->child = &list[0];
-
-    /* detach in the middle (list[1]) */
-    TEST_ASSERT_TRUE_MESSAGE(cJSON_DetachItemViaPointer(parent, &(list[1])) == &(list[1]), "Failed to detach in the middle.");
-    TEST_ASSERT_TRUE_MESSAGE((list[1].prev == NULL) && (list[1].next == NULL), "Didn't set pointers of detached item to NULL.");
-    TEST_ASSERT_TRUE((list[0].next == &(list[2])) && (list[2].prev == &(list[0])));
-
-    /* detach beginning (list[0]) */
-    TEST_ASSERT_TRUE_MESSAGE(cJSON_DetachItemViaPointer(parent, &(list[0])) == &(list[0]), "Failed to detach beginning.");
-    TEST_ASSERT_TRUE_MESSAGE((list[0].prev == NULL) && (list[0].next == NULL), "Didn't set pointers of detached item to NULL.");
-    TEST_ASSERT_TRUE_MESSAGE((list[2].prev == NULL) && (parent->child == &(list[2])), "Didn't set the new beginning.");
-
-    /* detach end (list[3])*/
-    TEST_ASSERT_TRUE_MESSAGE(cJSON_DetachItemViaPointer(parent, &(list[3])) == &(list[3]), "Failed to detach end.");
-    TEST_ASSERT_TRUE_MESSAGE((list[3].prev == NULL) && (list[3].next == NULL), "Didn't set pointers of detached item to NULL.");
-    TEST_ASSERT_TRUE_MESSAGE((list[2].next == NULL) && (parent->child == &(list[2])), "Didn't set the new end");
-
-    /* detach single item (list[2]) */
-    TEST_ASSERT_TRUE_MESSAGE(cJSON_DetachItemViaPointer(parent, &list[2]) == &list[2], "Failed to detach single item.");
-    TEST_ASSERT_TRUE_MESSAGE((list[2].prev == NULL) && (list[2].next == NULL), "Didn't set pointers of detached item to NULL.");
-    TEST_ASSERT_NULL_MESSAGE(parent->child, "Child of the parent wasn't set to NULL.");
-}
-
-static void cjson_replace_item_via_pointer_should_replace_items(void)
-{
-    cJSON replacements[3];
-    cJSON *beginning = NULL;
-    cJSON *middle = NULL;
-    cJSON *end = NULL;
-    cJSON *array = NULL;
-
-    beginning = cJSON_CreateNull();
-    TEST_ASSERT_NOT_NULL(beginning);
-    middle = cJSON_CreateNull();
-    TEST_ASSERT_NOT_NULL(middle);
-    end = cJSON_CreateNull();
-    TEST_ASSERT_NOT_NULL(end);
-
-    array = cJSON_CreateArray();
-    TEST_ASSERT_NOT_NULL(array);
-
-    cJSON_AddItemToArray(array, beginning);
-    cJSON_AddItemToArray(array, middle);
-    cJSON_AddItemToArray(array, end);
-
-
-    memset(replacements, '\0', sizeof(replacements));
-
-    /* replace beginning */
-    TEST_ASSERT_TRUE(cJSON_ReplaceItemViaPointer(array, beginning, &(replacements[0])));
-    TEST_ASSERT_NULL(replacements[0].prev);
-    TEST_ASSERT_TRUE(replacements[0].next == middle);
-    TEST_ASSERT_TRUE(middle->prev == &(replacements[0]));
-    TEST_ASSERT_TRUE(array->child == &(replacements[0]));
-
-    /* replace middle */
-    TEST_ASSERT_TRUE(cJSON_ReplaceItemViaPointer(array, middle, &(replacements[1])));
-    TEST_ASSERT_TRUE(replacements[1].prev == &(replacements[0]));
-    TEST_ASSERT_TRUE(replacements[1].next == end);
-    TEST_ASSERT_TRUE(end->prev == &(replacements[1]));
-
-    /* replace end */
-    TEST_ASSERT_TRUE(cJSON_ReplaceItemViaPointer(array, end, &(replacements[2])));
-    TEST_ASSERT_TRUE(replacements[2].prev == &(replacements[1]));
-    TEST_ASSERT_NULL(replacements[2].next);
-    TEST_ASSERT_TRUE(replacements[1].next == &(replacements[2]));
-
-    cJSON_free(array);
-}
-
-static void cjson_replace_item_in_object_should_preserve_name(void)
-{
-    cJSON root[1] = {{ NULL, NULL, NULL, 0, NULL, 0, 0, NULL }};
-    cJSON *child = NULL;
-    cJSON *replacement = NULL;
-
-    child = cJSON_CreateNumber(1);
-    TEST_ASSERT_NOT_NULL(child);
-    replacement = cJSON_CreateNumber(2);
-    TEST_ASSERT_NOT_NULL(replacement);
-
-    cJSON_AddItemToObject(root, "child", child);
-    cJSON_ReplaceItemInObject(root, "child", replacement);
-
-    TEST_ASSERT_TRUE(root->child == replacement);
-    TEST_ASSERT_EQUAL_STRING("child", replacement->string);
-
-    cJSON_Delete(replacement);
-}
-
-static void cjson_functions_shouldnt_crash_with_null_pointers(void)
-{
-    char buffer[10];
-    cJSON *item = cJSON_CreateString("item");
-
-    cJSON_InitHooks(NULL);
-    TEST_ASSERT_NULL(cJSON_Parse(NULL));
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts(NULL, NULL, true));
-    TEST_ASSERT_NULL(cJSON_Print(NULL));
-    TEST_ASSERT_NULL(cJSON_PrintUnformatted(NULL));
-    TEST_ASSERT_NULL(cJSON_PrintBuffered(NULL, 10, true));
-    TEST_ASSERT_FALSE(cJSON_PrintPreallocated(NULL, buffer, sizeof(buffer), true));
-    TEST_ASSERT_FALSE(cJSON_PrintPreallocated(item, NULL, 1, true));
-    cJSON_Delete(NULL);
-    cJSON_GetArraySize(NULL);
-    TEST_ASSERT_NULL(cJSON_GetArrayItem(NULL, 0));
-    TEST_ASSERT_NULL(cJSON_GetObjectItem(NULL, "item"));
-    TEST_ASSERT_NULL(cJSON_GetObjectItem(item, NULL));
-    TEST_ASSERT_NULL(cJSON_GetObjectItemCaseSensitive(NULL, "item"));
-    TEST_ASSERT_NULL(cJSON_GetObjectItemCaseSensitive(item, NULL));
-    TEST_ASSERT_FALSE(cJSON_HasObjectItem(NULL, "item"));
-    TEST_ASSERT_FALSE(cJSON_HasObjectItem(item, NULL));
-    TEST_ASSERT_FALSE(cJSON_IsInvalid(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsFalse(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsTrue(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsBool(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsNull(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsNumber(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsString(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsArray(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsObject(NULL));
-    TEST_ASSERT_FALSE(cJSON_IsRaw(NULL));
-    TEST_ASSERT_NULL(cJSON_CreateString(NULL));
-    TEST_ASSERT_NULL(cJSON_CreateRaw(NULL));
-    TEST_ASSERT_NULL(cJSON_CreateIntArray(NULL, 10));
-    TEST_ASSERT_NULL(cJSON_CreateFloatArray(NULL, 10));
-    TEST_ASSERT_NULL(cJSON_CreateDoubleArray(NULL, 10));
-    TEST_ASSERT_NULL(cJSON_CreateStringArray(NULL, 10));
-    cJSON_AddItemToArray(NULL, item);
-    cJSON_AddItemToArray(item, NULL);
-    cJSON_AddItemToObject(item, "item", NULL);
-    cJSON_AddItemToObject(item, NULL, item);
-    cJSON_AddItemToObject(NULL, "item", item);
-    cJSON_AddItemToObjectCS(item, "item", NULL);
-    cJSON_AddItemToObjectCS(item, NULL, item);
-    cJSON_AddItemToObjectCS(NULL, "item", item);
-    cJSON_AddItemReferenceToArray(NULL, item);
-    cJSON_AddItemReferenceToArray(item, NULL);
-    cJSON_AddItemReferenceToObject(item, "item", NULL);
-    cJSON_AddItemReferenceToObject(item, NULL, item);
-    cJSON_AddItemReferenceToObject(NULL, "item", item);
-    TEST_ASSERT_NULL(cJSON_DetachItemViaPointer(NULL, item));
-    TEST_ASSERT_NULL(cJSON_DetachItemViaPointer(item, NULL));
-    TEST_ASSERT_NULL(cJSON_DetachItemFromArray(NULL, 0));
-    cJSON_DeleteItemFromArray(NULL, 0);
-    TEST_ASSERT_NULL(cJSON_DetachItemFromObject(NULL, "item"));
-    TEST_ASSERT_NULL(cJSON_DetachItemFromObject(item, NULL));
-    TEST_ASSERT_NULL(cJSON_DetachItemFromObjectCaseSensitive(NULL, "item"));
-    TEST_ASSERT_NULL(cJSON_DetachItemFromObjectCaseSensitive(item, NULL));
-    cJSON_DeleteItemFromObject(NULL, "item");
-    cJSON_DeleteItemFromObject(item, NULL);
-    cJSON_DeleteItemFromObjectCaseSensitive(NULL, "item");
-    cJSON_DeleteItemFromObjectCaseSensitive(item, NULL);
-    cJSON_InsertItemInArray(NULL, 0, item);
-    cJSON_InsertItemInArray(item, 0, NULL);
-    TEST_ASSERT_FALSE(cJSON_ReplaceItemViaPointer(NULL, item, item));
-    TEST_ASSERT_FALSE(cJSON_ReplaceItemViaPointer(item, NULL, item));
-    TEST_ASSERT_FALSE(cJSON_ReplaceItemViaPointer(item, item, NULL));
-    cJSON_ReplaceItemInArray(item, 0, NULL);
-    cJSON_ReplaceItemInArray(NULL, 0, item);
-    cJSON_ReplaceItemInObject(NULL, "item", item);
-    cJSON_ReplaceItemInObject(item, NULL, item);
-    cJSON_ReplaceItemInObject(item, "item", NULL);
-    cJSON_ReplaceItemInObjectCaseSensitive(NULL, "item", item);
-    cJSON_ReplaceItemInObjectCaseSensitive(item, NULL, item);
-    cJSON_ReplaceItemInObjectCaseSensitive(item, "item", NULL);
-    TEST_ASSERT_NULL(cJSON_Duplicate(NULL, true));
-    TEST_ASSERT_FALSE(cJSON_Compare(item, NULL, false));
-    TEST_ASSERT_FALSE(cJSON_Compare(NULL, item, false));
-    cJSON_Minify(NULL);
-    /* skipped because it is only used via a macro that checks for NULL */
-    /* cJSON_SetNumberHelper(NULL, 0); */
-
-    cJSON_Delete(item);
-}
-
-static void *failing_realloc(void *pointer, size_t size)
-{
-    (void)size;
-    (void)pointer;
-    return NULL;
-}
-
-static void ensure_should_fail_on_failed_realloc(void)
-{
-    printbuffer buffer = {NULL, 10, 0, 0, false, false, {&malloc, &free, &failing_realloc}};
-    buffer.buffer = (unsigned char*)malloc(100);
-    TEST_ASSERT_NOT_NULL(buffer.buffer);
-
-    TEST_ASSERT_NULL_MESSAGE(ensure(&buffer, 200), "Ensure didn't fail with failing realloc.");
-}
-
-static void skip_utf8_bom_should_skip_bom(void)
-{
-    const unsigned char string[] = "\xEF\xBB\xBF{}";
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = string;
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(skip_utf8_bom(&buffer) == &buffer);
-    TEST_ASSERT_EQUAL_UINT(3U, (unsigned int)buffer.offset);
-}
-
-static void skip_utf8_bom_should_not_skip_bom_if_not_at_beginning(void)
-{
-    const unsigned char string[] = " \xEF\xBB\xBF{}";
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = string;
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-    buffer.offset = 1;
-
-    TEST_ASSERT_NULL(skip_utf8_bom(&buffer));
-}
-
-static void cjson_get_string_value_should_get_a_string(void)
-{
-    cJSON *string = cJSON_CreateString("test");
-    cJSON *number = cJSON_CreateNumber(1);
-
-    TEST_ASSERT_TRUE(cJSON_GetStringValue(string) == string->valuestring);
-    TEST_ASSERT_NULL(cJSON_GetStringValue(number));
-    TEST_ASSERT_NULL(cJSON_GetStringValue(NULL));
-
-    cJSON_Delete(number);
-    cJSON_Delete(string);
-}
-
-static void cjson_create_string_reference_should_create_a_string_reference(void) {
-    const char *string = "I am a string!";
-
-    cJSON *string_reference = cJSON_CreateStringReference(string);
-    TEST_ASSERT_TRUE(string_reference->valuestring == string);
-    TEST_ASSERT_EQUAL_INT(cJSON_IsReference | cJSON_String, string_reference->type);
-
-    cJSON_Delete(string_reference);
-}
-
-static void cjson_create_object_reference_should_create_an_object_reference(void) {
-    cJSON *number_reference = NULL;
-    cJSON *number_object = cJSON_CreateObject();
-    cJSON *number = cJSON_CreateNumber(42);
-    const char key[] = "number";
-
-    TEST_ASSERT_TRUE(cJSON_IsNumber(number));
-    TEST_ASSERT_TRUE(cJSON_IsObject(number_object));
-    cJSON_AddItemToObjectCS(number_object, key, number);
-
-    number_reference = cJSON_CreateObjectReference(number);
-    TEST_ASSERT_TRUE(number_reference->child == number);
-    TEST_ASSERT_EQUAL_INT(cJSON_Object | cJSON_IsReference, number_reference->type);
-
-    cJSON_Delete(number_object);
-    cJSON_Delete(number_reference);
-}
-
-static void cjson_create_array_reference_should_create_an_array_reference(void) {
-    cJSON *number_reference = NULL;
-    cJSON *number_array = cJSON_CreateArray();
-    cJSON *number = cJSON_CreateNumber(42);
-
-    TEST_ASSERT_TRUE(cJSON_IsNumber(number));
-    TEST_ASSERT_TRUE(cJSON_IsArray(number_array));
-    cJSON_AddItemToArray(number_array, number);
-
-    number_reference = cJSON_CreateArrayReference(number);
-    TEST_ASSERT_TRUE(number_reference->child == number);
-    TEST_ASSERT_EQUAL_INT(cJSON_Array | cJSON_IsReference, number_reference->type);
-
-    cJSON_Delete(number_array);
-    cJSON_Delete(number_reference);
-}
-
-static void cjson_add_item_to_object_should_not_use_after_free_when_string_is_aliased(void)
-{
-    cJSON *object = cJSON_CreateObject();
-    cJSON *number = cJSON_CreateNumber(42);
-    char *name = (char*)cJSON_strdup((const unsigned char*)"number", &global_hooks);
-
-    TEST_ASSERT_NOT_NULL(object);
-    TEST_ASSERT_NOT_NULL(number);
-    TEST_ASSERT_NOT_NULL(name);
-
-    number->string = name;
-
-    /* The following should not have a use after free
-     * that would show up in valgrind or with AddressSanitizer */
-    cJSON_AddItemToObject(object, number->string, number);
-
-    cJSON_Delete(object);
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_array_foreach_should_loop_over_arrays);
-    RUN_TEST(cjson_array_foreach_should_not_dereference_null_pointer);
-    RUN_TEST(cjson_get_object_item_should_get_object_items);
-    RUN_TEST(cjson_get_object_item_case_sensitive_should_get_object_items);
-    RUN_TEST(typecheck_functions_should_check_type);
-    RUN_TEST(cjson_should_not_parse_to_deeply_nested_jsons);
-    RUN_TEST(cjson_set_number_value_should_set_numbers);
-    RUN_TEST(cjson_detach_item_via_pointer_should_detach_items);
-    RUN_TEST(cjson_replace_item_via_pointer_should_replace_items);
-    RUN_TEST(cjson_replace_item_in_object_should_preserve_name);
-    RUN_TEST(cjson_functions_shouldnt_crash_with_null_pointers);
-    RUN_TEST(ensure_should_fail_on_failed_realloc);
-    RUN_TEST(skip_utf8_bom_should_skip_bom);
-    RUN_TEST(skip_utf8_bom_should_not_skip_bom_if_not_at_beginning);
-    RUN_TEST(cjson_get_string_value_should_get_a_string);
-    RUN_TEST(cjson_create_string_reference_should_create_a_string_reference);
-    RUN_TEST(cjson_create_object_reference_should_create_an_object_reference);
-    RUN_TEST(cjson_create_array_reference_should_create_an_array_reference);
-    RUN_TEST(cjson_add_item_to_object_should_not_use_after_free_when_string_is_aliased);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/misc_utils_tests.c b/external_libs/cJSON/cJSON/tests/misc_utils_tests.c
deleted file mode 100644
index 7d300bc8..00000000
--- a/external_libs/cJSON/cJSON/tests/misc_utils_tests.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-#include "../cJSON_Utils.h"
-
-static void cjson_utils_functions_shouldnt_crash_with_null_pointers(void)
-{
-    cJSON *item = cJSON_CreateString("item");
-    TEST_ASSERT_NOT_NULL(item);
-
-    TEST_ASSERT_NULL(cJSONUtils_GetPointer(item, NULL));
-    TEST_ASSERT_NULL(cJSONUtils_GetPointer(NULL, "pointer"));
-    TEST_ASSERT_NULL(cJSONUtils_GetPointerCaseSensitive(NULL, "pointer"));
-    TEST_ASSERT_NULL(cJSONUtils_GetPointerCaseSensitive(item, NULL));
-    TEST_ASSERT_NULL(cJSONUtils_GeneratePatches(item, NULL));
-    TEST_ASSERT_NULL(cJSONUtils_GeneratePatches(NULL, item));
-    TEST_ASSERT_NULL(cJSONUtils_GeneratePatchesCaseSensitive(item, NULL));
-    TEST_ASSERT_NULL(cJSONUtils_GeneratePatchesCaseSensitive(NULL, item));
-    cJSONUtils_AddPatchToArray(item, "path", "add", NULL);
-    cJSONUtils_AddPatchToArray(item, "path", NULL, item);
-    cJSONUtils_AddPatchToArray(item, NULL, "add", item);
-    cJSONUtils_AddPatchToArray(NULL, "path", "add", item);
-    cJSONUtils_ApplyPatches(item, NULL);
-    cJSONUtils_ApplyPatches(NULL, item);
-    cJSONUtils_ApplyPatchesCaseSensitive(item, NULL);
-    cJSONUtils_ApplyPatchesCaseSensitive(NULL, item);
-    TEST_ASSERT_NULL(cJSONUtils_MergePatch(item, NULL));
-    item = cJSON_CreateString("item");
-    TEST_ASSERT_NULL(cJSONUtils_MergePatchCaseSensitive(item, NULL));
-    item = cJSON_CreateString("item");
-    /* these calls are actually valid */
-    /* cJSONUtils_MergePatch(NULL, item); */
-    /* cJSONUtils_MergePatchCaseSensitive(NULL, item);*/
-    /* cJSONUtils_GenerateMergePatch(item, NULL); */
-    /* cJSONUtils_GenerateMergePatch(NULL, item); */
-    /* cJSONUtils_GenerateMergePatchCaseSensitive(item, NULL); */
-    /* cJSONUtils_GenerateMergePatchCaseSensitive(NULL, item); */
-
-    TEST_ASSERT_NULL(cJSONUtils_FindPointerFromObjectTo(item, NULL));
-    TEST_ASSERT_NULL(cJSONUtils_FindPointerFromObjectTo(NULL, item));
-    cJSONUtils_SortObject(NULL);
-    cJSONUtils_SortObjectCaseSensitive(NULL);
-
-    cJSON_Delete(item);
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_utils_functions_shouldnt_crash_with_null_pointers);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/old_utils_tests.c b/external_libs/cJSON/cJSON/tests/old_utils_tests.c
deleted file mode 100644
index 08da6a6d..00000000
--- a/external_libs/cJSON/cJSON/tests/old_utils_tests.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-#include "../cJSON_Utils.h"
-
-/* JSON Apply Merge tests: */
-static const char *merges[15][3] =
-{
-    {"{\"a\":\"b\"}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
-    {"{\"a\":\"b\"}", "{\"b\":\"c\"}", "{\"a\":\"b\",\"b\":\"c\"}"},
-    {"{\"a\":\"b\"}", "{\"a\":null}", "{}"},
-    {"{\"a\":\"b\",\"b\":\"c\"}", "{\"a\":null}", "{\"b\":\"c\"}"},
-    {"{\"a\":[\"b\"]}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
-    {"{\"a\":\"c\"}", "{\"a\":[\"b\"]}", "{\"a\":[\"b\"]}"},
-    {"{\"a\":{\"b\":\"c\"}}", "{\"a\":{\"b\":\"d\",\"c\":null}}", "{\"a\":{\"b\":\"d\"}}"},
-    {"{\"a\":[{\"b\":\"c\"}]}", "{\"a\":[1]}", "{\"a\":[1]}"},
-    {"[\"a\",\"b\"]", "[\"c\",\"d\"]", "[\"c\",\"d\"]"},
-    {"{\"a\":\"b\"}", "[\"c\"]", "[\"c\"]"},
-    {"{\"a\":\"foo\"}", "null", "null"},
-    {"{\"a\":\"foo\"}", "\"bar\"", "\"bar\""},
-    {"{\"e\":null}", "{\"a\":1}", "{\"e\":null,\"a\":1}"},
-    {"[1,2]", "{\"a\":\"b\",\"c\":null}", "{\"a\":\"b\"}"},
-    {"{}","{\"a\":{\"bb\":{\"ccc\":null}}}", "{\"a\":{\"bb\":{}}}"}
-};
-
-static void json_pointer_tests(void)
-{
-    cJSON *root = NULL;
-    const char *json=
-        "{"
-        "\"foo\": [\"bar\", \"baz\"],"
-        "\"\": 0,"
-        "\"a/b\": 1,"
-        "\"c%d\": 2,"
-        "\"e^f\": 3,"
-        "\"g|h\": 4,"
-        "\"i\\\\j\": 5,"
-        "\"k\\\"l\": 6,"
-        "\" \": 7,"
-        "\"m~n\": 8"
-        "}";
-
-    root = cJSON_Parse(json);
-
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, ""), root);
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/foo"), cJSON_GetObjectItem(root, "foo"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/foo/0"), cJSON_GetObjectItem(root, "foo")->child);
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/foo/0"), cJSON_GetObjectItem(root, "foo")->child);
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/"), cJSON_GetObjectItem(root, ""));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/a~1b"), cJSON_GetObjectItem(root, "a/b"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/c%d"), cJSON_GetObjectItem(root, "c%d"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/c^f"), cJSON_GetObjectItem(root, "c^f"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/c|f"), cJSON_GetObjectItem(root, "c|f"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/i\\j"), cJSON_GetObjectItem(root, "i\\j"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/k\"l"), cJSON_GetObjectItem(root, "k\"l"));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/ "), cJSON_GetObjectItem(root, " "));
-    TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(root, "/m~0n"), cJSON_GetObjectItem(root, "m~n"));
-
-    cJSON_Delete(root);
-}
-
-static void misc_tests(void)
-{
-    /* Misc tests */
-    int numbers[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    cJSON *object = NULL;
-    cJSON *nums = NULL;
-    cJSON *num6 = NULL;
-    char *pointer = NULL;
-
-    printf("JSON Pointer construct\n");
-    object = cJSON_CreateObject();
-    nums = cJSON_CreateIntArray(numbers, 10);
-    num6 = cJSON_GetArrayItem(nums, 6);
-    cJSON_AddItemToObject(object, "numbers", nums);
-
-    pointer = cJSONUtils_FindPointerFromObjectTo(object, num6);
-    TEST_ASSERT_EQUAL_STRING("/numbers/6", pointer);
-    free(pointer);
-
-    pointer = cJSONUtils_FindPointerFromObjectTo(object, nums);
-    TEST_ASSERT_EQUAL_STRING("/numbers", pointer);
-    free(pointer);
-
-    pointer = cJSONUtils_FindPointerFromObjectTo(object, object);
-    TEST_ASSERT_EQUAL_STRING("", pointer);
-    free(pointer);
-
-    cJSON_Delete(object);
-}
-
-static void sort_tests(void)
-{
-    /* Misc tests */
-    const char *random = "QWERTYUIOPASDFGHJKLZXCVBNM";
-    char buf[2] = {'\0', '\0'};
-    cJSON *sortme = NULL;
-    size_t i = 0;
-    cJSON *current_element = NULL;
-
-    /* JSON Sort test: */
-    sortme = cJSON_CreateObject();
-    for (i = 0; i < 26; i++)
-    {
-        buf[0] = random[i];
-        cJSON_AddItemToObject(sortme, buf, cJSON_CreateNumber(1));
-    }
-
-    cJSONUtils_SortObject(sortme);
-
-    /* check sorting */
-    current_element = sortme->child->next;
-    for (i = 1; (i < 26) && (current_element != NULL) && (current_element->prev != NULL); i++)
-    {
-        TEST_ASSERT_TRUE(current_element->string[0] >= current_element->prev->string[0]);
-        current_element = current_element->next;
-    }
-
-    cJSON_Delete(sortme);
-}
-
-static void merge_tests(void)
-{
-    size_t i = 0;
-    char *patchtext = NULL;
-    char *after = NULL;
-
-    /* Merge tests: */
-    printf("JSON Merge Patch tests\n");
-    for (i = 0; i < 15; i++)
-    {
-        cJSON *object_to_be_merged = cJSON_Parse(merges[i][0]);
-        cJSON *patch = cJSON_Parse(merges[i][1]);
-        patchtext = cJSON_PrintUnformatted(patch);
-        object_to_be_merged = cJSONUtils_MergePatch(object_to_be_merged, patch);
-        after = cJSON_PrintUnformatted(object_to_be_merged);
-        TEST_ASSERT_EQUAL_STRING(merges[i][2], after);
-
-        free(patchtext);
-        free(after);
-        cJSON_Delete(object_to_be_merged);
-        cJSON_Delete(patch);
-    }
-}
-
-static void generate_merge_tests(void)
-{
-    size_t i = 0;
-    char *patchedtext = NULL;
-
-    /* Generate Merge tests: */
-    for (i = 0; i < 15; i++)
-    {
-        cJSON *from = cJSON_Parse(merges[i][0]);
-        cJSON *to = cJSON_Parse(merges[i][2]);
-        cJSON *patch = cJSONUtils_GenerateMergePatch(from,to);
-        from = cJSONUtils_MergePatch(from,patch);
-        patchedtext = cJSON_PrintUnformatted(from);
-        TEST_ASSERT_EQUAL_STRING(merges[i][2], patchedtext);
-
-        cJSON_Delete(from);
-        cJSON_Delete(to);
-        cJSON_Delete(patch);
-        free(patchedtext);
-    }
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(json_pointer_tests);
-    RUN_TEST(misc_tests);
-    RUN_TEST(sort_tests);
-    RUN_TEST(merge_tests);
-    RUN_TEST(generate_merge_tests);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_array.c b/external_libs/cJSON/cJSON/tests/parse_array.c
deleted file mode 100644
index 69e0f411..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_array.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON item[1];
-
-static void assert_is_array(cJSON *array_item)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(array_item, "Item is NULL.");
-
-    assert_not_in_list(array_item);
-    assert_has_type(array_item, cJSON_Array);
-    assert_has_no_reference(array_item);
-    assert_has_no_const_string(array_item);
-    assert_has_no_valuestring(array_item);
-    assert_has_no_string(array_item);
-}
-
-static void assert_not_array(const char *json)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*)json;
-    buffer.length = strlen(json) + sizeof("");
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_FALSE(parse_array(item, &buffer));
-    assert_is_invalid(item);
-}
-
-static void assert_parse_array(const char *json)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*)json;
-    buffer.length = strlen(json) + sizeof("");
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(parse_array(item, &buffer));
-    assert_is_array(item);
-}
-
-static void parse_array_should_parse_empty_arrays(void)
-{
-    assert_parse_array("[]");
-    assert_has_no_child(item);
-
-    assert_parse_array("[\n\t]");
-    assert_has_no_child(item);
-}
-
-
-static void parse_array_should_parse_arrays_with_one_element(void)
-{
-
-    assert_parse_array("[1]");
-    assert_has_child(item);
-    assert_has_type(item->child, cJSON_Number);
-    reset(item);
-
-    assert_parse_array("[\"hello!\"]");
-    assert_has_child(item);
-    assert_has_type(item->child, cJSON_String);
-    TEST_ASSERT_EQUAL_STRING("hello!", item->child->valuestring);
-    reset(item);
-
-    assert_parse_array("[[]]");
-    assert_has_child(item);
-    assert_is_array(item->child);
-    assert_has_no_child(item->child);
-    reset(item);
-
-    assert_parse_array("[null]");
-    assert_has_child(item);
-    assert_has_type(item->child, cJSON_NULL);
-    reset(item);
-}
-
-static void parse_array_should_parse_arrays_with_multiple_elements(void)
-{
-    assert_parse_array("[1\t,\n2, 3]");
-    assert_has_child(item);
-    TEST_ASSERT_NOT_NULL(item->child->next);
-    TEST_ASSERT_NOT_NULL(item->child->next->next);
-    TEST_ASSERT_NULL(item->child->next->next->next);
-    assert_has_type(item->child, cJSON_Number);
-    assert_has_type(item->child->next, cJSON_Number);
-    assert_has_type(item->child->next->next, cJSON_Number);
-    reset(item);
-
-    {
-        size_t i = 0;
-        cJSON *node = NULL;
-        int expected_types[7] =
-        {
-            cJSON_Number,
-            cJSON_NULL,
-            cJSON_True,
-            cJSON_False,
-            cJSON_Array,
-            cJSON_String,
-            cJSON_Object
-        };
-        assert_parse_array("[1, null, true, false, [], \"hello\", {}]");
-
-        node = item->child;
-        for (
-                i = 0;
-                (i < (sizeof(expected_types)/sizeof(int)))
-                && (node != NULL);
-                (void)i++, node = node->next)
-        {
-            TEST_ASSERT_BITS(0xFF, expected_types[i], node->type);
-        }
-        TEST_ASSERT_EQUAL_INT(i, 7);
-        reset(item);
-    }
-}
-
-static void parse_array_should_not_parse_non_arrays(void)
-{
-    assert_not_array("");
-    assert_not_array("[");
-    assert_not_array("]");
-    assert_not_array("{\"hello\":[]}");
-    assert_not_array("42");
-    assert_not_array("3.14");
-    assert_not_array("\"[]hello world!\n\"");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    memset(item, 0, sizeof(cJSON));
-
-    UNITY_BEGIN();
-    RUN_TEST(parse_array_should_parse_empty_arrays);
-    RUN_TEST(parse_array_should_parse_arrays_with_one_element);
-    RUN_TEST(parse_array_should_parse_arrays_with_multiple_elements);
-    RUN_TEST(parse_array_should_not_parse_non_arrays);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_examples.c b/external_libs/cJSON/cJSON/tests/parse_examples.c
deleted file mode 100644
index 76215bbc..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_examples.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON *parse_file(const char *filename)
-{
-    cJSON *parsed = NULL;
-    char *content = read_file(filename);
-
-    parsed = cJSON_Parse(content);
-
-    if (content != NULL)
-    {
-        free(content);
-    }
-
-    return parsed;
-}
-
-static void do_test(const char *test_name)
-{
-    char *expected = NULL;
-    char *actual = NULL;
-    cJSON *tree = NULL;
-
-    size_t test_name_length = 0;
-    /* path of the test input */
-    char *test_path = NULL;
-    /* path of the expected output */
-    char *expected_path = NULL;
-
-    test_name_length = strlen(test_name);
-
-    /* allocate file paths */
-#define TEST_DIR_PATH "inputs/"
-    test_path = (char*)malloc(sizeof(TEST_DIR_PATH) + test_name_length);
-    TEST_ASSERT_NOT_NULL_MESSAGE(test_path, "Failed to allocate test_path buffer.");
-    expected_path = (char*)malloc(sizeof(TEST_DIR_PATH) + test_name_length + sizeof(".expected"));
-    TEST_ASSERT_NOT_NULL_MESSAGE(expected_path, "Failed to allocate expected_path buffer.");
-
-    /* create file paths */
-    sprintf(test_path, TEST_DIR_PATH"%s", test_name);
-    sprintf(expected_path, TEST_DIR_PATH"%s.expected", test_name);
-
-    /* read expected output */
-    expected = read_file(expected_path);
-    TEST_ASSERT_NOT_NULL_MESSAGE(expected, "Failed to read expected output.");
-
-    /* read and parse test */
-    tree = parse_file(test_path);
-    TEST_ASSERT_NOT_NULL_MESSAGE(tree, "Failed to read of parse test.");
-
-    /* print the parsed tree */
-    actual = cJSON_Print(tree);
-    TEST_ASSERT_NOT_NULL_MESSAGE(actual, "Failed to print tree back to JSON.");
-
-
-    TEST_ASSERT_EQUAL_STRING(expected, actual);
-
-    /* cleanup resources */
-    if (expected != NULL)
-    {
-        free(expected);
-    }
-    if (tree != NULL)
-    {
-        cJSON_Delete(tree);
-    }
-    if (actual != NULL)
-    {
-        free(actual);
-    }
-    if (test_path != NULL)
-    {
-        free(test_path);
-    }
-    if (expected_path != NULL)
-    {
-        free(expected_path);
-    }
-}
-
-static void file_test1_should_be_parsed_and_printed(void)
-{
-    do_test("test1");
-}
-
-static void file_test2_should_be_parsed_and_printed(void)
-{
-    do_test("test2");
-}
-
-static void file_test3_should_be_parsed_and_printed(void)
-{
-    do_test("test3");
-}
-
-static void file_test4_should_be_parsed_and_printed(void)
-{
-    do_test("test4");
-}
-
-static void file_test5_should_be_parsed_and_printed(void)
-{
-    do_test("test5");
-}
-
-static void file_test6_should_not_be_parsed(void)
-{
-    char *test6 = NULL;
-    cJSON *tree = NULL;
-
-    test6 = read_file("inputs/test6");
-    TEST_ASSERT_NOT_NULL_MESSAGE(test6, "Failed to read test6 data.");
-
-    tree = cJSON_Parse(test6);
-    TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse what is not JSON.");
-
-    TEST_ASSERT_EQUAL_PTR_MESSAGE(test6, cJSON_GetErrorPtr(), "Error pointer is incorrect.");
-
-    if (test6 != NULL)
-    {
-        free(test6);
-    }
-    if (tree != NULL)
-    {
-        cJSON_Delete(tree);
-    }
-}
-
-static void file_test7_should_be_parsed_and_printed(void)
-{
-    do_test("test7");
-}
-
-static void file_test8_should_be_parsed_and_printed(void)
-{
-    do_test("test8");
-}
-
-static void file_test9_should_be_parsed_and_printed(void)
-{
-    do_test("test9");
-}
-
-static void file_test10_should_be_parsed_and_printed(void)
-{
-    do_test("test10");
-}
-
-static void file_test11_should_be_parsed_and_printed(void)
-{
-    do_test("test11");
-}
-
-static void test12_should_not_be_parsed(void)
-{
-    const char *test12 = "{ \"name\": ";
-    cJSON *tree = NULL;
-
-    tree = cJSON_Parse(test12);
-    TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse incomplete JSON.");
-
-    TEST_ASSERT_EQUAL_PTR_MESSAGE(test12 + strlen(test12), cJSON_GetErrorPtr(), "Error pointer is incorrect.");
-
-    if (tree != NULL)
-    {
-        cJSON_Delete(tree);
-    }
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-    RUN_TEST(file_test1_should_be_parsed_and_printed);
-    RUN_TEST(file_test2_should_be_parsed_and_printed);
-    RUN_TEST(file_test3_should_be_parsed_and_printed);
-    RUN_TEST(file_test4_should_be_parsed_and_printed);
-    RUN_TEST(file_test5_should_be_parsed_and_printed);
-    RUN_TEST(file_test6_should_not_be_parsed);
-    RUN_TEST(file_test7_should_be_parsed_and_printed);
-    RUN_TEST(file_test8_should_be_parsed_and_printed);
-    RUN_TEST(file_test9_should_be_parsed_and_printed);
-    RUN_TEST(file_test10_should_be_parsed_and_printed);
-    RUN_TEST(file_test11_should_be_parsed_and_printed);
-    RUN_TEST(test12_should_not_be_parsed);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_hex4.c b/external_libs/cJSON/cJSON/tests/parse_hex4.c
deleted file mode 100644
index 7115cbae..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_hex4.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void parse_hex4_should_parse_all_combinations(void)
-{
-    unsigned int number = 0;
-    unsigned char digits_lower[6];
-    unsigned char digits_upper[6];
-    /* test all combinations */
-    for (number = 0; number <= 0xFFFF; number++)
-    {
-        TEST_ASSERT_EQUAL_INT_MESSAGE(4, sprintf((char*)digits_lower, "%.4x", number), "sprintf failed.");
-        TEST_ASSERT_EQUAL_INT_MESSAGE(4, sprintf((char*)digits_upper, "%.4X", number), "sprintf failed.");
-
-        TEST_ASSERT_EQUAL_INT_MESSAGE(number, parse_hex4(digits_lower), "Failed to parse lowercase digits.");
-        TEST_ASSERT_EQUAL_INT_MESSAGE(number, parse_hex4(digits_upper), "Failed to parse uppercase digits.");
-    }
-}
-
-static void parse_hex4_should_parse_mixed_case(void)
-{
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"beef"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"beeF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"beEf"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"beEF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"bEef"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"bEeF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"bEEf"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"bEEF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"Beef"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BeeF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BeEf"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BeEF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEef"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEeF"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEEf"));
-    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEEF"));
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-    RUN_TEST(parse_hex4_should_parse_all_combinations);
-    RUN_TEST(parse_hex4_should_parse_mixed_case);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_number.c b/external_libs/cJSON/cJSON/tests/parse_number.c
deleted file mode 100644
index f499ab65..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_number.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON item[1];
-
-static void assert_is_number(cJSON *number_item)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(number_item, "Item is NULL.");
-
-    assert_not_in_list(number_item);
-    assert_has_no_child(number_item);
-    assert_has_type(number_item, cJSON_Number);
-    assert_has_no_reference(number_item);
-    assert_has_no_const_string(number_item);
-    assert_has_no_valuestring(number_item);
-    assert_has_no_string(number_item);
-}
-
-static void assert_parse_number(const char *string, int integer, double real)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*)string;
-    buffer.length = strlen(string) + sizeof("");
-
-    TEST_ASSERT_TRUE(parse_number(item, &buffer));
-    assert_is_number(item);
-    TEST_ASSERT_EQUAL_INT(integer, item->valueint);
-    TEST_ASSERT_EQUAL_DOUBLE(real, item->valuedouble);
-}
-
-static void parse_number_should_parse_zero(void)
-{
-    assert_parse_number("0", 0, 0);
-    assert_parse_number("0.0", 0, 0.0);
-    assert_parse_number("-0", 0, -0.0);
-}
-
-static void parse_number_should_parse_negative_integers(void)
-{
-    assert_parse_number("-1", -1, -1);
-    assert_parse_number("-32768", -32768, -32768.0);
-    assert_parse_number("-2147483648", (int)-2147483648.0, -2147483648.0);
-}
-
-static void parse_number_should_parse_positive_integers(void)
-{
-    assert_parse_number("1", 1, 1);
-    assert_parse_number("32767", 32767, 32767.0);
-    assert_parse_number("2147483647", (int)2147483647.0, 2147483647.0);
-}
-
-static void parse_number_should_parse_positive_reals(void)
-{
-    assert_parse_number("0.001", 0, 0.001);
-    assert_parse_number("10e-10", 0, 10e-10);
-    assert_parse_number("10E-10", 0, 10e-10);
-    assert_parse_number("10e10", INT_MAX, 10e10);
-    assert_parse_number("123e+127", INT_MAX, 123e127);
-    assert_parse_number("123e-128", 0, 123e-128);
-}
-
-static void parse_number_should_parse_negative_reals(void)
-{
-    assert_parse_number("-0.001", 0, -0.001);
-    assert_parse_number("-10e-10", 0, -10e-10);
-    assert_parse_number("-10E-10", 0, -10e-10);
-    assert_parse_number("-10e20", INT_MIN, -10e20);
-    assert_parse_number("-123e+127", INT_MIN, -123e127);
-    assert_parse_number("-123e-128", 0, -123e-128);
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    memset(item, 0, sizeof(cJSON));
-    UNITY_BEGIN();
-    RUN_TEST(parse_number_should_parse_zero);
-    RUN_TEST(parse_number_should_parse_negative_integers);
-    RUN_TEST(parse_number_should_parse_positive_integers);
-    RUN_TEST(parse_number_should_parse_positive_reals);
-    RUN_TEST(parse_number_should_parse_negative_reals);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_object.c b/external_libs/cJSON/cJSON/tests/parse_object.c
deleted file mode 100644
index 09858455..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_object.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON item[1];
-
-static void assert_is_object(cJSON *object_item)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(object_item, "Item is NULL.");
-
-    assert_not_in_list(object_item);
-    assert_has_type(object_item, cJSON_Object);
-    assert_has_no_reference(object_item);
-    assert_has_no_const_string(object_item);
-    assert_has_no_valuestring(object_item);
-    assert_has_no_string(object_item);
-}
-
-static void assert_is_child(cJSON *child_item, const char *name, int type)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(child_item, "Child item is NULL.");
-    TEST_ASSERT_NOT_NULL_MESSAGE(child_item->string, "Child item doesn't have a name.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(name, child_item->string, "Child item has the wrong name.");
-    TEST_ASSERT_BITS(0xFF, type, child_item->type);
-}
-
-static void assert_not_object(const char *json)
-{
-    parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    parsebuffer.content = (const unsigned char*)json;
-    parsebuffer.length = strlen(json) + sizeof("");
-    parsebuffer.hooks = global_hooks;
-
-    TEST_ASSERT_FALSE(parse_object(item, &parsebuffer));
-    assert_is_invalid(item);
-    reset(item);
-}
-
-static void assert_parse_object(const char *json)
-{
-    parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    parsebuffer.content = (const unsigned char*)json;
-    parsebuffer.length = strlen(json) + sizeof("");
-    parsebuffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(parse_object(item, &parsebuffer));
-    assert_is_object(item);
-}
-
-static void parse_object_should_parse_empty_objects(void)
-{
-    assert_parse_object("{}");
-    assert_has_no_child(item);
-    reset(item);
-
-    assert_parse_object("{\n\t}");
-    assert_has_no_child(item);
-    reset(item);
-}
-
-static void parse_object_should_parse_objects_with_one_element(void)
-{
-
-    assert_parse_object("{\"one\":1}");
-    assert_is_child(item->child, "one", cJSON_Number);
-    reset(item);
-
-    assert_parse_object("{\"hello\":\"world!\"}");
-    assert_is_child(item->child, "hello", cJSON_String);
-    reset(item);
-
-    assert_parse_object("{\"array\":[]}");
-    assert_is_child(item->child, "array", cJSON_Array);
-    reset(item);
-
-    assert_parse_object("{\"null\":null}");
-    assert_is_child(item->child, "null", cJSON_NULL);
-    reset(item);
-}
-
-static void parse_object_should_parse_objects_with_multiple_elements(void)
-{
-    assert_parse_object("{\"one\":1\t,\t\"two\"\n:2, \"three\":3}");
-    assert_is_child(item->child, "one", cJSON_Number);
-    assert_is_child(item->child->next, "two", cJSON_Number);
-    assert_is_child(item->child->next->next, "three", cJSON_Number);
-    reset(item);
-
-    {
-        size_t i = 0;
-        cJSON *node = NULL;
-        int expected_types[7] =
-        {
-            cJSON_Number,
-            cJSON_NULL,
-            cJSON_True,
-            cJSON_False,
-            cJSON_Array,
-            cJSON_String,
-            cJSON_Object
-        };
-        const char *expected_names[7] =
-        {
-            "one",
-            "NULL",
-            "TRUE",
-            "FALSE",
-            "array",
-            "world",
-            "object"
-        };
-        assert_parse_object("{\"one\":1, \"NULL\":null, \"TRUE\":true, \"FALSE\":false, \"array\":[], \"world\":\"hello\", \"object\":{}}");
-
-        node = item->child;
-        for (
-                i = 0;
-                (i < (sizeof(expected_types)/sizeof(int)))
-                && (node != NULL);
-                (void)i++, node = node->next)
-        {
-            assert_is_child(node, expected_names[i], expected_types[i]);
-        }
-        TEST_ASSERT_EQUAL_INT(i, 7);
-        reset(item);
-    }
-}
-
-static void parse_object_should_not_parse_non_objects(void)
-{
-    assert_not_object("");
-    assert_not_object("{");
-    assert_not_object("}");
-    assert_not_object("[\"hello\",{}]");
-    assert_not_object("42");
-    assert_not_object("3.14");
-    assert_not_object("\"{}hello world!\n\"");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    memset(item, 0, sizeof(cJSON));
-
-    UNITY_BEGIN();
-    RUN_TEST(parse_object_should_parse_empty_objects);
-    RUN_TEST(parse_object_should_not_parse_non_objects);
-    RUN_TEST(parse_object_should_parse_objects_with_multiple_elements);
-    RUN_TEST(parse_object_should_parse_objects_with_one_element);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_string.c b/external_libs/cJSON/cJSON/tests/parse_string.c
deleted file mode 100644
index ceb1a896..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_string.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON item[1];
-
-static void assert_is_string(cJSON *string_item)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(string_item, "Item is NULL.");
-
-    assert_not_in_list(string_item);
-    assert_has_no_child(string_item);
-    assert_has_type(string_item, cJSON_String);
-    assert_has_no_reference(string_item);
-    assert_has_no_const_string(string_item);
-    assert_has_valuestring(string_item);
-    assert_has_no_string(string_item);
-}
-
-static void assert_parse_string(const char *string, const char *expected)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*)string;
-    buffer.length = strlen(string) + sizeof("");
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE_MESSAGE(parse_string(item, &buffer), "Couldn't parse string.");
-    assert_is_string(item);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, item->valuestring, "The parsed result isn't as expected.");
-    global_hooks.deallocate(item->valuestring);
-    item->valuestring = NULL;
-}
-
-static void assert_not_parse_string(const char * const string)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*)string;
-    buffer.length = strlen(string) + sizeof("");
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_FALSE_MESSAGE(parse_string(item, &buffer), "Malformed string should not be accepted.");
-    assert_is_invalid(item);
-}
-
-
-
-static void parse_string_should_parse_strings(void)
-{
-    assert_parse_string("\"\"", "");
-    assert_parse_string(
-        "\" !\\\"#$%&'()*+,-./\\/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_'abcdefghijklmnopqrstuvwxyz{|}~\"",
-        " !\"#$%&'()*+,-.//0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'abcdefghijklmnopqrstuvwxyz{|}~");
-    assert_parse_string(
-        "\"\\\"\\\\\\/\\b\\f\\n\\r\\t\\u20AC\\u732b\"",
-        "\"\\/\b\f\n\r\t€猫");
-    reset(item);
-    assert_parse_string("\"\b\f\n\r\t\"", "\b\f\n\r\t");
-    reset(item);
-}
-
-static void parse_string_should_parse_utf16_surrogate_pairs(void)
-{
-    assert_parse_string("\"\\uD83D\\udc31\"", "🐱");
-    reset(item);
-}
-
-static void parse_string_should_not_parse_non_strings(void)
-{
-    assert_not_parse_string("this\" is not a string\"");
-    reset(item);
-    assert_not_parse_string("");
-    reset(item);
-}
-
-static void parse_string_should_not_parse_invalid_backslash(void)
-{
-    assert_not_parse_string("Abcdef\\123");
-    reset(item);
-    assert_not_parse_string("Abcdef\\e23");
-    reset(item);
-}
-
-static void parse_string_should_not_overflow_with_closing_backslash(void)
-{
-    assert_not_parse_string("\"000000000000000000\\");
-    reset(item);
-}
-
-static void parse_string_should_parse_bug_94(void)
-{
-    const char string[] = "\"~!@\\\\#$%^&*()\\\\\\\\-\\\\+{}[]:\\\\;\\\\\\\"\\\\<\\\\>?/.,DC=ad,DC=com\"";
-    assert_parse_string(string, "~!@\\#$%^&*()\\\\-\\+{}[]:\\;\\\"\\<\\>?/.,DC=ad,DC=com");
-    reset(item);
-}
-
-int main(void)
-{
-    /* initialize cJSON item and error pointer */
-    memset(item, 0, sizeof(cJSON));
-
-    UNITY_BEGIN();
-    RUN_TEST(parse_string_should_parse_strings);
-    RUN_TEST(parse_string_should_parse_utf16_surrogate_pairs);
-    RUN_TEST(parse_string_should_not_parse_non_strings);
-    RUN_TEST(parse_string_should_not_parse_invalid_backslash);
-    RUN_TEST(parse_string_should_parse_bug_94);
-    RUN_TEST(parse_string_should_not_overflow_with_closing_backslash);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_value.c b/external_libs/cJSON/cJSON/tests/parse_value.c
deleted file mode 100644
index 08ec3e7a..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_value.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static cJSON item[1];
-
-static void assert_is_value(cJSON *value_item, int type)
-{
-    TEST_ASSERT_NOT_NULL_MESSAGE(value_item, "Item is NULL.");
-
-    assert_not_in_list(value_item);
-    assert_has_type(value_item, type);
-    assert_has_no_reference(value_item);
-    assert_has_no_const_string(value_item);
-    assert_has_no_string(value_item);
-}
-
-static void assert_parse_value(const char *string, int type)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = (const unsigned char*) string;
-    buffer.length = strlen(string) + sizeof("");
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(parse_value(item, &buffer));
-    assert_is_value(item, type);
-}
-
-static void parse_value_should_parse_null(void)
-{
-    assert_parse_value("null", cJSON_NULL);
-    reset(item);
-}
-
-static void parse_value_should_parse_true(void)
-{
-    assert_parse_value("true", cJSON_True);
-    reset(item);
-}
-
-static void parse_value_should_parse_false(void)
-{
-    assert_parse_value("false", cJSON_False);
-    reset(item);
-}
-
-static void parse_value_should_parse_number(void)
-{
-    assert_parse_value("1.5", cJSON_Number);
-    reset(item);
-}
-
-static void parse_value_should_parse_string(void)
-{
-    assert_parse_value("\"\"", cJSON_String);
-    reset(item);
-    assert_parse_value("\"hello\"", cJSON_String);
-    reset(item);
-}
-
-static void parse_value_should_parse_array(void)
-{
-    assert_parse_value("[]", cJSON_Array);
-    reset(item);
-}
-
-static void parse_value_should_parse_object(void)
-{
-    assert_parse_value("{}", cJSON_Object);
-    reset(item);
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    memset(item, 0, sizeof(cJSON));
-    UNITY_BEGIN();
-    RUN_TEST(parse_value_should_parse_null);
-    RUN_TEST(parse_value_should_parse_true);
-    RUN_TEST(parse_value_should_parse_false);
-    RUN_TEST(parse_value_should_parse_number);
-    RUN_TEST(parse_value_should_parse_string);
-    RUN_TEST(parse_value_should_parse_array);
-    RUN_TEST(parse_value_should_parse_object);
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/parse_with_opts.c b/external_libs/cJSON/cJSON/tests/parse_with_opts.c
deleted file mode 100644
index 84b69cfc..00000000
--- a/external_libs/cJSON/cJSON/tests/parse_with_opts.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void parse_with_opts_should_handle_null(void)
-{
-    const char *error_pointer = NULL;
-    cJSON *item = NULL;
-    TEST_ASSERT_NULL_MESSAGE(cJSON_ParseWithOpts(NULL, &error_pointer, false), "Failed to handle NULL input.");
-    item = cJSON_ParseWithOpts("{}", NULL, false);
-    TEST_ASSERT_NOT_NULL_MESSAGE(item, "Failed to handle NULL error pointer.");
-    cJSON_Delete(item);
-    TEST_ASSERT_NULL_MESSAGE(cJSON_ParseWithOpts(NULL, NULL, false), "Failed to handle both NULL.");
-    TEST_ASSERT_NULL_MESSAGE(cJSON_ParseWithOpts("{", NULL, false), "Failed to handle NULL error pointer with parse error.");
-}
-
-static void parse_with_opts_should_handle_empty_strings(void)
-{
-    const char empty_string[] = "";
-    const char *error_pointer = NULL;
-
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, NULL, false));
-    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
-
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, &error_pointer, false));
-    TEST_ASSERT_EQUAL_PTR(empty_string, error_pointer);
-    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
-}
-
-static void parse_with_opts_should_handle_incomplete_json(void)
-{
-    const char json[] = "{ \"name\": ";
-    const char *parse_end = NULL;
-
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts(json, &parse_end, false));
-    TEST_ASSERT_EQUAL_PTR(json + strlen(json), parse_end);
-    TEST_ASSERT_EQUAL_PTR(json + strlen(json), cJSON_GetErrorPtr());
-}
-
-static void parse_with_opts_should_require_null_if_requested(void)
-{
-    cJSON *item = cJSON_ParseWithOpts("{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(item);
-    cJSON_Delete(item);
-    item = cJSON_ParseWithOpts("{} \n", NULL, true);
-    TEST_ASSERT_NOT_NULL(item);
-    cJSON_Delete(item);
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts("{}x", NULL, true));
-}
-
-static void parse_with_opts_should_return_parse_end(void)
-{
-    const char json[] = "[] empty array XD";
-    const char *parse_end = NULL;
-
-    cJSON *item = cJSON_ParseWithOpts(json, &parse_end, false);
-    TEST_ASSERT_NOT_NULL(item);
-    TEST_ASSERT_EQUAL_PTR(json + 2, parse_end);
-    cJSON_Delete(item);
-}
-
-static void parse_with_opts_should_parse_utf8_bom(void)
-{
-    cJSON *with_bom = NULL;
-    cJSON *without_bom = NULL;
-
-    with_bom = cJSON_ParseWithOpts("\xEF\xBB\xBF{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-    without_bom = cJSON_ParseWithOpts("{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-
-    TEST_ASSERT_TRUE(cJSON_Compare(with_bom, without_bom, true));
-
-    cJSON_Delete(with_bom);
-    cJSON_Delete(without_bom);
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(parse_with_opts_should_handle_null);
-    RUN_TEST(parse_with_opts_should_handle_empty_strings);
-    RUN_TEST(parse_with_opts_should_handle_incomplete_json);
-    RUN_TEST(parse_with_opts_should_require_null_if_requested);
-    RUN_TEST(parse_with_opts_should_return_parse_end);
-    RUN_TEST(parse_with_opts_should_parse_utf8_bom);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/print_array.c b/external_libs/cJSON/cJSON/tests/print_array.c
deleted file mode 100644
index 4bee17f9..00000000
--- a/external_libs/cJSON/cJSON/tests/print_array.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void assert_print_array(const char * const expected, const char * const input)
-{
-    unsigned char printed_unformatted[1024];
-    unsigned char printed_formatted[1024];
-
-    cJSON item[1];
-
-    printbuffer formatted_buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-
-    parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    parsebuffer.content = (const unsigned char*)input;
-    parsebuffer.length = strlen(input) + sizeof("");
-    parsebuffer.hooks = global_hooks;
-
-    /* buffer for formatted printing */
-    formatted_buffer.buffer = printed_formatted;
-    formatted_buffer.length = sizeof(printed_formatted);
-    formatted_buffer.offset = 0;
-    formatted_buffer.noalloc = true;
-    formatted_buffer.hooks = global_hooks;
-
-    /* buffer for unformatted printing */
-    unformatted_buffer.buffer = printed_unformatted;
-    unformatted_buffer.length = sizeof(printed_unformatted);
-    unformatted_buffer.offset = 0;
-    unformatted_buffer.noalloc = true;
-    unformatted_buffer.hooks = global_hooks;
-
-    memset(item, 0, sizeof(item));
-    TEST_ASSERT_TRUE_MESSAGE(parse_array(item, &parsebuffer), "Failed to parse array.");
-
-    unformatted_buffer.format = false;
-    TEST_ASSERT_TRUE_MESSAGE(print_array(item, &unformatted_buffer), "Failed to print unformatted string.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted array is not correct.");
-
-    formatted_buffer.format = true;
-    TEST_ASSERT_TRUE_MESSAGE(print_array(item, &formatted_buffer), "Failed to print formatted string.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted array is not correct.");
-
-    reset(item);
-}
-
-static void print_array_should_print_empty_arrays(void)
-{
-    assert_print_array("[]", "[]");
-}
-
-static void print_array_should_print_arrays_with_one_element(void)
-{
-
-    assert_print_array("[1]", "[1]");
-    assert_print_array("[\"hello!\"]", "[\"hello!\"]");
-    assert_print_array("[[]]", "[[]]");
-    assert_print_array("[null]", "[null]");
-}
-
-static void print_array_should_print_arrays_with_multiple_elements(void)
-{
-    assert_print_array("[1, 2, 3]", "[1,2,3]");
-    assert_print_array("[1, null, true, false, [], \"hello\", {\n\t}]", "[1,null,true,false,[],\"hello\",{}]");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    UNITY_BEGIN();
-
-    RUN_TEST(print_array_should_print_empty_arrays);
-    RUN_TEST(print_array_should_print_arrays_with_one_element);
-    RUN_TEST(print_array_should_print_arrays_with_multiple_elements);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/print_number.c b/external_libs/cJSON/cJSON/tests/print_number.c
deleted file mode 100644
index 5ebb3489..00000000
--- a/external_libs/cJSON/cJSON/tests/print_number.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void assert_print_number(const char *expected, double input)
-{
-    unsigned char printed[1024];
-    cJSON item[1];
-    printbuffer buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.buffer = printed;
-    buffer.length = sizeof(printed);
-    buffer.offset = 0;
-    buffer.noalloc = true;
-    buffer.hooks = global_hooks;
-
-    memset(item, 0, sizeof(item));
-    cJSON_SetNumberValue(item, input);
-
-    TEST_ASSERT_TRUE_MESSAGE(print_number(item, &buffer), "Failed to print number.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, buffer.buffer, "Printed number is not as expected.");
-}
-
-static void print_number_should_print_zero(void)
-{
-    assert_print_number("0", 0);
-}
-
-static void print_number_should_print_negative_integers(void)
-{
-    assert_print_number("-1", -1.0);
-    assert_print_number("-32768", -32768.0);
-    assert_print_number("-2147483648", -2147483648.0);
-}
-
-static void print_number_should_print_positive_integers(void)
-{
-    assert_print_number("1", 1.0);
-    assert_print_number("32767", 32767.0);
-    assert_print_number("2147483647", 2147483647.0);
-}
-
-static void print_number_should_print_positive_reals(void)
-{
-    assert_print_number("0.123", 0.123);
-    assert_print_number("1e-09", 10e-10);
-    assert_print_number("1000000000000", 10e11);
-    assert_print_number("1.23e+129", 123e+127);
-    assert_print_number("1.23e-126", 123e-128);
-    assert_print_number("3.1415926535897931", 3.1415926535897931);
-}
-
-static void print_number_should_print_negative_reals(void)
-{
-    assert_print_number("-0.0123", -0.0123);
-    assert_print_number("-1e-09", -10e-10);
-    assert_print_number("-1e+21", -10e20);
-    assert_print_number("-1.23e+129", -123e+127);
-    assert_print_number("-1.23e-126", -123e-128);
-}
-
-static void print_number_should_print_non_number(void)
-{
-    TEST_IGNORE();
-    /* FIXME: Cannot test this easily in C89! */
-    /* assert_print_number("null", NaN); */
-    /* assert_print_number("null", INFTY); */
-    /* assert_print_number("null", -INFTY); */
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    UNITY_BEGIN();
-
-    RUN_TEST(print_number_should_print_zero);
-    RUN_TEST(print_number_should_print_negative_integers);
-    RUN_TEST(print_number_should_print_positive_integers);
-    RUN_TEST(print_number_should_print_positive_reals);
-    RUN_TEST(print_number_should_print_negative_reals);
-    RUN_TEST(print_number_should_print_non_number);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/print_object.c b/external_libs/cJSON/cJSON/tests/print_object.c
deleted file mode 100644
index 70bbb43c..00000000
--- a/external_libs/cJSON/cJSON/tests/print_object.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void assert_print_object(const char * const expected, const char * const input)
-{
-    unsigned char printed_unformatted[1024];
-    unsigned char printed_formatted[1024];
-
-    cJSON item[1];
-
-    printbuffer formatted_buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-
-    /* buffer for parsing */
-    parsebuffer.content = (const unsigned char*)input;
-    parsebuffer.length = strlen(input) + sizeof("");
-    parsebuffer.hooks = global_hooks;
-
-    /* buffer for formatted printing */
-    formatted_buffer.buffer = printed_formatted;
-    formatted_buffer.length = sizeof(printed_formatted);
-    formatted_buffer.offset = 0;
-    formatted_buffer.noalloc = true;
-    formatted_buffer.hooks = global_hooks;
-
-    /* buffer for unformatted printing */
-    unformatted_buffer.buffer = printed_unformatted;
-    unformatted_buffer.length = sizeof(printed_unformatted);
-    unformatted_buffer.offset = 0;
-    unformatted_buffer.noalloc = true;
-    unformatted_buffer.hooks = global_hooks;
-
-    memset(item, 0, sizeof(item));
-    TEST_ASSERT_TRUE_MESSAGE(parse_object(item, &parsebuffer), "Failed to parse object.");
-
-    unformatted_buffer.format = false;
-    TEST_ASSERT_TRUE_MESSAGE(print_object(item, &unformatted_buffer), "Failed to print unformatted string.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted object is not correct.");
-
-    formatted_buffer.format = true;
-    TEST_ASSERT_TRUE_MESSAGE(print_object(item, &formatted_buffer), "Failed to print formatted string.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed_formatted, "Formatted ojbect is not correct.");
-
-    reset(item);
-}
-
-static void print_object_should_print_empty_objects(void)
-{
-    assert_print_object("{\n}", "{}");
-}
-
-static void print_object_should_print_objects_with_one_element(void)
-{
-
-    assert_print_object("{\n\t\"one\":\t1\n}", "{\"one\":1}");
-    assert_print_object("{\n\t\"hello\":\t\"world!\"\n}", "{\"hello\":\"world!\"}");
-    assert_print_object("{\n\t\"array\":\t[]\n}", "{\"array\":[]}");
-    assert_print_object("{\n\t\"null\":\tnull\n}", "{\"null\":null}");
-}
-
-static void print_object_should_print_objects_with_multiple_elements(void)
-{
-    assert_print_object("{\n\t\"one\":\t1,\n\t\"two\":\t2,\n\t\"three\":\t3\n}", "{\"one\":1,\"two\":2,\"three\":3}");
-    assert_print_object("{\n\t\"one\":\t1,\n\t\"NULL\":\tnull,\n\t\"TRUE\":\ttrue,\n\t\"FALSE\":\tfalse,\n\t\"array\":\t[],\n\t\"world\":\t\"hello\",\n\t\"object\":\t{\n\t}\n}", "{\"one\":1,\"NULL\":null,\"TRUE\":true,\"FALSE\":false,\"array\":[],\"world\":\"hello\",\"object\":{}}");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    UNITY_BEGIN();
-
-    RUN_TEST(print_object_should_print_empty_objects);
-    RUN_TEST(print_object_should_print_objects_with_one_element);
-    RUN_TEST(print_object_should_print_objects_with_multiple_elements);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/print_string.c b/external_libs/cJSON/cJSON/tests/print_string.c
deleted file mode 100644
index 83de1e7a..00000000
--- a/external_libs/cJSON/cJSON/tests/print_string.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void assert_print_string(const char *expected, const char *input)
-{
-    unsigned char printed[1024];
-    printbuffer buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.buffer = printed;
-    buffer.length = sizeof(printed);
-    buffer.offset = 0;
-    buffer.noalloc = true;
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE_MESSAGE(print_string_ptr((const unsigned char*)input, &buffer), "Failed to print string.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, printed, "The printed string isn't as expected.");
-}
-
-static void print_string_should_print_empty_strings(void)
-{
-    assert_print_string("\"\"", "");
-    assert_print_string("\"\"", NULL);
-}
-
-static void print_string_should_print_ascii(void)
-{
-    char ascii[0x7F];
-    size_t i = 1;
-
-    /* create ascii table */
-    for (i = 1; i < 0x7F; i++)
-    {
-        ascii[i-1] = (char)i;
-    }
-    ascii[0x7F-1] = '\0';
-
-    assert_print_string("\"\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\"",
-            ascii);
-}
-
-static void print_string_should_print_utf8(void)
-{
-    assert_print_string("\"ü猫慕\"", "ü猫慕");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    UNITY_BEGIN();
-
-    RUN_TEST(print_string_should_print_empty_strings);
-    RUN_TEST(print_string_should_print_ascii);
-    RUN_TEST(print_string_should_print_utf8);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/print_value.c b/external_libs/cJSON/cJSON/tests/print_value.c
deleted file mode 100644
index d5908232..00000000
--- a/external_libs/cJSON/cJSON/tests/print_value.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static void assert_print_value(const char *input)
-{
-    unsigned char printed[1024];
-    cJSON item[1];
-    printbuffer buffer = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-    parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.buffer = printed;
-    buffer.length = sizeof(printed);
-    buffer.offset = 0;
-    buffer.noalloc = true;
-    buffer.hooks = global_hooks;
-
-    parsebuffer.content = (const unsigned char*)input;
-    parsebuffer.length = strlen(input) + sizeof("");
-    parsebuffer.hooks = global_hooks;
-
-    memset(item, 0, sizeof(item));
-
-    TEST_ASSERT_TRUE_MESSAGE(parse_value(item, &parsebuffer), "Failed to parse value.");
-
-    TEST_ASSERT_TRUE_MESSAGE(print_value(item, &buffer), "Failed to print value.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(input, buffer.buffer, "Printed value is not as expected.");
-
-    reset(item);
-}
-
-static void print_value_should_print_null(void)
-{
-    assert_print_value("null");
-}
-
-static void print_value_should_print_true(void)
-{
-    assert_print_value("true");
-}
-
-static void print_value_should_print_false(void)
-{
-    assert_print_value("false");
-}
-
-static void print_value_should_print_number(void)
-{
-    assert_print_value("1.5");
-}
-
-static void print_value_should_print_string(void)
-{
-    assert_print_value("\"\"");
-    assert_print_value("\"hello\"");
-}
-
-static void print_value_should_print_array(void)
-{
-    assert_print_value("[]");
-}
-
-static void print_value_should_print_object(void)
-{
-    assert_print_value("{}");
-}
-
-int main(void)
-{
-    /* initialize cJSON item */
-    UNITY_BEGIN();
-
-    RUN_TEST(print_value_should_print_null);
-    RUN_TEST(print_value_should_print_true);
-    RUN_TEST(print_value_should_print_false);
-    RUN_TEST(print_value_should_print_number);
-    RUN_TEST(print_value_should_print_string);
-    RUN_TEST(print_value_should_print_array);
-    RUN_TEST(print_value_should_print_object);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/readme_examples.c b/external_libs/cJSON/cJSON/tests/readme_examples.c
deleted file mode 100644
index f3fa4438..00000000
--- a/external_libs/cJSON/cJSON/tests/readme_examples.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-static const char *json = "{\n\
-\t\"name\":\t\"Awesome 4K\",\n\
-\t\"resolutions\":\t[{\n\
-\t\t\t\"width\":\t1280,\n\
-\t\t\t\"height\":\t720\n\
-\t\t}, {\n\
-\t\t\t\"width\":\t1920,\n\
-\t\t\t\"height\":\t1080\n\
-\t\t}, {\n\
-\t\t\t\"width\":\t3840,\n\
-\t\t\t\"height\":\t2160\n\
-\t\t}]\n\
-}";
-
-static char* create_monitor(void)
-{
-    const unsigned int resolution_numbers[3][2] = {
-        {1280, 720},
-        {1920, 1080},
-        {3840, 2160}
-    };
-    char *string = NULL;
-    cJSON *name = NULL;
-    cJSON *resolutions = NULL;
-    cJSON *resolution = NULL;
-    cJSON *width = NULL;
-    cJSON *height = NULL;
-    size_t index = 0;
-
-    cJSON *monitor = cJSON_CreateObject();
-    if (monitor == NULL)
-    {
-        goto end;
-    }
-
-    name = cJSON_CreateString("Awesome 4K");
-    if (name == NULL)
-    {
-        goto end;
-    }
-    /* after creation was successful, immediately add it to the monitor,
-     * thereby transfering ownership of the pointer to it */
-    cJSON_AddItemToObject(monitor, "name", name);
-
-    resolutions = cJSON_CreateArray();
-    if (resolutions == NULL)
-    {
-        goto end;
-    }
-    cJSON_AddItemToObject(monitor, "resolutions", resolutions);
-
-    for (index = 0; index < (sizeof(resolution_numbers) / (2 * sizeof(int))); ++index)
-    {
-        resolution = cJSON_CreateObject();
-        if (resolution == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToArray(resolutions, resolution);
-
-        width = cJSON_CreateNumber(resolution_numbers[index][0]);
-        if (width == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToObject(resolution, "width", width);
-
-        height = cJSON_CreateNumber(resolution_numbers[index][1]);
-        if (height == NULL)
-        {
-            goto end;
-        }
-        cJSON_AddItemToObject(resolution, "height", height);
-    }
-
-    string = cJSON_Print(monitor);
-    if (string == NULL)
-    {
-        fprintf(stderr, "Failed to print monitor.\n");
-    }
-
-end:
-    cJSON_Delete(monitor);
-    return string;
-}
-
-static char *create_monitor_with_helpers(void)
-{
-    const unsigned int resolution_numbers[3][2] = {
-        {1280, 720},
-        {1920, 1080},
-        {3840, 2160}
-    };
-    char *string = NULL;
-    cJSON *resolutions = NULL;
-    size_t index = 0;
-
-    cJSON *monitor = cJSON_CreateObject();
-
-    if (cJSON_AddStringToObject(monitor, "name", "Awesome 4K") == NULL)
-    {
-        goto end;
-    }
-
-    resolutions = cJSON_AddArrayToObject(monitor, "resolutions");
-    if (resolutions == NULL)
-    {
-        goto end;
-    }
-
-    for (index = 0; index < (sizeof(resolution_numbers) / (2 * sizeof(int))); ++index)
-    {
-        cJSON *resolution = cJSON_CreateObject();
-
-        if (cJSON_AddNumberToObject(resolution, "width", resolution_numbers[index][0]) == NULL)
-        {
-            goto end;
-        }
-
-        if(cJSON_AddNumberToObject(resolution, "height", resolution_numbers[index][1]) == NULL)
-        {
-            goto end;
-        }
-
-        cJSON_AddItemToArray(resolutions, resolution);
-    }
-
-    string = cJSON_Print(monitor);
-    if (string == NULL) {
-        fprintf(stderr, "Failed to print monitor.\n");
-    }
-
-end:
-    cJSON_Delete(monitor);
-    return string;
-}
-
-/* return 1 if the monitor supports full hd, 0 otherwise */
-static int supports_full_hd(const char * const monitor)
-{
-    const cJSON *resolution = NULL;
-    const cJSON *resolutions = NULL;
-    const cJSON *name = NULL;
-    int status = 0;
-    cJSON *monitor_json = cJSON_Parse(monitor);
-    if (monitor_json == NULL)
-    {
-        const char *error_ptr = cJSON_GetErrorPtr();
-        if (error_ptr != NULL)
-        {
-            fprintf(stderr, "Error before: %s\n", error_ptr);
-        }
-        status = 0;
-        goto end;
-    }
-
-    name = cJSON_GetObjectItemCaseSensitive(monitor_json, "name");
-    if (cJSON_IsString(name) && (name->valuestring != NULL))
-    {
-        printf("Checking monitor \"%s\"\n", name->valuestring);
-    }
-
-    resolutions = cJSON_GetObjectItemCaseSensitive(monitor_json, "resolutions");
-    cJSON_ArrayForEach(resolution, resolutions)
-    {
-        cJSON *width = cJSON_GetObjectItemCaseSensitive(resolution, "width");
-        cJSON *height = cJSON_GetObjectItemCaseSensitive(resolution, "height");
-
-        if (!cJSON_IsNumber(width) || !cJSON_IsNumber(height))
-        {
-            status = 0;
-            goto end;
-        }
-
-        if ((width->valuedouble == 1920) && (height->valuedouble == 1080))
-        {
-            status = 1;
-            goto end;
-        }
-    }
-
-end:
-    cJSON_Delete(monitor_json);
-    return status;
-}
-
-static void create_monitor_should_create_a_monitor(void)
-{
-    char *monitor = create_monitor();
-
-    TEST_ASSERT_EQUAL_STRING(monitor, json);
-
-    free(monitor);
-}
-
-static void create_monitor_with_helpers_should_create_a_monitor(void)
-{
-    char *monitor = create_monitor_with_helpers();
-
-    TEST_ASSERT_EQUAL_STRING(json, monitor);
-
-    free(monitor);
-}
-
-static void supports_full_hd_should_check_for_full_hd_support(void)
-{
-    static const char *monitor_without_hd = "{\n\
-\t\t\"name\": \"lame monitor\",\n\
-\t\t\"resolutions\":\t[{\n\
-\t\t\t\"width\":\t640,\n\
-\t\t\t\"height\":\t480\n\
-\t\t}]\n\
-}";
-
-    TEST_ASSERT(supports_full_hd(json));
-    TEST_ASSERT_FALSE(supports_full_hd(monitor_without_hd));
-}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(create_monitor_should_create_a_monitor);
-    RUN_TEST(create_monitor_with_helpers_should_create_a_monitor);
-    RUN_TEST(supports_full_hd_should_check_for_full_hd_support);
-
-    return UNITY_END();
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/.gitattributes b/external_libs/cJSON/cJSON/tests/unity/.gitattributes
deleted file mode 100644
index ad952260..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/.gitattributes
+++ /dev/null
@@ -1,30 +0,0 @@
-*           text=auto
-
-# These files are text and should be normalized (convert crlf to lf)
-*.rb        text
-*.test      text
-*.c         text
-*.cpp       text
-*.h         text
-*.txt       text
-*.yml       text
-*.s79       text
-*.bat       text
-*.xcl       text
-*.inc       text
-*.info      text
-*.md        text
-makefile    text
-rakefile    text
-
-
-#These files are binary and should not be normalized
-*.doc       binary
-*.odt       binary
-*.pdf       binary
-*.ewd       binary
-*.eww       binary
-*.dni       binary
-*.wsdt      binary
-*.dbgdt     binary
-*.mac       binary
diff --git a/external_libs/cJSON/cJSON/tests/unity/.gitignore b/external_libs/cJSON/cJSON/tests/unity/.gitignore
deleted file mode 100644
index a383c3cc..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-build/
-test/sandbox
-.DS_Store
-examples/example_1/test1.exe
-examples/example_1/test2.exe
-examples/example_2/all_tests.exe
-examples/example_1/test1.out
-examples/example_1/test2.out
-examples/example_2/all_tests.out
diff --git a/external_libs/cJSON/cJSON/tests/unity/.travis.yml b/external_libs/cJSON/cJSON/tests/unity/.travis.yml
deleted file mode 100644
index bd165b1e..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: c
-
-matrix:
- include:
-    - os: osx
-      compiler: clang
-      osx_image: xcode7.3
-    - os: linux
-      dist: trusty
-      compiler: gcc
-
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.1 && rvm use 2.1 && ruby -v; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install --assume-yes --quiet gcc-multilib; fi
-install:
-  - gem install rspec
-  - gem install rubocop
-script:
-  - cd test && rake ci
-  - make -s
-  - make -s DEBUG=-m32 #32-bit architecture with 64-bit support
-  - make -s DEBUG=-m32 UNITY_SUPPORT_64= #32-bit build without 64-bit types
-  - make -s UNITY_INCLUDE_DOUBLE= # without double
-  - cd ../extras/fixture/test && rake ci
-  - make -s default noStdlibMalloc
-  - make -s C89
-  - cd ../../../examples/example_1 && make -s ci
-  - cd ../example_2 && make -s ci
-  - cd ../example_3 && rake
diff --git a/external_libs/cJSON/cJSON/tests/unity/README.md b/external_libs/cJSON/cJSON/tests/unity/README.md
deleted file mode 100644
index ec73b4a1..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/README.md
+++ /dev/null
@@ -1,231 +0,0 @@
-Unity Test API
-==============
-
-[![Unity Build Status](https://api.travis-ci.org/ThrowTheSwitch/Unity.png?branch=master)](https://travis-ci.org/ThrowTheSwitch/Unity)
-__Copyright (c) 2007 - 2017 Unity Project by Mike Karlesky, Mark VanderVoord, and Greg Williams__
-
-Running Tests
--------------
-
-    RUN_TEST(func, linenum)
-
-Each Test is run within the macro `RUN_TEST`.  This macro performs necessary setup before the test is called and handles cleanup and result tabulation afterwards.
-
-Ignoring Tests
---------------
-
-There are times when a test is incomplete or not valid for some reason.  At these times, TEST_IGNORE can be called.  Control will immediately be returned to the caller of the test, and no failures will be returned.
-
-    TEST_IGNORE()
-
-Ignore this test and return immediately
-
-    TEST_IGNORE_MESSAGE (message)
-
-Ignore this test and return immediately.  Output a message stating why the test was ignored.
-
-Aborting Tests
---------------
-
-There are times when a test will contain an infinite loop on error conditions, or there may be reason to escape from the test early without executing the rest of the test.  A pair of macros support this functionality in Unity.  The first `TEST_PROTECT` sets up the feature, and handles emergency abort cases. `TEST_ABORT` can then be used at any time within the tests to return to the last `TEST_PROTECT` call.
-
-    TEST_PROTECT()
-
-Setup and Catch macro
-
-    TEST_ABORT()
-
-Abort Test macro
-
-Example:
-
-    main()
-    {
-        if (TEST_PROTECT())
-        {
-            MyTest();
-        }
-    }
-
-If MyTest calls `TEST_ABORT`, program control will immediately return to `TEST_PROTECT` with a return value of zero.
-
-
-Unity Assertion Summary
-=======================
-
-Basic Validity Tests
---------------------
-
-    TEST_ASSERT_TRUE(condition)
-
-Evaluates whatever code is in condition and fails if it evaluates to false
-
-    TEST_ASSERT_FALSE(condition)
-
-Evaluates whatever code is in condition and fails if it evaluates to true
-
-    TEST_ASSERT(condition)
-
-Another way of calling `TEST_ASSERT_TRUE`
-
-    TEST_ASSERT_UNLESS(condition)
-
-Another way of calling `TEST_ASSERT_FALSE`
-
-    TEST_FAIL()
-    TEST_FAIL_MESSAGE(message)
-
-This test is automatically marked as a failure.  The message is output stating why.
-
-Numerical Assertions: Integers
-------------------------------
-
-    TEST_ASSERT_EQUAL_INT(expected, actual)
-    TEST_ASSERT_EQUAL_INT8(expected, actual)
-    TEST_ASSERT_EQUAL_INT16(expected, actual)
-    TEST_ASSERT_EQUAL_INT32(expected, actual)
-    TEST_ASSERT_EQUAL_INT64(expected, actual)
-
-Compare two integers for equality and display errors as signed integers. A cast will be performed
-to your natural integer size so often this can just be used.  When you need to specify the exact size,
-like when comparing arrays, you can use a specific version:
-
-    TEST_ASSERT_EQUAL_UINT(expected, actual)
-    TEST_ASSERT_EQUAL_UINT8(expected, actual)
-    TEST_ASSERT_EQUAL_UINT16(expected, actual)
-    TEST_ASSERT_EQUAL_UINT32(expected, actual)
-    TEST_ASSERT_EQUAL_UINT64(expected, actual)
-
-Compare two integers for equality and display errors as unsigned integers.  Like INT, there are
-variants for different sizes also.
-
-    TEST_ASSERT_EQUAL_HEX(expected, actual)
-    TEST_ASSERT_EQUAL_HEX8(expected, actual)
-    TEST_ASSERT_EQUAL_HEX16(expected, actual)
-    TEST_ASSERT_EQUAL_HEX32(expected, actual)
-    TEST_ASSERT_EQUAL_HEX64(expected, actual)
-
-Compares two integers for equality and display errors as hexadecimal.  Like the other integer comparisons,
-you can specify the size... here the size will also effect how many nibbles are shown (for example, `HEX16`
-will show 4 nibbles).
-
-    TEST_ASSERT_EQUAL(expected, actual)
-
-Another way of calling TEST_ASSERT_EQUAL_INT
-
-    TEST_ASSERT_INT_WITHIN(delta, expected, actual)
-
-Asserts that the actual value is within plus or minus delta of the expected value.  This also comes in
-size specific variants.
-
-
-    TEST_ASSERT_GREATER_THAN(threshold, actual)
-
-Asserts that the actual value is greater than the threshold. This also comes in size specific variants.
-
-
-    TEST_ASSERT_LESS_THAN(threshold, actual)
-
-Asserts that the actual value is less than the threshold. This also comes in size specific variants.
-
-
-Arrays
-------
-
-    _ARRAY
-
-You can append `_ARRAY` to any of these macros to make an array comparison of that type.  Here you will
-need to care a bit more about the actual size of the value being checked.  You will also specify an
-additional argument which is the number of elements to compare.  For example:
-
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, elements)
-
-    _EACH_EQUAL
-
-Another array comparison option is to check that EVERY element of an array is equal to a single expected
-value. You do this by specifying the EACH_EQUAL macro. For example:
-
-    TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, elements)
-
-Numerical Assertions: Bitwise
------------------------------
-
-    TEST_ASSERT_BITS(mask, expected, actual)
-
-Use an integer mask to specify which bits should be compared between two other integers.  High bits in the mask are compared, low bits ignored.
-
-    TEST_ASSERT_BITS_HIGH(mask, actual)
-
-Use an integer mask to specify which bits should be inspected to determine if they are all set high.  High bits in the mask are compared, low bits ignored.
-
-    TEST_ASSERT_BITS_LOW(mask, actual)
-
-Use an integer mask to specify which bits should be inspected to determine if they are all set low.  High bits in the mask are compared, low bits ignored.
-
-    TEST_ASSERT_BIT_HIGH(bit, actual)
-
-Test a single bit and verify that it is high.  The bit is specified 0-31 for a 32-bit integer.
-
-    TEST_ASSERT_BIT_LOW(bit, actual)
-
-Test a single bit and verify that it is low.  The bit is specified 0-31 for a 32-bit integer.
-
-Numerical Assertions: Floats
-----------------------------
-
-    TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual)
-
-Asserts that the actual value is within plus or minus delta of the expected value.
-
-    TEST_ASSERT_EQUAL_FLOAT(expected, actual)
-    TEST_ASSERT_EQUAL_DOUBLE(expected, actual)
-
-Asserts that two floating point values are "equal" within a small % delta of the expected value.
-
-String Assertions
------------------
-
-    TEST_ASSERT_EQUAL_STRING(expected, actual)
-
-Compare two null-terminate strings.  Fail if any character is different or if the lengths are different.
-
-    TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len)
-
-Compare two strings.  Fail if any character is different, stop comparing after len characters.
-
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message)
-
-Compare two null-terminate strings.  Fail if any character is different or if the lengths are different. Output a custom message on failure.
-
-    TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message)
-
-Compare two strings.  Fail if any character is different, stop comparing after len characters. Output a custom message on failure.
-
-Pointer Assertions
-------------------
-
-Most pointer operations can be performed by simply using the integer comparisons above.  However, a couple of special cases are added for clarity.
-
-    TEST_ASSERT_NULL(pointer)
-
-Fails if the pointer is not equal to NULL
-
-    TEST_ASSERT_NOT_NULL(pointer)
-
-Fails if the pointer is equal to NULL
-
-Memory Assertions
------------------
-
-    TEST_ASSERT_EQUAL_MEMORY(expected, actual, len)
-
-Compare two blocks of memory.  This is a good generic assertion for types that can't be coerced into acting like
-standard types... but since it's a memory compare, you have to be careful that your data types are packed.
-
-_MESSAGE
---------
-
-you can append _MESSAGE to any of the macros to make them take an additional argument.  This argument
-is a string that will be printed at the end of the failure strings.  This is useful for specifying more
-information about the problem.
-
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/colour_prompt.rb b/external_libs/cJSON/cJSON/tests/unity/auto/colour_prompt.rb
deleted file mode 100644
index 0f1dc4e0..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/colour_prompt.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-if RUBY_PLATFORM =~ /(win|w)32$/
-  begin
-    require 'Win32API'
-  rescue LoadError
-    puts 'ERROR! "Win32API" library not found'
-    puts '"Win32API" is required for colour on a windows machine'
-    puts '  try => "gem install Win32API" on the command line'
-    puts
-  end
-  # puts
-  # puts 'Windows Environment Detected...'
-  # puts 'Win32API Library Found.'
-  # puts
-end
-
-class ColourCommandLine
-  def initialize
-    return unless RUBY_PLATFORM =~ /(win|w)32$/
-    get_std_handle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
-    @set_console_txt_attrb =
-      Win32API.new('kernel32', 'SetConsoleTextAttribute', %w(L N), 'I')
-    @hout = get_std_handle.call(-11)
-  end
-
-  def change_to(new_colour)
-    if RUBY_PLATFORM =~ /(win|w)32$/
-      @set_console_txt_attrb.call(@hout, win32_colour(new_colour))
-    else
-      "\033[30;#{posix_colour(new_colour)};22m"
-    end
-  end
-
-  def win32_colour(colour)
-    case colour
-    when :black then 0
-    when :dark_blue then 1
-    when :dark_green then 2
-    when :dark_cyan then 3
-    when :dark_red then 4
-    when :dark_purple then 5
-    when :dark_yellow, :narrative then 6
-    when :default_white, :default, :dark_white then 7
-    when :silver then 8
-    when :blue then 9
-    when :green, :success then 10
-    when :cyan, :output then 11
-    when :red, :failure then 12
-    when :purple then 13
-    when :yellow then 14
-    when :white then 15
-    else
-      0
-    end
-  end
-
-  def posix_colour(colour)
-    # ANSI Escape Codes - Foreground colors
-    # | Code | Color                     |
-    # | 39   | Default foreground color  |
-    # | 30   | Black                     |
-    # | 31   | Red                       |
-    # | 32   | Green                     |
-    # | 33   | Yellow                    |
-    # | 34   | Blue                      |
-    # | 35   | Magenta                   |
-    # | 36   | Cyan                      |
-    # | 37   | Light gray                |
-    # | 90   | Dark gray                 |
-    # | 91   | Light red                 |
-    # | 92   | Light green               |
-    # | 93   | Light yellow              |
-    # | 94   | Light blue                |
-    # | 95   | Light magenta             |
-    # | 96   | Light cyan                |
-    # | 97   | White                     |
-
-    case colour
-    when :black then 30
-    when :red, :failure then 31
-    when :green, :success then 32
-    when :yellow then 33
-    when :blue, :narrative then 34
-    when :purple, :magenta then 35
-    when :cyan, :output then 36
-    when :white, :default_white then 37
-    when :default then 39
-    else
-      39
-    end
-  end
-
-  def out_c(mode, colour, str)
-    case RUBY_PLATFORM
-    when /(win|w)32$/
-      change_to(colour)
-      $stdout.puts str if mode == :puts
-      $stdout.print str if mode == :print
-      change_to(:default_white)
-    else
-      $stdout.puts("#{change_to(colour)}#{str}\033[0m") if mode == :puts
-      $stdout.print("#{change_to(colour)}#{str}\033[0m") if mode == :print
-    end
-  end
-end # ColourCommandLine
-
-def colour_puts(role, str)
-  ColourCommandLine.new.out_c(:puts, role, str)
-end
-
-def colour_print(role, str)
-  ColourCommandLine.new.out_c(:print, role, str)
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/colour_reporter.rb b/external_libs/cJSON/cJSON/tests/unity/auto/colour_reporter.rb
deleted file mode 100644
index bb1fbfce..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/colour_reporter.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-require "#{File.expand_path(File.dirname(__FILE__))}/colour_prompt"
-
-$colour_output = true
-
-def report(message)
-  if !$colour_output
-    $stdout.puts(message)
-  else
-    message = message.join('\n') if message.class == Array
-    message.each_line do |line|
-      line.chomp!
-      colour = case line
-               when /(?:total\s+)?tests:?\s+(\d+)\s+(?:total\s+)?failures:?\s+\d+\s+Ignored:?/i
-                 Regexp.last_match(1).to_i.zero? ? :green : :red
-               when /PASS/
-                 :green
-               when /^OK$/
-                 :green
-               when /(?:FAIL|ERROR)/
-                 :red
-               when /IGNORE/
-                 :yellow
-               when /^(?:Creating|Compiling|Linking)/
-                 :white
-               else
-                 :silver
-               end
-      colour_puts(colour, line)
-    end
-  end
-  $stdout.flush
-  $stderr.flush
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/generate_config.yml b/external_libs/cJSON/cJSON/tests/unity/auto/generate_config.yml
deleted file mode 100644
index 4a5e4742..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/generate_config.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-#this is a sample configuration file for generate_module
-#you would use it by calling generate_module with the -ygenerate_config.yml option
-#files like this are useful for customizing generate_module to your environment
-:generate_module:
-  :defaults:
-    #these defaults are used in place of any missing options at the command line
-    :path_src: ../src/
-    :path_inc: ../src/
-    :path_tst: ../test/
-    :update_svn: true
-  :includes:
-    #use [] for no additional includes, otherwise list the includes on separate lines
-    :src:
-      - Defs.h
-      - Board.h
-    :inc: []
-    :tst:
-      - Defs.h
-      - Board.h
-      - Exception.h
-  :boilerplates: 
-    #these are inserted at the top of generated files.
-    #just comment out or remove if not desired.
-    #use %1$s where you would like the file name to appear (path/extension not included)
-    :src: |
-      //-------------------------------------------
-      // %1$s.c
-      //-------------------------------------------
-    :inc: |
-      //-------------------------------------------
-      // %1$s.h
-      //-------------------------------------------
-    :tst: |
-      //-------------------------------------------
-      // Test%1$s.c : Units tests for %1$s.c
-      //-------------------------------------------
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/generate_module.rb b/external_libs/cJSON/cJSON/tests/unity/auto/generate_module.rb
deleted file mode 100644
index 13b4cc74..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/generate_module.rb
+++ /dev/null
@@ -1,308 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-# This script creates all the files with start code necessary for a new module.
-# A simple module only requires a source file, header file, and test file.
-# Triad modules require a source, header, and test file for each triad type (like model, conductor, and hardware).
-
-require 'rubygems'
-require 'fileutils'
-require 'pathname'
-
-# TEMPLATE_TST
-TEMPLATE_TST ||= '#include "unity.h"
-%2$s#include "%1$s.h"
-
-void setUp(void)
-{
-}
-
-void tearDown(void)
-{
-}
-
-void test_%1$s_NeedToImplement(void)
-{
-    TEST_IGNORE_MESSAGE("Need to Implement %1$s");
-}
-'.freeze
-
-# TEMPLATE_SRC
-TEMPLATE_SRC ||= '%2$s#include "%1$s.h"
-'.freeze
-
-# TEMPLATE_INC
-TEMPLATE_INC ||= '#ifndef _%3$s_H
-#define _%3$s_H
-%2$s
-
-#endif // _%3$s_H
-'.freeze
-
-class UnityModuleGenerator
-  ############################
-  def initialize(options = nil)
-    here = File.expand_path(File.dirname(__FILE__)) + '/'
-
-    @options = UnityModuleGenerator.default_options
-    case options
-    when NilClass then @options
-    when String   then @options.merge!(UnityModuleGenerator.grab_config(options))
-    when Hash     then @options.merge!(options)
-    else raise 'If you specify arguments, it should be a filename or a hash of options'
-    end
-
-    # Create default file paths if none were provided
-    @options[:path_src] = here + '../src/'    if @options[:path_src].nil?
-    @options[:path_inc] = @options[:path_src] if @options[:path_inc].nil?
-    @options[:path_tst] = here + '../test/'   if @options[:path_tst].nil?
-    @options[:path_src] += '/'                unless @options[:path_src][-1] == 47
-    @options[:path_inc] += '/'                unless @options[:path_inc][-1] == 47
-    @options[:path_tst] += '/'                unless @options[:path_tst][-1] == 47
-
-    # Built in patterns
-    @patterns = {
-      'src'  =>  {
-        '' =>  { inc: [] }
-      },
-      'test' =>  {
-        '' =>  { inc: [] }
-      },
-      'dh'   =>  {
-        'Driver'    =>  { inc: [create_filename('%1$s', 'Hardware.h')] },
-        'Hardware'  =>  { inc: [] }
-      },
-      'dih'  =>  {
-        'Driver'    =>  { inc: [create_filename('%1$s', 'Hardware.h'), create_filename('%1$s', 'Interrupt.h')] },
-        'Interrupt' =>  { inc: [create_filename('%1$s', 'Hardware.h')] },
-        'Hardware'  =>  { inc: [] }
-      },
-      'mch'  =>  {
-        'Model'     =>  { inc: [] },
-        'Conductor' =>  { inc: [create_filename('%1$s', 'Model.h'), create_filename('%1$s', 'Hardware.h')] },
-        'Hardware'  =>  { inc: [] }
-      },
-      'mvp'  =>  {
-        'Model'     =>  { inc: [] },
-        'Presenter' =>  { inc: [create_filename('%1$s', 'Model.h'), create_filename('%1$s', 'View.h')] },
-        'View'      =>  { inc: [] }
-      }
-    }
-  end
-
-  ############################
-  def self.default_options
-    {
-      pattern: 'src',
-      includes: {
-        src: [],
-        inc: [],
-        tst: []
-      },
-      update_svn: false,
-      boilerplates: {},
-      test_prefix: 'Test',
-      mock_prefix: 'Mock'
-    }
-  end
-
-  ############################
-  def self.grab_config(config_file)
-    options = default_options
-    unless config_file.nil? || config_file.empty?
-      require 'yaml'
-      yaml_guts = YAML.load_file(config_file)
-      options.merge!(yaml_guts[:unity] || yaml_guts[:cmock])
-      raise "No :unity or :cmock section found in #{config_file}" unless options
-    end
-    options
-  end
-
-  ############################
-  def files_to_operate_on(module_name, pattern = nil)
-    # strip any leading path information from the module name and save for later
-    subfolder = File.dirname(module_name)
-    module_name = File.basename(module_name)
-
-    # create triad definition
-    prefix = @options[:test_prefix] || 'Test'
-    triad = [{ ext: '.c', path: @options[:path_src], prefix: '', template: TEMPLATE_SRC, inc: :src, boilerplate: @options[:boilerplates][:src] },
-             { ext: '.h', path: @options[:path_inc], prefix: '',     template: TEMPLATE_INC, inc: :inc, boilerplate: @options[:boilerplates][:inc] },
-             { ext: '.c', path: @options[:path_tst], prefix: prefix, template: TEMPLATE_TST, inc: :tst, boilerplate: @options[:boilerplates][:tst] }]
-
-    # prepare the pattern for use
-    pattern = (pattern || @options[:pattern] || 'src').downcase
-    patterns = @patterns[pattern]
-    raise "ERROR: The design pattern '#{pattern}' specified isn't one that I recognize!" if patterns.nil?
-
-    # single file patterns (currently just 'test') can reject the other parts of the triad
-    triad.select! { |v| v[:inc] == :tst } if pattern == 'test'
-
-    # Assemble the path/names of the files we need to work with.
-    files = []
-    triad.each do |cfg|
-      patterns.each_pair do |pattern_file, pattern_traits|
-        submodule_name = create_filename(module_name, pattern_file)
-        filename = cfg[:prefix] + submodule_name + cfg[:ext]
-        files << {
-          path: (Pathname.new("#{cfg[:path]}#{subfolder}") + filename).cleanpath,
-          name: submodule_name,
-          template: cfg[:template],
-          boilerplate: cfg[:boilerplate],
-          includes: case (cfg[:inc])
-                    when :src then (@options[:includes][:src] || []) | (pattern_traits[:inc].map { |f| format(f, module_name) })
-                    when :inc then (@options[:includes][:inc] || [])
-                    when :tst then (@options[:includes][:tst] || []) | (pattern_traits[:inc].map { |f| format("#{@options[:mock_prefix]}#{f}", module_name) })
-                    end
-        }
-      end
-    end
-
-    files
-  end
-
-  ############################
-  def create_filename(part1, part2 = '')
-    if part2.empty?
-      case (@options[:naming])
-      when 'bumpy' then part1
-      when 'camel' then part1
-      when 'snake' then part1.downcase
-      when 'caps'  then part1.upcase
-      else              part1
-      end
-    else
-      case (@options[:naming])
-      when 'bumpy' then part1 + part2
-      when 'camel' then part1 + part2
-      when 'snake' then part1.downcase + '_' + part2.downcase
-      when 'caps'  then part1.upcase + '_' + part2.upcase
-      else              part1 + '_' + part2
-      end
-    end
-  end
-
-  ############################
-  def generate(module_name, pattern = nil)
-    files = files_to_operate_on(module_name, pattern)
-
-    # Abort if all of the module files already exist
-    all_files_exist = true
-    files.each do |file|
-      all_files_exist = false unless File.exist?(file[:path])
-    end
-    raise "ERROR: File #{files[0][:name]} already exists. Exiting." if all_files_exist
-
-    # Create Source Modules
-    files.each_with_index do |file, _i|
-      # If this file already exists, don't overwrite it.
-      if File.exist?(file[:path])
-        puts "File #{file[:path]} already exists!"
-        next
-      end
-      # Create the path first if necessary.
-      FileUtils.mkdir_p(File.dirname(file[:path]), verbose: false)
-      File.open(file[:path], 'w') do |f|
-        f.write("#{file[:boilerplate]}\n" % [file[:name]]) unless file[:boilerplate].nil?
-        f.write(file[:template] % [file[:name],
-                                   file[:includes].map { |ff| "#include \"#{ff}\"\n" }.join,
-                                   file[:name].upcase])
-      end
-      if @options[:update_svn]
-        `svn add \"#{file[:path]}\"`
-        if $!.exitstatus.zero?
-          puts "File #{file[:path]} created and added to source control"
-        else
-          puts "File #{file[:path]} created but FAILED adding to source control!"
-        end
-      else
-        puts "File #{file[:path]} created"
-      end
-    end
-    puts 'Generate Complete'
-  end
-
-  ############################
-  def destroy(module_name, pattern = nil)
-    files_to_operate_on(module_name, pattern).each do |filespec|
-      file = filespec[:path]
-      if File.exist?(file)
-        if @options[:update_svn]
-          `svn delete \"#{file}\" --force`
-          puts "File #{file} deleted and removed from source control"
-        else
-          FileUtils.remove(file)
-          puts "File #{file} deleted"
-        end
-      else
-        puts "File #{file} does not exist so cannot be removed."
-      end
-    end
-    puts 'Destroy Complete'
-  end
-end
-
-############################
-# Handle As Command Line If Called That Way
-if $0 == __FILE__
-  destroy = false
-  options = {}
-  module_name = nil
-
-  # Parse the command line parameters.
-  ARGV.each do |arg|
-    case arg
-    when /^-d/            then destroy = true
-    when /^-u/            then options[:update_svn] = true
-    when /^-p\"?(\w+)\"?/ then options[:pattern] = Regexp.last_match(1)
-    when /^-s\"?(.+)\"?/  then options[:path_src] = Regexp.last_match(1)
-    when /^-i\"?(.+)\"?/  then options[:path_inc] = Regexp.last_match(1)
-    when /^-t\"?(.+)\"?/  then options[:path_tst] = Regexp.last_match(1)
-    when /^-n\"?(.+)\"?/  then options[:naming] = Regexp.last_match(1)
-    when /^-y\"?(.+)\"?/  then options = UnityModuleGenerator.grab_config(Regexp.last_match(1))
-    when /^(\w+)/
-      raise "ERROR: You can't have more than one Module name specified!" unless module_name.nil?
-      module_name = arg
-    when /^-(h|-help)/
-      ARGV = [].freeze
-    else
-      raise "ERROR: Unknown option specified '#{arg}'"
-    end
-  end
-
-  unless ARGV[0]
-    puts ["\nGENERATE MODULE\n-------- ------",
-          "\nUsage: ruby generate_module [options] module_name",
-          "  -i\"include\" sets the path to output headers to 'include' (DEFAULT ../src)",
-          "  -s\"../src\"  sets the path to output source to '../src'   (DEFAULT ../src)",
-          "  -t\"C:/test\" sets the path to output source to 'C:/test'  (DEFAULT ../test)",
-          '  -p"MCH"     sets the output pattern to MCH.',
-          '              dh   - driver hardware.',
-          '              dih  - driver interrupt hardware.',
-          '              mch  - model conductor hardware.',
-          '              mvp  - model view presenter.',
-          '              src  - just a source module, header and test. (DEFAULT)',
-          '              test - just a test file.',
-          '  -d          destroy module instead of creating it.',
-          '  -n"camel"   sets the file naming convention.',
-          '              bumpy - BumpyCaseFilenames.',
-          '              camel - camelCaseFilenames.',
-          '              snake - snake_case_filenames.',
-          '              caps  - CAPS_CASE_FILENAMES.',
-          '  -u          update subversion too (requires subversion command line)',
-          '  -y"my.yml"  selects a different yaml config file for module generation',
-          ''].join("\n")
-    exit
-  end
-
-  raise 'ERROR: You must have a Module name specified! (use option -h for help)' if module_name.nil?
-  if destroy
-    UnityModuleGenerator.new(options).destroy(module_name)
-  else
-    UnityModuleGenerator.new(options).generate(module_name)
-  end
-
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/generate_test_runner.rb b/external_libs/cJSON/cJSON/tests/unity/auto/generate_test_runner.rb
deleted file mode 100644
index 344a2d0f..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/generate_test_runner.rb
+++ /dev/null
@@ -1,454 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-File.expand_path(File.join(File.dirname(__FILE__), 'colour_prompt'))
-
-class UnityTestRunnerGenerator
-  def initialize(options = nil)
-    @options = UnityTestRunnerGenerator.default_options
-    case options
-    when NilClass then @options
-    when String   then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
-    when Hash     then @options.merge!(options)
-    else raise 'If you specify arguments, it should be a filename or a hash of options'
-    end
-    require "#{File.expand_path(File.dirname(__FILE__))}/type_sanitizer"
-  end
-
-  def self.default_options
-    {
-      includes: [],
-      defines: [],
-      plugins: [],
-      framework: :unity,
-      test_prefix: 'test|spec|should',
-      mock_prefix: 'Mock',
-      setup_name: 'setUp',
-      teardown_name: 'tearDown',
-      main_name: 'main', # set to :auto to automatically generate each time
-      main_export_decl: '',
-      cmdline_args: false,
-      use_param_tests: false
-    }
-  end
-
-  def self.grab_config(config_file)
-    options = default_options
-    unless config_file.nil? || config_file.empty?
-      require 'yaml'
-      yaml_guts = YAML.load_file(config_file)
-      options.merge!(yaml_guts[:unity] || yaml_guts[:cmock])
-      raise "No :unity or :cmock section found in #{config_file}" unless options
-    end
-    options
-  end
-
-  def run(input_file, output_file, options = nil)
-    @options.merge!(options) unless options.nil?
-
-    # pull required data from source file
-    source = File.read(input_file)
-    source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
-    tests               = find_tests(source)
-    headers             = find_includes(source)
-    testfile_includes   = (headers[:local] + headers[:system])
-    used_mocks          = find_mocks(testfile_includes)
-    testfile_includes   = (testfile_includes - used_mocks)
-    testfile_includes.delete_if { |inc| inc =~ /(unity|cmock)/ }
-
-    # build runner file
-    generate(input_file, output_file, tests, used_mocks, testfile_includes)
-
-    # determine which files were used to return them
-    all_files_used = [input_file, output_file]
-    all_files_used += testfile_includes.map { |filename| filename + '.c' } unless testfile_includes.empty?
-    all_files_used += @options[:includes] unless @options[:includes].empty?
-    all_files_used += headers[:linkonly] unless headers[:linkonly].empty?
-    all_files_used.uniq
-  end
-
-  def generate(input_file, output_file, tests, used_mocks, testfile_includes)
-    File.open(output_file, 'w') do |output|
-      create_header(output, used_mocks, testfile_includes)
-      create_externs(output, tests, used_mocks)
-      create_mock_management(output, used_mocks)
-      create_suite_setup(output)
-      create_suite_teardown(output)
-      create_reset(output, used_mocks)
-      create_main(output, input_file, tests, used_mocks)
-    end
-
-    return unless @options[:header_file] && !@options[:header_file].empty?
-
-    File.open(@options[:header_file], 'w') do |output|
-      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
-    end
-  end
-
-  def find_tests(source)
-    tests_and_line_numbers = []
-
-    source_scrubbed = source.clone
-    source_scrubbed = source_scrubbed.gsub(/"[^"\n]*"/, '') # remove things in strings
-    source_scrubbed = source_scrubbed.gsub(/\/\/.*$/, '')      # remove line comments
-    source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments
-    lines = source_scrubbed.split(/(^\s*\#.*$)                 # Treat preprocessor directives as a logical line
-                              | (;|\{|\}) /x)                  # Match ;, {, and } as end of lines
-
-    lines.each_with_index do |line, _index|
-      # find tests
-      next unless line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/
-      arguments = Regexp.last_match(1)
-      name = Regexp.last_match(2)
-      call = Regexp.last_match(3)
-      params = Regexp.last_match(4)
-      args = nil
-      if @options[:use_param_tests] && !arguments.empty?
-        args = []
-        arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) { |a| args << a[0] }
-      end
-      tests_and_line_numbers << { test: name, args: args, call: call, params: params, line_number: 0 }
-    end
-    tests_and_line_numbers.uniq! { |v| v[:test] }
-
-    # determine line numbers and create tests to run
-    source_lines = source.split("\n")
-    source_index = 0
-    tests_and_line_numbers.size.times do |i|
-      source_lines[source_index..-1].each_with_index do |line, index|
-        next unless line =~ /\s+#{tests_and_line_numbers[i][:test]}(?:\s|\()/
-        source_index += index
-        tests_and_line_numbers[i][:line_number] = source_index + 1
-        break
-      end
-    end
-
-    tests_and_line_numbers
-  end
-
-  def find_includes(source)
-    # remove comments (block and line, in three steps to ensure correct precedence)
-    source.gsub!(/\/\/(?:.+\/\*|\*(?:$|[^\/])).*$/, '')  # remove line comments that comment out the start of blocks
-    source.gsub!(/\/\*.*?\*\//m, '')                     # remove block comments
-    source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
-
-    # parse out includes
-    includes = {
-      local: source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten,
-      system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" },
-      linkonly: source.scan(/^TEST_FILE\(\s*\"\s*(.+)\.[cC]\w*\s*\"/).flatten
-    }
-    includes
-  end
-
-  def find_mocks(includes)
-    mock_headers = []
-    includes.each do |include_path|
-      include_file = File.basename(include_path)
-      mock_headers << include_path if include_file =~ /^#{@options[:mock_prefix]}/i
-    end
-    mock_headers
-  end
-
-  def create_header(output, mocks, testfile_includes = [])
-    output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
-    create_runtest(output, mocks)
-    output.puts("\n/*=======Automagically Detected Files To Include=====*/")
-    output.puts('#ifdef __WIN32__')
-    output.puts('#define UNITY_INCLUDE_SETUP_STUBS')
-    output.puts('#endif')
-    output.puts("#include \"#{@options[:framework]}.h\"")
-    output.puts('#include "cmock.h"') unless mocks.empty?
-    output.puts('#include <setjmp.h>')
-    output.puts('#include <stdio.h>')
-    if @options[:defines] && !@options[:defines].empty?
-      @options[:defines].each { |d| output.puts("#define #{d}") }
-    end
-    if @options[:header_file] && !@options[:header_file].empty?
-      output.puts("#include \"#{File.basename(@options[:header_file])}\"")
-    else
-      @options[:includes].flatten.uniq.compact.each do |inc|
-        output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h', '')}.h\""}")
-      end
-      testfile_includes.each do |inc|
-        output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h', '')}.h\""}")
-      end
-    end
-    mocks.each do |mock|
-      output.puts("#include \"#{mock.gsub('.h', '')}.h\"")
-    end
-    output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
-
-    return unless @options[:enforce_strict_ordering]
-
-    output.puts('')
-    output.puts('int GlobalExpectCount;')
-    output.puts('int GlobalVerifyOrder;')
-    output.puts('char* GlobalOrderError;')
-  end
-
-  def create_externs(output, tests, _mocks)
-    output.puts("\n/*=======External Functions This Runner Calls=====*/")
-    output.puts("extern void #{@options[:setup_name]}(void);")
-    output.puts("extern void #{@options[:teardown_name]}(void);")
-    tests.each do |test|
-      output.puts("extern void #{test[:test]}(#{test[:call] || 'void'});")
-    end
-    output.puts('')
-  end
-
-  def create_mock_management(output, mock_headers)
-    return if mock_headers.empty?
-
-    output.puts("\n/*=======Mock Management=====*/")
-    output.puts('static void CMock_Init(void)')
-    output.puts('{')
-
-    if @options[:enforce_strict_ordering]
-      output.puts('  GlobalExpectCount = 0;')
-      output.puts('  GlobalVerifyOrder = 0;')
-      output.puts('  GlobalOrderError = NULL;')
-    end
-
-    mocks = mock_headers.map { |mock| File.basename(mock) }
-    mocks.each do |mock|
-      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-      output.puts("  #{mock_clean}_Init();")
-    end
-    output.puts("}\n")
-
-    output.puts('static void CMock_Verify(void)')
-    output.puts('{')
-    mocks.each do |mock|
-      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-      output.puts("  #{mock_clean}_Verify();")
-    end
-    output.puts("}\n")
-
-    output.puts('static void CMock_Destroy(void)')
-    output.puts('{')
-    mocks.each do |mock|
-      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-      output.puts("  #{mock_clean}_Destroy();")
-    end
-    output.puts("}\n")
-  end
-
-  def create_suite_setup(output)
-    output.puts("\n/*=======Suite Setup=====*/")
-    output.puts('static void suite_setup(void)')
-    output.puts('{')
-    if @options[:suite_setup].nil?
-      # New style, call suiteSetUp() if we can use weak symbols
-      output.puts('#if defined(UNITY_WEAK_ATTRIBUTE) || defined(UNITY_WEAK_PRAGMA)')
-      output.puts('  suiteSetUp();')
-      output.puts('#endif')
-    else
-      # Old style, C code embedded in the :suite_setup option
-      output.puts(@options[:suite_setup])
-    end
-    output.puts('}')
-  end
-
-  def create_suite_teardown(output)
-    output.puts("\n/*=======Suite Teardown=====*/")
-    output.puts('static int suite_teardown(int num_failures)')
-    output.puts('{')
-    if @options[:suite_teardown].nil?
-      # New style, call suiteTearDown() if we can use weak symbols
-      output.puts('#if defined(UNITY_WEAK_ATTRIBUTE) || defined(UNITY_WEAK_PRAGMA)')
-      output.puts('  return suiteTearDown(num_failures);')
-      output.puts('#else')
-      output.puts('  return num_failures;')
-      output.puts('#endif')
-    else
-      # Old style, C code embedded in the :suite_teardown option
-      output.puts(@options[:suite_teardown])
-    end
-    output.puts('}')
-  end
-
-  def create_runtest(output, used_mocks)
-    cexception = @options[:plugins].include? :cexception
-    va_args1   = @options[:use_param_tests] ? ', ...' : ''
-    va_args2   = @options[:use_param_tests] ? '__VA_ARGS__' : ''
-    output.puts("\n/*=======Test Runner Used To Run Each Test Below=====*/")
-    output.puts('#define RUN_TEST_NO_ARGS') if @options[:use_param_tests]
-    output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\")
-    output.puts('{ \\')
-    output.puts("  Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\")
-    output.puts('  Unity.CurrentTestLineNumber = TestLineNum; \\')
-    output.puts('  if (UnityTestMatches()) { \\') if @options[:cmdline_args]
-    output.puts('  Unity.NumberOfTests++; \\')
-    output.puts('  CMock_Init(); \\') unless used_mocks.empty?
-    output.puts('  UNITY_CLR_DETAILS(); \\') unless used_mocks.empty?
-    output.puts('  if (TEST_PROTECT()) \\')
-    output.puts('  { \\')
-    output.puts('    CEXCEPTION_T e; \\') if cexception
-    output.puts('    Try { \\') if cexception
-    output.puts("      #{@options[:setup_name]}(); \\")
-    output.puts("      TestFunc(#{va_args2}); \\")
-    output.puts('    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \\') if cexception
-    output.puts('  } \\')
-    output.puts('  if (TEST_PROTECT()) \\')
-    output.puts('  { \\')
-    output.puts("    #{@options[:teardown_name]}(); \\")
-    output.puts('    CMock_Verify(); \\') unless used_mocks.empty?
-    output.puts('  } \\')
-    output.puts('  CMock_Destroy(); \\') unless used_mocks.empty?
-    output.puts('  UnityConcludeTest(); \\')
-    output.puts('  } \\') if @options[:cmdline_args]
-    output.puts("}\n")
-  end
-
-  def create_reset(output, used_mocks)
-    output.puts("\n/*=======Test Reset Option=====*/")
-    output.puts('void resetTest(void);')
-    output.puts('void resetTest(void)')
-    output.puts('{')
-    output.puts('  CMock_Verify();') unless used_mocks.empty?
-    output.puts('  CMock_Destroy();') unless used_mocks.empty?
-    output.puts("  #{@options[:teardown_name]}();")
-    output.puts('  CMock_Init();') unless used_mocks.empty?
-    output.puts("  #{@options[:setup_name]}();")
-    output.puts('}')
-  end
-
-  def create_main(output, filename, tests, used_mocks)
-    output.puts("\n\n/*=======MAIN=====*/")
-    main_name = @options[:main_name].to_sym == :auto ? "main_#{filename.gsub('.c', '')}" : (@options[:main_name]).to_s
-    if @options[:cmdline_args]
-      if main_name != 'main'
-        output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv);")
-      end
-      output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
-      output.puts('{')
-      output.puts('  int parse_status = UnityParseOptions(argc, argv);')
-      output.puts('  if (parse_status != 0)')
-      output.puts('  {')
-      output.puts('    if (parse_status < 0)')
-      output.puts('    {')
-      output.puts("      UnityPrint(\"#{filename.gsub('.c', '')}.\");")
-      output.puts('      UNITY_PRINT_EOL();')
-      if @options[:use_param_tests]
-        tests.each do |test|
-          if test[:args].nil? || test[:args].empty?
-            output.puts("      UnityPrint(\"  #{test[:test]}(RUN_TEST_NO_ARGS)\");")
-            output.puts('      UNITY_PRINT_EOL();')
-          else
-            test[:args].each do |args|
-              output.puts("      UnityPrint(\"  #{test[:test]}(#{args})\");")
-              output.puts('      UNITY_PRINT_EOL();')
-            end
-          end
-        end
-      else
-        tests.each { |test| output.puts("      UnityPrint(\"  #{test[:test]}\");\n    UNITY_PRINT_EOL();") }
-      end
-      output.puts('    return 0;')
-      output.puts('    }')
-      output.puts('  return parse_status;')
-      output.puts('  }')
-    else
-      if main_name != 'main'
-        output.puts("#{@options[:main_export_decl]} int #{main_name}(void);")
-      end
-      output.puts("int #{main_name}(void)")
-      output.puts('{')
-    end
-    output.puts('  suite_setup();')
-    output.puts("  UnityBegin(\"#{filename.gsub(/\\/, '\\\\\\')}\");")
-    if @options[:use_param_tests]
-      tests.each do |test|
-        if test[:args].nil? || test[:args].empty?
-          output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]}, RUN_TEST_NO_ARGS);")
-        else
-          test[:args].each { |args| output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]}, #{args});") }
-        end
-      end
-    else
-      tests.each { |test| output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]});") }
-    end
-    output.puts
-    output.puts('  CMock_Guts_MemFreeFinal();') unless used_mocks.empty?
-    output.puts("  return suite_teardown(UnityEnd());")
-    output.puts('}')
-  end
-
-  def create_h_file(output, filename, tests, testfile_includes, used_mocks)
-    filename = File.basename(filename).gsub(/[-\/\\\.\,\s]/, '_').upcase
-    output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
-    output.puts("#ifndef _#{filename}")
-    output.puts("#define _#{filename}\n\n")
-    output.puts("#include \"#{@options[:framework]}.h\"")
-    output.puts('#include "cmock.h"') unless used_mocks.empty?
-    @options[:includes].flatten.uniq.compact.each do |inc|
-      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h', '')}.h\""}")
-    end
-    testfile_includes.each do |inc|
-      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h', '')}.h\""}")
-    end
-    output.puts "\n"
-    tests.each do |test|
-      if test[:params].nil? || test[:params].empty?
-        output.puts("void #{test[:test]}(void);")
-      else
-        output.puts("void #{test[:test]}(#{test[:params]});")
-      end
-    end
-    output.puts("#endif\n\n")
-  end
-end
-
-if $0 == __FILE__
-  options = { includes: [] }
-
-  # parse out all the options first (these will all be removed as we go)
-  ARGV.reject! do |arg|
-    case arg
-    when '-cexception'
-      options[:plugins] = [:cexception]
-      true
-    when /\.*\.ya?ml/
-      options = UnityTestRunnerGenerator.grab_config(arg)
-      true
-    when /--(\w+)=\"?(.*)\"?/
-      options[Regexp.last_match(1).to_sym] = Regexp.last_match(2)
-      true
-    when /\.*\.h/
-      options[:includes] << arg
-      true
-    else false
-    end
-  end
-
-  # make sure there is at least one parameter left (the input file)
-  unless ARGV[0]
-    puts ["\nusage: ruby #{__FILE__} (files) (options) input_test_file (output)",
-          "\n  input_test_file         - this is the C file you want to create a runner for",
-          '  output                  - this is the name of the runner file to generate',
-          '                            defaults to (input_test_file)_Runner',
-          '  files:',
-          '    *.yml / *.yaml        - loads configuration from here in :unity or :cmock',
-          '    *.h                   - header files are added as #includes in runner',
-          '  options:',
-          '    -cexception           - include cexception support',
-          '    --setup_name=""       - redefine setUp func name to something else',
-          '    --teardown_name=""    - redefine tearDown func name to something else',
-          '    --main_name=""        - redefine main func name to something else',
-          '    --test_prefix=""      - redefine test prefix from default test|spec|should',
-          '    --suite_setup=""      - code to execute for setup of entire suite',
-          '    --suite_teardown=""   - code to execute for teardown of entire suite',
-          '    --use_param_tests=1   - enable parameterized tests (disabled by default)',
-          '    --header_file=""      - path/name of test header file to generate too'].join("\n")
-    exit 1
-  end
-
-  # create the default test runner name if not specified
-  ARGV[1] = ARGV[0].gsub('.c', '_Runner.c') unless ARGV[1]
-
-  UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1])
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/parse_output.rb b/external_libs/cJSON/cJSON/tests/unity/auto/parse_output.rb
deleted file mode 100644
index f16cdb03..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/parse_output.rb
+++ /dev/null
@@ -1,220 +0,0 @@
-#============================================================
-#  Author:   John Theofanopoulos
-#  A simple parser.   Takes the output files generated during the build process and
-# extracts information relating to the tests.
-#
-#  Notes:
-#    To capture an output file under VS builds use the following:
-#      devenv [build instructions]  > Output.txt & type Output.txt
-#
-#    To capture an output file under GCC/Linux builds use the following:
-#      make | tee Output.txt
-#
-#    To use this parser use the following command
-#    ruby parseOutput.rb [options] [file]
-#        options:  -xml  : produce a JUnit compatible XML file
-#        file      :  file to scan for results
-#============================================================
-
-class ParseOutput
-  def initialize
-    @test_flag = false
-    @xml_out = false
-    @array_list = false
-    @total_tests = false
-    @class_index = false
-  end
-
-  #   Set the flag to indicate if there will be an XML output file or not
-  def set_xml_output
-    @xml_out = true
-  end
-
-  #  if write our output to XML
-  def write_xml_output
-    output = File.open('report.xml', 'w')
-    output << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    @array_list.each do |item|
-      output << item << "\n"
-    end
-    output << "</testsuite>\n"
-  end
-
-  #  This function will try and determine when the suite is changed.   This is
-  # is the name that gets added to the classname parameter.
-  def test_suite_verify(test_suite_name)
-    return if @test_flag
-
-    @test_flag = true
-    # Split the path name
-    test_name = test_suite_name.split('/')
-    # Remove the extension
-    base_name = test_name[test_name.size - 1].split('.')
-    @test_suite = 'test.' + base_name[0]
-    printf "New Test: %s\n", @test_suite
-  end
-
-  # Test was flagged as having passed so format the output
-  def test_passed(array)
-    last_item = array.length - 1
-    test_name = array[last_item - 1]
-    test_suite_verify(array[@class_name])
-    printf "%-40s PASS\n", test_name
-
-    return unless @xml_out
-
-    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '"/>'
-  end
-
-  # Test was flagged as having passed so format the output.
-  # This is using the Unity fixture output and not the original Unity output.
-  def test_passed_unity_fixture(array)
-    test_suite = array[0].sub('TEST(', '')
-    test_suite = test_suite.sub(',', '')
-    test_name = array[1].sub(')', '')
-
-    return unless @xml_out
-
-    @array_list.push '     <testcase classname="' + test_suite + '" name="' + test_name + '"/>'
-  end
-
-  # Test was flagged as being ingored so format the output
-  def test_ignored(array)
-    last_item = array.length - 1
-    test_name = array[last_item - 2]
-    reason = array[last_item].chomp
-    test_suite_verify(array[@class_name])
-    printf "%-40s IGNORED\n", test_name
-
-    if test_name.start_with? 'TEST('
-      array2 = test_name.split(' ')
-      @test_suite = array2[0].sub('TEST(', '')
-      @test_suite = @test_suite.sub(',', '')
-      test_name = array2[1].sub(')', '')
-    end
-
-    return unless @xml_out
-
-    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '">'
-    @array_list.push '            <skipped type="TEST IGNORED"> ' + reason + ' </skipped>'
-    @array_list.push '     </testcase>'
-  end
-
-  # Test was flagged as having failed  so format the line
-  def test_failed(array)
-    last_item = array.length - 1
-    test_name = array[last_item - 2]
-    reason = array[last_item].chomp + ' at line: ' + array[last_item - 3]
-    test_suite_verify(array[@class_name])
-    printf "%-40s FAILED\n", test_name
-
-    if test_name.start_with? 'TEST('
-      array2 = test_name.split(' ')
-      @test_suite = array2[0].sub('TEST(', '')
-      @test_suite = @test_suite.sub(',', '')
-      test_name = array2[1].sub(')', '')
-    end
-
-    return unless @xml_out
-
-    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '">'
-    @array_list.push '            <failure type="ASSERT FAILED"> ' + reason + ' </failure>'
-    @array_list.push '     </testcase>'
-  end
-
-  # Figure out what OS we are running on.   For now we are assuming if it's not Windows it must
-  # be Unix based.
-  def detect_os
-    os = RUBY_PLATFORM.split('-')
-    @class_name = if os.size == 2
-                    if os[1] == 'mingw32'
-                      1
-                    else
-                      0
-                    end
-                  else
-                    0
-                  end
-  end
-
-  # Main function used to parse the file that was captured.
-  def process(name)
-    @test_flag = false
-    @array_list = []
-
-    detect_os
-
-    puts 'Parsing file: ' + name
-
-    test_pass = 0
-    test_fail = 0
-    test_ignore = 0
-    puts ''
-    puts '=================== RESULTS ====================='
-    puts ''
-    File.open(name).each do |line|
-      # Typical test lines look like this:
-      # <path>/<test_file>.c:36:test_tc1000_opsys:FAIL: Expected 1 Was 0
-      # <path>/<test_file>.c:112:test_tc5004_initCanChannel:IGNORE: Not Yet Implemented
-      # <path>/<test_file>.c:115:test_tc5100_initCanVoidPtrs:PASS
-      #
-      # where path is different on Unix vs Windows devices (Windows leads with a drive letter)
-      line_array = line.split(':')
-
-      # If we were able to split the line then we can look to see if any of our target words
-      # were found.  Case is important.
-      if (line_array.size >= 4) || (line.start_with? 'TEST(')
-        # Determine if this test passed
-        if line.include? ':PASS'
-          test_passed(line_array)
-          test_pass += 1
-        elsif line.include? ':FAIL:'
-          test_failed(line_array)
-          test_fail += 1
-        elsif line.include? ':IGNORE:'
-          test_ignored(line_array)
-          test_ignore += 1
-        elsif line.start_with? 'TEST('
-          if line.include? ' PASS'
-            line_array = line.split(' ')
-            test_passed_unity_fixture(line_array)
-            test_pass += 1
-          end
-        # If none of the keywords are found there are no more tests for this suite so clear
-        # the test flag
-        else
-          @test_flag = false
-        end
-      else
-        @test_flag = false
-      end
-    end
-    puts ''
-    puts '=================== SUMMARY ====================='
-    puts ''
-    puts 'Tests Passed  : ' + test_pass.to_s
-    puts 'Tests Failed  : ' + test_fail.to_s
-    puts 'Tests Ignored : ' + test_ignore.to_s
-    @total_tests = test_pass + test_fail + test_ignore
-
-    return unless @xml_out
-
-    heading = '<testsuite tests="' + @total_tests.to_s + '" failures="' + test_fail.to_s + '"' + ' skips="' + test_ignore.to_s + '">'
-    @array_list.insert(0, heading)
-    write_xml_output
-  end
-end
-
-# If the command line has no values in, used a default value of Output.txt
-parse_my_file = ParseOutput.new
-
-if ARGV.size >= 1
-  ARGV.each do |a|
-    if a == '-xml'
-      parse_my_file.set_xml_output
-    else
-      parse_my_file.process(a)
-      break
-    end
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/stylize_as_junit.rb b/external_libs/cJSON/cJSON/tests/unity/auto/stylize_as_junit.rb
deleted file mode 100755
index b3d8f409..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/stylize_as_junit.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/usr/bin/ruby
-#
-# unity_to_junit.rb
-#
-require 'fileutils'
-require 'optparse'
-require 'ostruct'
-require 'set'
-
-require 'pp'
-
-VERSION = 1.0
-
-class ArgvParser
-  #
-  # Return a structure describing the options.
-  #
-  def self.parse(args)
-    # The options specified on the command line will be collected in *options*.
-    # We set default values here.
-    options = OpenStruct.new
-    options.results_dir = '.'
-    options.root_path = '.'
-    options.out_file = 'results.xml'
-
-    opts = OptionParser.new do |o|
-      o.banner = 'Usage: unity_to_junit.rb [options]'
-
-      o.separator ''
-      o.separator 'Specific options:'
-
-      o.on('-r', '--results <dir>', 'Look for Unity Results files here.') do |results|
-        # puts "results #{results}"
-        options.results_dir = results
-      end
-
-      o.on('-p', '--root_path <path>', 'Prepend this path to files in results.') do |root_path|
-        options.root_path = root_path
-      end
-
-      o.on('-o', '--output <filename>', 'XML file to generate.') do |out_file|
-        # puts "out_file: #{out_file}"
-        options.out_file = out_file
-      end
-
-      o.separator ''
-      o.separator 'Common options:'
-
-      # No argument, shows at tail.  This will print an options summary.
-      o.on_tail('-h', '--help', 'Show this message') do
-        puts o
-        exit
-      end
-
-      # Another typical switch to print the version.
-      o.on_tail('--version', 'Show version') do
-        puts "unity_to_junit.rb version #{VERSION}"
-        exit
-      end
-    end
-
-    opts.parse!(args)
-    options
-  end # parse()
-end # class OptparseExample
-
-class UnityToJUnit
-  include FileUtils::Verbose
-  attr_reader :report, :total_tests, :failures, :ignored
-  attr_writer :targets, :root, :out_file
-
-  def initialize
-    @report = ''
-    @unit_name = ''
-  end
-
-  def run
-    # Clean up result file names
-    results = @targets.map { |target| target.tr('\\', '/') }
-    # puts "Output File: #{@out_file}"
-    f = File.new(@out_file, 'w')
-    write_xml_header(f)
-    write_suites_header(f)
-    results.each do |result_file|
-      lines = File.readlines(result_file).map(&:chomp)
-
-      raise "Empty test result file: #{result_file}" if lines.empty?
-
-      result_output = get_details(result_file, lines)
-      tests, failures, ignored = parse_test_summary(lines)
-      result_output[:counts][:total] = tests
-      result_output[:counts][:failed] = failures
-      result_output[:counts][:ignored] = ignored
-      result_output[:counts][:passed] = (result_output[:counts][:total] - result_output[:counts][:failed] - result_output[:counts][:ignored])
-
-      # use line[0] from the test output to get the test_file path and name
-      test_file_str = lines[0].tr('\\', '/')
-      test_file_str = test_file_str.split(':')
-      test_file = if test_file_str.length < 2
-                    result_file
-                  else
-                    test_file_str[0] + ':' + test_file_str[1]
-                  end
-      result_output[:source][:path] = File.dirname(test_file)
-      result_output[:source][:file] = File.basename(test_file)
-
-      # save result_output
-      @unit_name = File.basename(test_file, '.*')
-
-      write_suite_header(result_output[:counts], f)
-      write_failures(result_output, f)
-      write_tests(result_output, f)
-      write_ignored(result_output, f)
-      write_suite_footer(f)
-    end
-    write_suites_footer(f)
-    f.close
-  end
-
-  def usage(err_msg = nil)
-    puts "\nERROR: "
-    puts err_msg if err_msg
-    puts 'Usage: unity_to_junit.rb [options]'
-    puts ''
-    puts 'Specific options:'
-    puts '    -r, --results <dir>              Look for Unity Results files here.'
-    puts '    -p, --root_path <path>           Prepend this path to files in results.'
-    puts '    -o, --output <filename>          XML file to generate.'
-    puts ''
-    puts 'Common options:'
-    puts '    -h, --help                       Show this message'
-    puts '        --version                    Show version'
-
-    exit 1
-  end
-
-  protected
-
-  def get_details(_result_file, lines)
-    results = results_structure
-    lines.each do |line|
-      line = line.tr('\\', '/')
-      _src_file, src_line, test_name, status, msg = line.split(/:/)
-      case status
-      when 'IGNORE' then results[:ignores] << { test: test_name, line: src_line, message: msg }
-      when 'FAIL'   then results[:failures] << { test: test_name, line: src_line, message: msg }
-      when 'PASS'   then results[:successes] << { test: test_name, line: src_line, message: msg }
-      end
-    end
-    results
-  end
-
-  def parse_test_summary(summary)
-    raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
-    [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
-  end
-
-  def here
-    File.expand_path(File.dirname(__FILE__))
-  end
-
-  private
-
-  def results_structure
-    {
-      source: { path: '', file: '' },
-      successes: [],
-      failures: [],
-      ignores: [],
-      counts: { total: 0, passed: 0, failed: 0, ignored: 0 },
-      stdout: []
-    }
-  end
-
-  def write_xml_header(stream)
-    stream.puts "<?xml version='1.0' encoding='utf-8' ?>"
-  end
-
-  def write_suites_header(stream)
-    stream.puts '<testsuites>'
-  end
-
-  def write_suite_header(counts, stream)
-    stream.puts "\t<testsuite errors=\"0\" skipped=\"#{counts[:ignored]}\" failures=\"#{counts[:failed]}\" tests=\"#{counts[:total]}\" name=\"unity\">"
-  end
-
-  def write_failures(results, stream)
-    result = results[:failures]
-    result.each do |item|
-      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
-      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\">"
-      stream.puts "\t\t\t<failure message=\"#{item[:message]}\" type=\"Assertion\"/>"
-      stream.puts "\t\t\t<system-err>&#xD;[File] #{filename}&#xD;[Line] #{item[:line]}&#xD;</system-err>"
-      stream.puts "\t\t</testcase>"
-    end
-  end
-
-  def write_tests(results, stream)
-    result = results[:successes]
-    result.each do |item|
-      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\" />"
-    end
-  end
-
-  def write_ignored(results, stream)
-    result = results[:ignores]
-    result.each do |item|
-      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
-      puts "Writing ignored tests for test harness: #{filename}"
-      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\">"
-      stream.puts "\t\t\t<skipped message=\"#{item[:message]}\" type=\"Assertion\"/>"
-      stream.puts "\t\t\t<system-err>&#xD;[File] #{filename}&#xD;[Line] #{item[:line]}&#xD;</system-err>"
-      stream.puts "\t\t</testcase>"
-    end
-  end
-
-  def write_suite_footer(stream)
-    stream.puts "\t</testsuite>"
-  end
-
-  def write_suites_footer(stream)
-    stream.puts '</testsuites>'
-  end
-end # UnityToJUnit
-
-if __FILE__ == $0
-  # parse out the command options
-  options = ArgvParser.parse(ARGV)
-
-  # create an instance to work with
-  utj = UnityToJUnit.new
-  begin
-    # look in the specified or current directory for result files
-    targets = "#{options.results_dir.tr('\\', '/')}**/*.test*"
-
-    results = Dir[targets]
-    raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
-    utj.targets = results
-
-    # set the root path
-    utj.root = options.root_path
-
-    # set the output XML file name
-    # puts "Output File from options: #{options.out_file}"
-    utj.out_file = options.out_file
-
-    # run the summarizer
-    puts utj.run
-  rescue StandardError => e
-    utj.usage e.message
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/test_file_filter.rb b/external_libs/cJSON/cJSON/tests/unity/auto/test_file_filter.rb
deleted file mode 100644
index aad28e38..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/test_file_filter.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-require'yaml'
-
-module RakefileHelpers
-  class TestFileFilter
-    def initialize(all_files = false)
-      @all_files = all_files
-
-      return false unless @all_files
-      return false unless File.exist?('test_file_filter.yml')
-
-      filters = YAML.load_file('test_file_filter.yml')
-      @all_files = filters[:all_files]
-      @only_files = filters[:only_files]
-      @exclude_files = filters[:exclude_files]
-    end
-
-    attr_accessor :all_files, :only_files, :exclude_files
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/type_sanitizer.rb b/external_libs/cJSON/cJSON/tests/unity/auto/type_sanitizer.rb
deleted file mode 100644
index dafb8826..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/type_sanitizer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module TypeSanitizer
-  def self.sanitize_c_identifier(unsanitized)
-    # convert filename to valid C identifier by replacing invalid chars with '_'
-    unsanitized.gsub(/[-\/\\\.\,\s]/, '_')
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.py b/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.py
deleted file mode 100644
index 4c20e528..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#! python3
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2015 Alexander Mueller / XelaRellum@web.de
-#   [Released under MIT License. Please refer to license.txt for details]
-#   Based on the ruby script by  Mike Karlesky, Mark VanderVoord, Greg Williams
-# ==========================================
-import sys
-import os
-import re
-from glob import glob
-
-class UnityTestSummary:
-    def __init__(self):
-        self.report = ''
-        self.total_tests = 0
-        self.failures = 0
-        self.ignored = 0
-
-    def run(self):
-        # Clean up result file names
-        results = []
-        for target in self.targets:
-            results.append(target.replace('\\', '/'))
-
-        # Dig through each result file, looking for details on pass/fail:
-        failure_output = []
-        ignore_output = []
-
-        for result_file in results:
-            lines = list(map(lambda line: line.rstrip(), open(result_file, "r").read().split('\n')))
-            if len(lines) == 0:
-                raise Exception("Empty test result file: %s" % result_file)
-
-            details = self.get_details(result_file, lines)
-            failures = details['failures']
-            ignores = details['ignores']
-            if len(failures) > 0: failure_output.append('\n'.join(failures))
-            if len(ignores) > 0: ignore_output.append('n'.join(ignores))
-            tests,failures,ignored = self.parse_test_summary('\n'.join(lines))
-            self.total_tests += tests
-            self.failures += failures
-            self.ignored += ignored
-
-        if self.ignored > 0:
-            self.report += "\n"
-            self.report += "--------------------------\n"
-            self.report += "UNITY IGNORED TEST SUMMARY\n"
-            self.report += "--------------------------\n"
-            self.report += "\n".join(ignore_output)
-
-        if self.failures > 0:
-            self.report += "\n"
-            self.report += "--------------------------\n"
-            self.report += "UNITY FAILED TEST SUMMARY\n"
-            self.report += "--------------------------\n"
-            self.report += '\n'.join(failure_output)
-
-        self.report += "\n"
-        self.report += "--------------------------\n"
-        self.report += "OVERALL UNITY TEST SUMMARY\n"
-        self.report += "--------------------------\n"
-        self.report += "{total_tests} TOTAL TESTS {failures} TOTAL FAILURES {ignored} IGNORED\n".format(total_tests = self.total_tests, failures=self.failures, ignored=self.ignored)
-        self.report += "\n"
-
-        return self.report
-
-    def set_targets(self, target_array):
-            self.targets = target_array
-
-    def set_root_path(self, path):
-        self.root = path
-
-    def usage(self, err_msg=None):
-        print("\nERROR: ")
-        if err_msg:
-            print(err_msg)
-        print("\nUsage: unity_test_summary.py result_file_directory/ root_path/")
-        print("     result_file_directory - The location of your results files.")
-        print("                             Defaults to current directory if not specified.")
-        print("                             Should end in / if specified.")
-        print("     root_path - Helpful for producing more verbose output if using relative paths.")
-        sys.exit(1)
-
-    def get_details(self, result_file, lines):
-        results = { 'failures': [], 'ignores': [], 'successes': [] }
-        for line in lines:
-            parts = line.split(':')
-            if len(parts) == 5:
-                src_file,src_line,test_name,status,msg = parts
-            elif len(parts) == 4:
-                src_file,src_line,test_name,status = parts
-                msg = ''
-            else:
-                continue
-            if len(self.root) > 0:
-                line_out = "%s%s" % (self.root, line)
-            else:
-                line_out = line
-            if status == 'IGNORE':
-                results['ignores'].append(line_out)
-            elif status == 'FAIL':
-                results['failures'].append(line_out)
-            elif status == 'PASS':
-                results['successes'].append(line_out)
-        return results
-
-    def parse_test_summary(self, summary):
-        m = re.search(r"([0-9]+) Tests ([0-9]+) Failures ([0-9]+) Ignored", summary)
-        if not m:
-            raise Exception("Couldn't parse test results: %s" % summary)
-
-        return int(m.group(1)), int(m.group(2)), int(m.group(3))
-
-
-if __name__ == '__main__':
-  uts = UnityTestSummary()
-  try:
-    #look in the specified or current directory for result files
-    if len(sys.argv) > 1:
-        targets_dir = sys.argv[1]
-    else:
-        targets_dir = './'
-    targets = list(map(lambda x: x.replace('\\', '/'), glob(targets_dir + '*.test*')))
-    if len(targets) == 0:
-        raise Exception("No *.testpass or *.testfail files found in '%s'" % targets_dir)
-    uts.set_targets(targets)
-
-    #set the root path
-    if len(sys.argv) > 2:
-        root_path = sys.argv[2]
-    else:
-        root_path = os.path.split(__file__)[0]
-    uts.set_root_path(root_path)
-
-    #run the summarizer
-    print(uts.run())
-  except Exception as e:
-    uts.usage(e)
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.rb b/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.rb
deleted file mode 100644
index b37dc5fa..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-# !/usr/bin/ruby
-#
-# unity_test_summary.rb
-#
-require 'fileutils'
-require 'set'
-
-class UnityTestSummary
-  include FileUtils::Verbose
-
-  attr_reader :report, :total_tests, :failures, :ignored
-  attr_writer :targets, :root
-
-  def initialize(_opts = {})
-    @report = ''
-    @total_tests = 0
-    @failures = 0
-    @ignored = 0
-  end
-
-  def run
-    # Clean up result file names
-    results = @targets.map { |target| target.tr('\\', '/') }
-
-    # Dig through each result file, looking for details on pass/fail:
-    failure_output = []
-    ignore_output = []
-
-    results.each do |result_file|
-      lines = File.readlines(result_file).map(&:chomp)
-
-      raise "Empty test result file: #{result_file}" if lines.empty?
-
-      output = get_details(result_file, lines)
-      failure_output << output[:failures] unless output[:failures].empty?
-      ignore_output  << output[:ignores]  unless output[:ignores].empty?
-      tests, failures, ignored = parse_test_summary(lines)
-      @total_tests += tests
-      @failures += failures
-      @ignored += ignored
-    end
-
-    if @ignored > 0
-      @report += "\n"
-      @report += "--------------------------\n"
-      @report += "UNITY IGNORED TEST SUMMARY\n"
-      @report += "--------------------------\n"
-      @report += ignore_output.flatten.join("\n")
-    end
-
-    if @failures > 0
-      @report += "\n"
-      @report += "--------------------------\n"
-      @report += "UNITY FAILED TEST SUMMARY\n"
-      @report += "--------------------------\n"
-      @report += failure_output.flatten.join("\n")
-    end
-
-    @report += "\n"
-    @report += "--------------------------\n"
-    @report += "OVERALL UNITY TEST SUMMARY\n"
-    @report += "--------------------------\n"
-    @report += "#{@total_tests} TOTAL TESTS #{@failures} TOTAL FAILURES #{@ignored} IGNORED\n"
-    @report += "\n"
-  end
-
-  def usage(err_msg = nil)
-    puts "\nERROR: "
-    puts err_msg if err_msg
-    puts "\nUsage: unity_test_summary.rb result_file_directory/ root_path/"
-    puts '     result_file_directory - The location of your results files.'
-    puts '                             Defaults to current directory if not specified.'
-    puts '                             Should end in / if specified.'
-    puts '     root_path - Helpful for producing more verbose output if using relative paths.'
-    exit 1
-  end
-
-  protected
-
-  def get_details(_result_file, lines)
-    results = { failures: [], ignores: [], successes: [] }
-    lines.each do |line|
-      _src_file, _src_line, _test_name, status, _msg = line.split(/:/)
-      line_out = (@root && (@root != 0) ? "#{@root}#{line}" : line).gsub(/\//, '\\')
-      case status
-      when 'IGNORE' then results[:ignores]   << line_out
-      when 'FAIL'   then results[:failures]  << line_out
-      when 'PASS'   then results[:successes] << line_out
-      end
-    end
-    results
-  end
-
-  def parse_test_summary(summary)
-    raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
-    [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
-  end
-
-  def here
-    File.expand_path(File.dirname(__FILE__))
-  end
-end
-
-if $0 == __FILE__
-
-  # parse out the command options
-  opts, args = ARGV.partition { |v| v =~ /^--\w+/ }
-  opts.map! { |v| v[2..-1].to_sym }
-
-  # create an instance to work with
-  uts = UnityTestSummary.new(opts)
-
-  begin
-    # look in the specified or current directory for result files
-    args[0] ||= './'
-    targets = "#{ARGV[0].tr('\\', '/')}**/*.test*"
-    results = Dir[targets]
-    raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
-    uts.targets = results
-
-    # set the root path
-    args[1] ||= Dir.pwd + '/'
-    uts.root = ARGV[1]
-
-    # run the summarizer
-    puts uts.run
-  rescue StandardError => e
-    uts.usage e.message
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/auto/unity_to_junit.py b/external_libs/cJSON/cJSON/tests/unity/auto/unity_to_junit.py
deleted file mode 100644
index 71dd5688..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/auto/unity_to_junit.py
+++ /dev/null
@@ -1,146 +0,0 @@
-import sys
-import os
-from glob import glob
-
-from pyparsing import *
-from junit_xml import TestSuite, TestCase
-
-
-class UnityTestSummary:
-    def __init__(self):
-        self.report = ''
-        self.total_tests = 0
-        self.failures = 0
-        self.ignored = 0
-        self.targets = 0
-        self.root = None
-        self.test_suites = dict()
-
-    def run(self):
-        # Clean up result file names
-        results = []
-        for target in self.targets:
-            results.append(target.replace('\\', '/'))
-
-        # Dig through each result file, looking for details on pass/fail:
-        for result_file in results:
-            lines = list(map(lambda line: line.rstrip(), open(result_file, "r").read().split('\n')))
-            if len(lines) == 0:
-                raise Exception("Empty test result file: %s" % result_file)
-
-            # define an expression for your file reference
-            entry_one = Combine(
-                oneOf(list(alphas)) + ':/' +
-                Word(alphanums + '_-./'))
-
-            entry_two = Word(printables + ' ', excludeChars=':')
-            entry = entry_one | entry_two
-
-            delimiter = Literal(':').suppress()
-            tc_result_line = Group(entry.setResultsName('tc_file_name') + delimiter + entry.setResultsName(
-                'tc_line_nr') + delimiter + entry.setResultsName('tc_name') + delimiter + entry.setResultsName(
-                'tc_status') + Optional(
-                delimiter + entry.setResultsName('tc_msg'))).setResultsName("tc_line")
-
-            eol = LineEnd().suppress()
-            sol = LineStart().suppress()
-            blank_line = sol + eol
-
-            tc_summary_line = Group(Word(nums).setResultsName("num_of_tests") + "Tests" + Word(nums).setResultsName(
-                "num_of_fail") + "Failures" + Word(nums).setResultsName("num_of_ignore") + "Ignored").setResultsName(
-                "tc_summary")
-            tc_end_line = Or(Literal("FAIL"), Literal('Ok')).setResultsName("tc_result")
-
-            # run it and see...
-            pp1 = tc_result_line | Optional(tc_summary_line | tc_end_line)
-            pp1.ignore(blank_line | OneOrMore("-"))
-
-            result = list()
-            for l in lines:
-                result.append((pp1.parseString(l)).asDict())
-            # delete empty results
-            result = filter(None, result)
-
-            tc_list = list()
-            for r in result:
-                if 'tc_line' in r:
-                    tmp_tc_line = r['tc_line']
-
-                    # get only the file name which will be used as the classname
-                    file_name = tmp_tc_line['tc_file_name'].split('\\').pop().split('/').pop().rsplit('.', 1)[0]
-                    tmp_tc = TestCase(name=tmp_tc_line['tc_name'], classname=file_name)
-                    if 'tc_status' in tmp_tc_line:
-                        if str(tmp_tc_line['tc_status']) == 'IGNORE':
-                            if 'tc_msg' in tmp_tc_line:
-                                tmp_tc.add_skipped_info(message=tmp_tc_line['tc_msg'],
-                                                        output=r'[File]={0}, [Line]={1}'.format(
-                                                            tmp_tc_line['tc_file_name'], tmp_tc_line['tc_line_nr']))
-                            else:
-                                tmp_tc.add_skipped_info(message=" ")
-                        elif str(tmp_tc_line['tc_status']) == 'FAIL':
-                            if 'tc_msg' in tmp_tc_line:
-                                tmp_tc.add_failure_info(message=tmp_tc_line['tc_msg'],
-                                                        output=r'[File]={0}, [Line]={1}'.format(
-                                                            tmp_tc_line['tc_file_name'], tmp_tc_line['tc_line_nr']))
-                            else:
-                                tmp_tc.add_failure_info(message=" ")
-
-                    tc_list.append((str(result_file), tmp_tc))
-
-            for k, v in tc_list:
-                try:
-                    self.test_suites[k].append(v)
-                except KeyError:
-                    self.test_suites[k] = [v]
-        ts = []
-        for suite_name in self.test_suites:
-            ts.append(TestSuite(suite_name, self.test_suites[suite_name]))
-
-        with open('result.xml', 'w') as f:
-            TestSuite.to_file(f, ts, prettyprint='True', encoding='utf-8')
-
-        return self.report
-
-    def set_targets(self, target_array):
-        self.targets = target_array
-
-    def set_root_path(self, path):
-        self.root = path
-
-    @staticmethod
-    def usage(err_msg=None):
-        print("\nERROR: ")
-        if err_msg:
-            print(err_msg)
-        print("\nUsage: unity_test_summary.py result_file_directory/ root_path/")
-        print("     result_file_directory - The location of your results files.")
-        print("                             Defaults to current directory if not specified.")
-        print("                             Should end in / if specified.")
-        print("     root_path - Helpful for producing more verbose output if using relative paths.")
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    uts = UnityTestSummary()
-    try:
-        # look in the specified or current directory for result files
-        if len(sys.argv) > 1:
-            targets_dir = sys.argv[1]
-        else:
-            targets_dir = './'
-        targets = list(map(lambda x: x.replace('\\', '/'), glob(targets_dir + '*.test*')))
-        if len(targets) == 0:
-            raise Exception("No *.testpass or *.testfail files found in '%s'" % targets_dir)
-        uts.set_targets(targets)
-
-        # set the root path
-        if len(sys.argv) > 2:
-            root_path = sys.argv[2]
-        else:
-            root_path = os.path.split(__file__)[0]
-        uts.set_root_path(root_path)
-
-        # run the summarizer
-        print(uts.run())
-    except Exception as e:
-        UnityTestSummary.usage(e)
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/ThrowTheSwitchCodingStandard.md b/external_libs/cJSON/cJSON/tests/unity/docs/ThrowTheSwitchCodingStandard.md
deleted file mode 100644
index a85adef3..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/ThrowTheSwitchCodingStandard.md
+++ /dev/null
@@ -1,207 +0,0 @@
-# ThrowTheSwitch.org Coding Standard
-
-Hi. Welcome to the coding standard for ThrowTheSwitch.org. For the most part,
-we try to follow these standards to unify our contributors' code into a cohesive
-unit (puns intended). You might find places where these standards aren't
-followed. We're not perfect. Please be polite where you notice these discrepancies
-and we'll try to be polite when we notice yours.
-
-;)
-
-
-## Why Have A Coding Standard?
-
-Being consistent makes code easier to understand. We've made an attempt to keep
-our standard simple because we also believe that we can only expect someone to
-follow something that is understandable. Please do your best.
-
-
-## Our Philosophy
-
-Before we get into details on syntax, let's take a moment to talk about our
-vision for these tools. We're C developers and embedded software developers.
-These tools are great to test any C code, but catering to embedded software has
-made us more tolerant of compiler quirks. There are a LOT of quirky compilers
-out there. By quirky I mean "doesn't follow standards because they feel like
-they have a license to do as they wish."
-
-Our philosophy is "support every compiler we can". Most often, this means that
-we aim for writing C code that is standards compliant (often C89... that seems
-to be a sweet spot that is almost always compatible). But it also means these
-tools are tolerant of things that aren't common. Some that aren't even
-compliant. There are configuration options to override the size of standard
-types. There are configuration options to force Unity to not use certain
-standard library functions. A lot of Unity is configurable and we have worked
-hard to make it not TOO ugly in the process.
-
-Similarly, our tools that parse C do their best. They aren't full C parsers
-(yet) and, even if they were, they would still have to accept non-standard
-additions like gcc extensions or specifying `@0x1000` to force a variable to
-compile to a particular location. It's just what we do, because we like
-everything to Just Work™.
-
-Speaking of having things Just Work™, that's our second philosophy. By that, we
-mean that we do our best to have EVERY configuration option have a logical
-default. We believe that if you're working with a simple compiler and target,
-you shouldn't need to configure very much... we try to make the tools guess as
-much as they can, but give the user the power to override it when it's wrong.
-
-
-## Naming Things
-
-Let's talk about naming things. Programming is all about naming things. We name
-files, functions, variables, and so much more. While we're not always going to
-find the best name for something, we actually put quite a bit of effort into
-finding *What Something WANTS to be Called*™.
-
-When naming things, we more or less follow this hierarchy, the first being the
-most important to us (but we do all four whenever possible):
-1. Readable
-2. Descriptive
-3. Consistent
-4. Memorable
-
-
-#### Readable
-
-We want to read our code. This means we like names and flow that are more
-naturally read. We try to avoid double negatives. We try to avoid cryptic
-abbreviations (sticking to ones we feel are common).
-
-
-#### Descriptive
-
-We like descriptive names for things, especially functions and variables.
-Finding the right name for something is an important endeavor. You might notice
-from poking around our code that this often results in names that are a little
-longer than the average. Guilty. We're okay with a tiny bit more typing if it
-means our code is easier to understand.
-
-There are two exceptions to this rule that we also stick to as religiously as
-possible:
-
-First, while we realize hungarian notation (and similar systems for encoding
-type information into variable names) is providing a more descriptive name, we
-feel that (for the average developer) it takes away from readability and
-therefore is to be avoided.
-
-Second, loop counters and other local throw-away variables often have a purpose
-which is obvious. There's no need, therefore, to get carried away with complex
-naming. We find i, j, and k are better loop counters than loopCounterVar or
-whatnot. We only break this rule when we see that more description could improve
-understanding of an algorithm.
-
-
-#### Consistent
-
-We like consistency, but we're not really obsessed with it. We try to name our
-configuration macros in a consistent fashion... you'll notice a repeated use of
-UNITY_EXCLUDE_BLAH or UNITY_USES_BLAH macros. This helps users avoid having to
-remember each macro's details.
-
-
-#### Memorable
-
-Where ever it doesn't violate the above principles, we try to apply memorable
-names. Sometimes this means using something that is simply descriptive, but
-often we strive for descriptive AND unique... we like quirky names that stand
-out in our memory and are easier to search for. Take a look through the file
-names in Ceedling and you'll get a good idea of what we are talking about here.
-Why use preprocess when you can use preprocessinator? Or what better describes a
-module in charge of invoking tasks during releases than release_invoker? Don't
-get carried away. The names are still descriptive and fulfill the above
-requirements, but they don't feel stale.
-
-
-## C and C++ Details
-
-We don't really want to add to the style battles out there. Tabs or spaces?
-How many spaces? Where do the braces go? These are age-old questions that will
-never be answered... or at least not answered in a way that will make everyone
-happy.
-
-We've decided on our own style preferences. If you'd like to contribute to these
-projects (and we hope that you do), then we ask if you do your best to follow
-the same. It will only hurt a little. We promise.
-
-
-#### Whitespace
-
-Our C-style is to use spaces and to use 4 of them per indent level. It's a nice
-power-of-2 number that looks decent on a wide screen. We have no more reason
-than that. We break that rule when we have lines that wrap (macros or function
-arguments or whatnot). When that happens, we like to indent further to line
-things up in nice tidy columns.
-
-```C
-    if (stuff_happened)
-    {
-        do_something();
-    }
-```
-
-
-#### Case
-
-- Files - all lower case with underscores.
-- Variables - all lower case with underscores
-- Macros - all caps with underscores.
-- Typedefs - all caps with underscores. (also ends with _T).
-- Functions - camel cased. Usually named ModuleName_FuncName
-- Constants and Globals - camel cased.
-
-
-#### Braces
-
-The left brace is on the next line after the declaration. The right brace is
-directly below that. Everything in between in indented one level. If you're
-catching an error and you have a one-line, go ahead and to it on the same line.
-
-```C
-    while (blah)
-    {
-        //Like so. Even if only one line, we use braces.
-    }
-```
-
-
-#### Comments
-
-Do you know what we hate? Old-school C block comments. BUT, we're using them
-anyway. As we mentioned, our goal is to support every compiler we can,
-especially embedded compilers. There are STILL C compilers out there that only
-support old-school block comments. So that is what we're using. We apologize. We
-think they are ugly too.
-
-
-## Ruby Details
-
-Is there really such thing as a Ruby coding standard? Ruby is such a free form
-language, it seems almost sacrilegious to suggest that people should comply to
-one method! We'll keep it really brief!
-
-
-#### Whitespace
-
-Our Ruby style is to use spaces and to use 2 of them per indent level. It's a
-nice power-of-2 number that really grooves with Ruby's compact style. We have no
-more reason than that. We break that rule when we have lines that wrap. When
-that happens, we like to indent further to line things up in nice tidy columns.
-
-
-#### Case
-
-- Files - all lower case with underscores.
-- Variables - all lower case with underscores
-- Classes, Modules, etc - Camel cased.
-- Functions - all lower case with underscores
-- Constants - all upper case with underscores
-
-
-## Documentation
-
-Egad. Really? We use markdown and we like pdf files because they can be made to
-look nice while still being portable. Good enough?
-
-
-*Find The Latest of This And More at [ThrowTheSwitch.org](https://throwtheswitch.org)*
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf b/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf
deleted file mode 100644
index 28f0c321..00000000
Binary files a/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf and /dev/null differ
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsReference.md b/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsReference.md
deleted file mode 100644
index 2dcf5e3a..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsReference.md
+++ /dev/null
@@ -1,770 +0,0 @@
-# Unity Assertions Reference
-
-## Background and Overview
-
-### Super Condensed Version
-
-- An assertion establishes truth (i.e. boolean True) for a single condition.
-Upon boolean False, an assertion stops execution and reports the failure.
-- Unity is mainly a rich collection of assertions and the support to gather up
-and easily execute those assertions.
-- The structure of Unity allows you to easily separate test assertions from
-source code in, well, test code.
-- Unity's assertions:
-- Come in many, many flavors to handle different C types and assertion cases.
-- Use context to provide detailed and helpful failure messages.
-- Document types, expected values, and basic behavior in your source code for
-free.
-
-
-### Unity Is Several Things But Mainly It's Assertions
-
-One way to think of Unity is simply as a rich collection of assertions you can
-use to establish whether your source code behaves the way you think it does.
-Unity provides a framework to easily organize and execute those assertions in
-test code separate from your source code.
-
-
-### What's an Assertion?
-
-At their core, assertions are an establishment of truth - boolean truth. Was this
-thing equal to that thing? Does that code doohickey have such-and-such property
-or not? You get the idea. Assertions are executable code (to appreciate the big
-picture on this read up on the difference between
-[link:Dynamic Verification and Static Analysis]). A failing assertion stops
-execution and reports an error through some appropriate I/O channel (e.g.
-stdout, GUI, file, blinky light).
-
-Fundamentally, for dynamic verification all you need is a single assertion
-mechanism. In fact, that's what the [assert() macro in C's standard library](http://en.wikipedia.org/en/wiki/Assert.h)
-is for. So why not just use it? Well, we can do far better in the reporting
-department. C's `assert()` is pretty dumb as-is and is particularly poor for
-handling common data types like arrays, structs, etc. And, without some other
-support, it's far too tempting to litter source code with C's `assert()`'s. It's
-generally much cleaner, manageable, and more useful to separate test and source
-code in the way Unity facilitates.
-
-
-### Unity's Assertions: Helpful Messages _and_ Free Source Code Documentation
-
-Asserting a simple truth condition is valuable, but using the context of the
-assertion is even more valuable. For instance, if you know you're comparing bit
-flags and not just integers, then why not use that context to give explicit,
-readable, bit-level feedback when an assertion fails?
-
-That's what Unity's collection of assertions do - capture context to give you
-helpful, meaningful assertion failure messages. In fact, the assertions
-themselves also serve as executable documentation about types and values in your
-source code. So long as your tests remain current with your source and all those
-tests pass, you have a detailed, up-to-date view of the intent and mechanisms in
-your source code. And due to a wondrous mystery, well-tested code usually tends
-to be well designed code.
-
-
-## Assertion Conventions and Configurations
-
-### Naming and Parameter Conventions
-
-The convention of assertion parameters generally follows this order:
-
-    TEST_ASSERT_X( {modifiers}, {expected}, actual, {size/count} )
-
-The very simplest assertion possible uses only a single "actual" parameter (e.g.
-a simple null check).
-
-"Actual" is the value being tested and unlike the other parameters in an
-assertion construction is the only parameter present in all assertion variants.
-"Modifiers" are masks, ranges, bit flag specifiers, floating point deltas.
-"Expected" is your expected value (duh) to compare to an "actual" value; it's
-marked as an optional parameter because some assertions only need a single
-"actual" parameter (e.g. null check).
-"Size/count" refers to string lengths, number of array elements, etc.
-
-Many of Unity's assertions are apparent duplications in that the same data type
-is handled by several assertions. The differences among these are in how failure
-messages are presented. For instance, a `_HEX` variant of an assertion prints
-the expected and actual values of that assertion formatted as hexadecimal.
-
-
-#### TEST_ASSERT_X_MESSAGE Variants
-
-_All_ assertions are complemented with a variant that includes a simple string
-message as a final parameter. The string you specify is appended to an assertion
-failure message in Unity output.
-
-For brevity, the assertion variants with a message parameter are not listed
-below. Just tack on `_MESSAGE` as the final component to any assertion name in
-the reference list below and add a string as the final parameter.
-
-_Example:_
-
-    TEST_ASSERT_X( {modifiers}, {expected}, actual, {size/count} )
-
-becomes messageified like thus...
-
-    TEST_ASSERT_X_MESSAGE( {modifiers}, {expected}, actual, {size/count}, message )
-
-
-#### TEST_ASSERT_X_ARRAY Variants
-
-Unity provides a collection of assertions for arrays containing a variety of
-types. These are documented in the Array section below. These are almost on par
-with the `_MESSAGE`variants of Unity's Asserts in that for pretty much any Unity
-type assertion you can tack on `_ARRAY` and run assertions on an entire block of
-memory.
-
-    TEST_ASSERT_EQUAL_TYPEX_ARRAY( expected, actual, {size/count} )
-
-"Expected" is an array itself.
-"Size/count" is one or two parameters necessary to establish the number of array
-elements and perhaps the length of elements within the array.
-
-Notes:
-- The `_MESSAGE` variant convention still applies here to array assertions. The
-`_MESSAGE` variants of the `_ARRAY` assertions have names ending with
-`_ARRAY_MESSAGE`.
-- Assertions for handling arrays of floating point values are grouped with float
-and double assertions (see immediately following section).
-
-
-### TEST_ASSERT_EACH_EQUAL_X Variants
-
-Unity provides a collection of assertions for arrays containing a variety of
-types which can be compared to a single value as well. These are documented in
-the Each Equal section below. these are almost on par with the `_MESSAGE`
-variants of Unity's Asserts in that for pretty much any Unity type assertion you
-can inject _EACH_EQUAL and run assertions on an entire block of memory.
-
-    TEST_ASSERT_EACH_EQUAL_TYPEX( expected, actual, {size/count} )
-
-"Expected" is a single value to compare to.
-"Actual" is an array where each element will be compared to the expected value.
-"Size/count" is one of two parameters necessary to establish the number of array
-elements and perhaps the length of elements within the array.
-
-Notes:
-- The `_MESSAGE` variant convention still applies here to Each Equal assertions.
-- Assertions for handling Each Equal of floating point values are grouped with
-float and double assertions (see immediately following section).
-
-
-### Configuration
-
-#### Floating Point Support Is Optional
-
-Support for floating point types is configurable. That is, by defining the
-appropriate preprocessor symbols, floats and doubles can be individually enabled
-or disabled in Unity code. This is useful for embedded targets with no floating
-point math support (i.e. Unity compiles free of errors for fixed point only
-platforms). See Unity documentation for specifics.
-
-
-#### Maximum Data Type Width Is Configurable
-
-Not all targets support 64 bit wide types or even 32 bit wide types. Define the
-appropriate preprocessor symbols and Unity will omit all operations from
-compilation that exceed the maximum width of your target. See Unity
-documentation for specifics.
-
-
-## The Assertions in All Their Blessed Glory
-
-### Basic Fail and Ignore
-
-##### `TEST_FAIL()`
-
-This fella is most often used in special conditions where your test code is
-performing logic beyond a simple assertion. That is, in practice, `TEST_FAIL()`
-will always be found inside a conditional code block.
-
-_Examples:_
-- Executing a state machine multiple times that increments a counter your test
-code then verifies as a final step.
-- Triggering an exception and verifying it (as in Try / Catch / Throw - see the
-[CException](https://github.com/ThrowTheSwitch/CException) project).
-
-##### `TEST_IGNORE()`
-
-Marks a test case (i.e. function meant to contain test assertions) as ignored.
-Usually this is employed as a breadcrumb to come back and implement a test case.
-An ignored test case has effects if other assertions are in the enclosing test
-case (see Unity documentation for more).
-
-### Boolean
-
-##### `TEST_ASSERT (condition)`
-
-##### `TEST_ASSERT_TRUE (condition)`
-
-##### `TEST_ASSERT_FALSE (condition)`
-
-##### `TEST_ASSERT_UNLESS (condition)`
-
-A simple wording variation on `TEST_ASSERT_FALSE`.The semantics of
-`TEST_ASSERT_UNLESS` aid readability in certain test constructions or
-conditional statements.
-
-##### `TEST_ASSERT_NULL (pointer)`
-
-##### `TEST_ASSERT_NOT_NULL (pointer)`
-
-
-### Signed and Unsigned Integers (of all sizes)
-
-Large integer sizes can be disabled for build targets that do not support them.
-For example, if your target only supports up to 16 bit types, by defining the
-appropriate symbols Unity can be configured to omit 32 and 64 bit operations
-that would break compilation (see Unity documentation for more). Refer to
-Advanced Asserting later in this document for advice on dealing with other word
-sizes.
-
-##### `TEST_ASSERT_EQUAL_INT (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_INT8 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_INT16 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_INT32 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_INT64 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL (expected, actual)`
-
-##### `TEST_ASSERT_NOT_EQUAL (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_UINT (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_UINT8 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_UINT16 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_UINT32 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_UINT64 (expected, actual)`
-
-
-### Unsigned Integers (of all sizes) in Hexadecimal
-
-All `_HEX` assertions are identical in function to unsigned integer assertions
-but produce failure messages with the `expected` and `actual` values formatted
-in hexadecimal. Unity output is big endian.
-
-##### `TEST_ASSERT_EQUAL_HEX (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_HEX8 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_HEX16 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_HEX32 (expected, actual)`
-
-##### `TEST_ASSERT_EQUAL_HEX64 (expected, actual)`
-
-
-### Masked and Bit-level Assertions
-
-Masked and bit-level assertions produce output formatted in hexadecimal. Unity
-output is big endian.
-
-
-##### `TEST_ASSERT_BITS (mask, expected, actual)`
-
-Only compares the masked (i.e. high) bits of `expected` and `actual` parameters.
-
-
-##### `TEST_ASSERT_BITS_HIGH (mask, actual)`
-
-Asserts the masked bits of the `actual` parameter are high.
-
-
-##### `TEST_ASSERT_BITS_LOW (mask, actual)`
-
-Asserts the masked bits of the `actual` parameter are low.
-
-
-##### `TEST_ASSERT_BIT_HIGH (bit, actual)`
-
-Asserts the specified bit of the `actual` parameter is high.
-
-
-##### `TEST_ASSERT_BIT_LOW (bit, actual)`
-
-Asserts the specified bit of the `actual` parameter is low.
-
-### Integer Less Than / Greater Than
-
-These assertions verify that the `actual` parameter is less than or greater
-than `threshold` (exclusive). For example, if the threshold value is 0 for the
-greater than assertion will fail if it is 0 or less.
-
-##### `TEST_ASSERT_GREATER_THAN (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT32 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT32 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX32 (threshold, actual)`
-
-
-### Integer Ranges (of all sizes)
-
-These assertions verify that the `expected` parameter is within +/- `delta`
-(inclusive) of the `actual` parameter. For example, if the expected value is 10
-and the delta is 3 then the assertion will fail for any value outside the range
-of 7 - 13.
-
-##### `TEST_ASSERT_INT_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_INT8_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_INT16_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_INT32_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_INT64_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_UINT_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_UINT8_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_UINT16_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_UINT32_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_UINT64_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_HEX_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_HEX8_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_HEX16_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_HEX32_WITHIN (delta, expected, actual)`
-
-##### `TEST_ASSERT_HEX64_WITHIN (delta, expected, actual)`
-
-
-### Structs and Strings
-
-##### `TEST_ASSERT_EQUAL_PTR (expected, actual)`
-
-Asserts that the pointers point to the same memory location.
-
-
-##### `TEST_ASSERT_EQUAL_STRING (expected, actual)`
-
-Asserts that the null terminated (`'\0'`)strings are identical. If strings are
-of different lengths or any portion of the strings before their terminators
-differ, the assertion fails. Two NULL strings (i.e. zero length) are considered
-equivalent.
-
-
-##### `TEST_ASSERT_EQUAL_MEMORY (expected, actual, len)`
-
-Asserts that the contents of the memory specified by the `expected` and `actual`
-pointers is identical. The size of the memory blocks in bytes is specified by
-the `len` parameter.
-
-
-### Arrays
-
-`expected` and `actual` parameters are both arrays. `num_elements` specifies the
-number of elements in the arrays to compare.
-
-`_HEX` assertions produce failure messages with expected and actual array
-contents formatted in hexadecimal.
-
-For array of strings comparison behavior, see comments for
-`TEST_ASSERT_EQUAL_STRING` in the preceding section.
-
-Assertions fail upon the first element in the compared arrays found not to
-match. Failure messages specify the array index of the failed comparison.
-
-##### `TEST_ASSERT_EQUAL_INT_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_INT8_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_INT16_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_INT32_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_INT64_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_UINT_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_UINT8_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_UINT16_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_UINT32_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_UINT64_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_HEX_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_HEX8_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_HEX16_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_HEX32_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_HEX64_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_PTR_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_STRING_ARRAY (expected, actual, num_elements)`
-
-##### `TEST_ASSERT_EQUAL_MEMORY_ARRAY (expected, actual, len, num_elements)`
-
-`len` is the memory in bytes to be compared at each array element.
-
-
-### Each Equal (Arrays to Single Value)
-
-`expected` are single values and `actual` are arrays. `num_elements` specifies
-the number of elements in the arrays to compare.
-
-`_HEX` assertions produce failure messages with expected and actual array
-contents formatted in hexadecimal.
-
-Assertions fail upon the first element in the compared arrays found not to
-match. Failure messages specify the array index of the failed comparison.
-
-#### `TEST_ASSERT_EACH_EQUAL_INT (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_INT8 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_INT16 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_INT32 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_INT64 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_UINT (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_UINT8 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_UINT16 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_UINT32 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_UINT64 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_HEX (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_HEX8 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_HEX16 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_HEX32 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_HEX64 (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_PTR (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_STRING (expected, actual, num_elements)`
-
-#### `TEST_ASSERT_EACH_EQUAL_MEMORY (expected, actual, len, num_elements)`
-
-`len` is the memory in bytes to be compared at each array element.
-
-
-### Floating Point (If enabled)
-
-##### `TEST_ASSERT_FLOAT_WITHIN (delta, expected, actual)`
-
-Asserts that the `actual` value is within +/- `delta` of the `expected` value.
-The nature of floating point representation is such that exact evaluations of
-equality are not guaranteed.
-
-
-##### `TEST_ASSERT_EQUAL_FLOAT (expected, actual)`
-
-Asserts that the ?actual?value is "close enough to be considered equal" to the
-`expected` value. If you are curious about the details, refer to the Advanced
-Asserting section for more details on this. Omitting a user-specified delta in a
-floating point assertion is both a shorthand convenience and a requirement of
-code generation conventions for CMock.
-
-
-##### `TEST_ASSERT_EQUAL_FLOAT_ARRAY (expected, actual, num_elements)`
-
-See Array assertion section for details. Note that individual array element
-float comparisons are executed using T?EST_ASSERT_EQUAL_FLOAT?.That is, user
-specified delta comparison values requires a custom-implemented floating point
-array assertion.
-
-
-##### `TEST_ASSERT_FLOAT_IS_INF (actual)`
-
-Asserts that `actual` parameter is equivalent to positive infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NEG_INF (actual)`
-
-Asserts that `actual` parameter is equivalent to negative infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NAN (actual)`
-
-Asserts that `actual` parameter is a Not A Number floating point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_DETERMINATE (actual)`
-
-Asserts that ?actual?parameter is a floating point representation usable for
-mathematical operations. That is, the `actual` parameter is neither positive
-infinity nor negative infinity nor Not A Number floating point representations.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NOT_INF (actual)`
-
-Asserts that `actual` parameter is a value other than positive infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NOT_NEG_INF (actual)`
-
-Asserts that `actual` parameter is a value other than negative infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NOT_NAN (actual)`
-
-Asserts that `actual` parameter is a value other than Not A Number floating
-point representation.
-
-
-##### `TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE (actual)`
-
-Asserts that `actual` parameter is not usable for mathematical operations. That
-is, the `actual` parameter is either positive infinity or negative infinity or
-Not A Number floating point representations.
-
-
-### Double (If enabled)
-
-##### `TEST_ASSERT_DOUBLE_WITHIN (delta, expected, actual)`
-
-Asserts that the `actual` value is within +/- `delta` of the `expected` value.
-The nature of floating point representation is such that exact evaluations of
-equality are not guaranteed.
-
-
-##### `TEST_ASSERT_EQUAL_DOUBLE (expected, actual)`
-
-Asserts that the `actual` value is "close enough to be considered equal" to the
-`expected` value. If you are curious about the details, refer to the Advanced
-Asserting section for more details. Omitting a user-specified delta in a
-floating point assertion is both a shorthand convenience and a requirement of
-code generation conventions for CMock.
-
-
-##### `TEST_ASSERT_EQUAL_DOUBLE_ARRAY (expected, actual, num_elements)`
-
-See Array assertion section for details. Note that individual array element
-double comparisons are executed using `TEST_ASSERT_EQUAL_DOUBLE`.That is, user
-specified delta comparison values requires a custom implemented double array
-assertion.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_INF (actual)`
-
-Asserts that `actual` parameter is equivalent to positive infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NEG_INF (actual)`
-
-Asserts that `actual` parameter is equivalent to negative infinity floating point
-representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NAN (actual)`
-
-Asserts that `actual` parameter is a Not A Number floating point representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_DETERMINATE (actual)`
-
-Asserts that `actual` parameter is a floating point representation usable for
-mathematical operations. That is, the ?actual?parameter is neither positive
-infinity nor negative infinity nor Not A Number floating point representations.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NOT_INF (actual)`
-
-Asserts that `actual` parameter is a value other than positive infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF (actual)`
-
-Asserts that `actual` parameter is a value other than negative infinity floating
-point representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NOT_NAN (actual)`
-
-Asserts that `actual` parameter is a value other than Not A Number floating
-point representation.
-
-
-##### `TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE (actual)`
-
-Asserts that `actual` parameter is not usable for mathematical operations. That
-is, the `actual` parameter is either positive infinity or negative infinity or
-Not A Number floating point representations.
-
-
-## Advanced Asserting: Details On Tricky Assertions
-
-This section helps you understand how to deal with some of the trickier
-assertion situations you may run into. It will give you a glimpse into some of
-the under-the-hood details of Unity's assertion mechanisms. If you're one of
-those people who likes to know what is going on in the background, read on. If
-not, feel free to ignore the rest of this document until you need it.
-
-
-### How do the EQUAL assertions work for FLOAT and DOUBLE?
-
-As you may know, directly checking for equality between a pair of floats or a
-pair of doubles is sloppy at best and an outright no-no at worst. Floating point
-values can often be represented in multiple ways, particularly after a series of
-operations on a value. Initializing a variable to the value of 2.0 is likely to
-result in a floating point representation of 2 x 20,but a series of
-mathematical operations might result in a representation of 8 x 2-2
-that also evaluates to a value of 2. At some point repeated operations cause
-equality checks to fail.
-
-So Unity doesn't do direct floating point comparisons for equality. Instead, it
-checks if two floating point values are "really close." If you leave Unity
-running with defaults, "really close" means "within a significant bit or two."
-Under the hood, `TEST_ASSERT_EQUAL_FLOAT` is really `TEST_ASSERT_FLOAT_WITHIN`
-with the `delta` parameter calculated on the fly. For single precision, delta is
-the expected value multiplied by 0.00001, producing a very small proportional
-range around the expected value.
-
-If you are expecting a value of 20,000.0 the delta is calculated to be 0.2. So
-any value between 19,999.8 and 20,000.2 will satisfy the equality check. This
-works out to be roughly a single bit of range for a single-precision number, and
-that's just about as tight a tolerance as you can reasonably get from a floating
-point value.
-
-So what happens when it's zero? Zero - even more than other floating point
-values - can be represented many different ways. It doesn't matter if you have
-0 x 20or 0 x 263.It's still zero, right? Luckily, if you
-subtract these values from each other, they will always produce a difference of
-zero, which will still fall between 0 plus or minus a delta of 0. So it still
-works!
-
-Double precision floating point numbers use a much smaller multiplier, again
-approximating a single bit of error.
-
-If you don't like these ranges and you want to make your floating point equality
-assertions less strict, you can change these multipliers to whatever you like by
-defining UNITY_FLOAT_PRECISION and UNITY_DOUBLE_PRECISION. See Unity
-documentation for more.
-
-
-### How do we deal with targets with non-standard int sizes?
-
-It's "fun" that C is a standard where something as fundamental as an integer
-varies by target. According to the C standard, an `int` is to be the target's
-natural register size, and it should be at least 16-bits and a multiple of a
-byte. It also guarantees an order of sizes:
-
-```C
-char <= short <= int <= long <= long long
-```
-
-Most often, `int` is 32-bits. In many cases in the embedded world, `int` is
-16-bits. There are rare microcontrollers out there that have 24-bit integers,
-and this remains perfectly standard C.
-
-To make things even more interesting, there are compilers and targets out there
-that have a hard choice to make. What if their natural register size is 10-bits
-or 12-bits? Clearly they can't fulfill _both_ the requirement to be at least
-16-bits AND the requirement to match the natural register size. In these
-situations, they often choose the natural register size, leaving us with
-something like this:
-
-```C
-char (8 bit) <= short (12 bit) <= int (12 bit) <= long (16 bit)
-```
-
-Um... yikes. It's obviously breaking a rule or two... but they had to break SOME
-rules, so they made a choice.
-
-When the C99 standard rolled around, it introduced alternate standard-size types.
-It also introduced macros for pulling in MIN/MAX values for your integer types.
-It's glorious! Unfortunately, many embedded compilers can't be relied upon to
-use the C99 types (Sometimes because they have weird register sizes as described
-above. Sometimes because they don't feel like it?).
-
-A goal of Unity from the beginning was to support every combination of
-microcontroller or microprocessor and C compiler. Over time, we've gotten really
-close to this. There are a few tricks that you should be aware of, though, if
-you're going to do this effectively on some of these more idiosyncratic targets.
-
-First, when setting up Unity for a new target, you're going to want to pay
-special attention to the macros for automatically detecting types
-(where available) or manually configuring them yourself. You can get information
-on both of these in Unity's documentation.
-
-What about the times where you suddenly need to deal with something odd, like a
-24-bit `int`? The simplest solution is to use the next size up. If you have a
-24-bit `int`, configure Unity to use 32-bit integers. If you have a 12-bit
-`int`, configure Unity to use 16 bits. There are two ways this is going to
-affect you:
-
-1. When Unity displays errors for you, it's going to pad the upper unused bits
-with zeros.
-2. You're going to have to be careful of assertions that perform signed
-operations, particularly `TEST_ASSERT_INT_WITHIN`.Such assertions might wrap
-your `int` in the wrong place, and you could experience false failures. You can
-always back down to a simple `TEST_ASSERT` and do the operations yourself.
-
-
-*Find The Latest of This And More at [ThrowTheSwitch.org](https://throwtheswitch.org)*
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/UnityConfigurationGuide.md b/external_libs/cJSON/cJSON/tests/unity/docs/UnityConfigurationGuide.md
deleted file mode 100644
index 96e5358d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/UnityConfigurationGuide.md
+++ /dev/null
@@ -1,435 +0,0 @@
-# Unity Configuration Guide
-
-## C Standards, Compilers and Microcontrollers
-
-The embedded software world contains its challenges. Compilers support different
-revisions of the C Standard. They ignore requirements in places, sometimes to
-make the language more usable in some special regard. Sometimes it's to simplify
-their support. Sometimes it's due to specific quirks of the microcontroller they
-are targeting. Simulators add another dimension to this menagerie.
-
-Unity is designed to run on almost anything that is targeted by a C compiler. It
-would be awesome if this could be done with zero configuration. While there are
-some targets that come close to this dream, it is sadly not universal. It is
-likely that you are going to need at least a couple of the configuration options
-described in this document.
-
-All of Unity's configuration options are `#defines`. Most of these are simple
-definitions. A couple are macros with arguments. They live inside the
-unity_internals.h header file. We don't necessarily recommend opening that file
-unless you really need to. That file is proof that a cross-platform library is
-challenging to build. From a more positive perspective, it is also proof that a
-great deal of complexity can be centralized primarily to one place in order to
-provide a more consistent and simple experience elsewhere.
-
-
-### Using These Options
-
-It doesn't matter if you're using a target-specific compiler and a simulator or
-a native compiler. In either case, you've got a couple choices for configuring
-these options:
-
-1. Because these options are specified via C defines, you can pass most of these
-options to your compiler through command line compiler flags. Even if you're
-using an embedded target that forces you to use their overbearing IDE for all
-configuration, there will be a place somewhere in your project to configure
-defines for your compiler.
-2. You can create a custom `unity_config.h` configuration file (present in your
-toolchain's search paths). In this file, you will list definitions and macros
-specific to your target. All you must do is define `UNITY_INCLUDE_CONFIG_H` and
-Unity will rely on `unity_config.h` for any further definitions it may need.
-
-
-## The Options
-
-### Integer Types
-
-If you've been a C developer for long, you probably already know that C's
-concept of an integer varies from target to target. The C Standard has rules
-about the `int` matching the register size of the target microprocessor. It has
-rules about the `int` and how its size relates to other integer types. An `int`
-on one target might be 16 bits while on another target it might be 64. There are
-more specific types in compilers compliant with C99 or later, but that's
-certainly not every compiler you are likely to encounter. Therefore, Unity has a
-number of features for helping to adjust itself to match your required integer
-sizes. It starts off by trying to do it automatically.
-
-
-##### `UNITY_EXCLUDE_STDINT_H`
-
-The first thing that Unity does to guess your types is check `stdint.h`.
-This file includes defines like `UINT_MAX` that Unity can make use of to
-learn a lot about your system. It's possible you don't want it to do this
-(um. why not?) or (more likely) it's possible that your system doesn't
-support `stdint.h`. If that's the case, you're going to want to define this.
-That way, Unity will know to skip the inclusion of this file and you won't
-be left with a compiler error.
-
-_Example:_
-        #define UNITY_EXCLUDE_STDINT_H
-
-
-##### `UNITY_EXCLUDE_LIMITS_H`
-
-The second attempt to guess your types is to check `limits.h`. Some compilers
-that don't support `stdint.h` could include `limits.h` instead. If you don't
-want Unity to check this file either, define this to make it skip the inclusion.
-
-_Example:_
-        #define UNITY_EXCLUDE_LIMITS_H
-
-
-If you've disabled both of the automatic options above, you're going to have to
-do the configuration yourself. Don't worry. Even this isn't too bad... there are
-just a handful of defines that you are going to specify if you don't like the
-defaults.
-
-
-##### `UNITY_INT_WIDTH`
-
-Define this to be the number of bits an `int` takes up on your system. The
-default, if not autodetected, is 32 bits.
-
-_Example:_
-        #define UNITY_INT_WIDTH 16
-
-
-##### `UNITY_LONG_WIDTH`
-
-Define this to be the number of bits a `long` takes up on your system. The
-default, if not autodetected, is 32 bits. This is used to figure out what kind
-of 64-bit support your system can handle. Does it need to specify a `long` or a
-`long long` to get a 64-bit value. On 16-bit systems, this option is going to be
-ignored.
-
-_Example:_
-        #define UNITY_LONG_WIDTH 16
-
-
-##### `UNITY_POINTER_WIDTH`
-
-Define this to be the number of bits a pointer takes up on your system. The
-default, if not autodetected, is 32-bits. If you're getting ugly compiler
-warnings about casting from pointers, this is the one to look at.
-
-_Example:_
-        #define UNITY_POINTER_WIDTH 64
-
-
-##### `UNITY_SUPPORT_64`
-
-Unity will automatically include 64-bit support if it auto-detects it, or if
-your `int`, `long`, or pointer widths are greater than 32-bits. Define this to
-enable 64-bit support if none of the other options already did it for you. There
-can be a significant size and speed impact to enabling 64-bit support on small
-targets, so don't define it if you don't need it.
-
-_Example:_
-        #define UNITY_SUPPORT_64
-
-
-### Floating Point Types
-
-In the embedded world, it's not uncommon for targets to have no support for
-floating point operations at all or to have support that is limited to only
-single precision. We are able to guess integer sizes on the fly because integers
-are always available in at least one size. Floating point, on the other hand, is
-sometimes not available at all. Trying to include `float.h` on these platforms
-would result in an error. This leaves manual configuration as the only option.
-
-
-##### `UNITY_INCLUDE_FLOAT`
-
-##### `UNITY_EXCLUDE_FLOAT`
-
-##### `UNITY_INCLUDE_DOUBLE`
-
-##### `UNITY_EXCLUDE_DOUBLE`
-
-By default, Unity guesses that you will want single precision floating point
-support, but not double precision. It's easy to change either of these using the
-include and exclude options here. You may include neither, either, or both, as
-suits your needs. For features that are enabled, the following floating point
-options also become available.
-
-_Example:_
-
-        //what manner of strange processor is this?
-        #define UNITY_EXCLUDE_FLOAT
-        #define UNITY_INCLUDE_DOUBLE
-
-
-##### `UNITY_EXCLUDE_FLOAT_PRINT`
-
-Unity aims for as small of a footprint as possible and avoids most standard
-library calls (some embedded platforms don’t have a standard library!). Because
-of this, its routines for printing integer values are minimalist and hand-coded.
-Therefore, the display of floating point values during a failure are optional.
-By default, Unity will print the actual results of floating point assertion
-failure (e.g. ”Expected 4.56 Was 4.68”). To not include this extra support, you
-can use this define to instead respond to a failed assertion with a message like
-”Values Not Within Delta”. If you would like verbose failure messages for floating
-point assertions, use these options to give more explicit failure messages.
-
-_Example:_
-        #define UNITY_EXCLUDE_FLOAT_PRINT
-
-
-##### `UNITY_FLOAT_TYPE`
-
-If enabled, Unity assumes you want your `FLOAT` asserts to compare standard C
-floats. If your compiler supports a specialty floating point type, you can
-always override this behavior by using this definition.
-
-_Example:_
-        #define UNITY_FLOAT_TYPE float16_t
-
-
-##### `UNITY_DOUBLE_TYPE`
-
-If enabled, Unity assumes you want your `DOUBLE` asserts to compare standard C
-doubles. If you would like to change this, you can specify something else by
-using this option. For example, defining `UNITY_DOUBLE_TYPE` to `long double`
-could enable gargantuan floating point types on your 64-bit processor instead of
-the standard `double`.
-
-_Example:_
-        #define UNITY_DOUBLE_TYPE long double
-
-
-##### `UNITY_FLOAT_PRECISION`
-
-##### `UNITY_DOUBLE_PRECISION`
-
-If you look up `UNITY_ASSERT_EQUAL_FLOAT` and `UNITY_ASSERT_EQUAL_DOUBLE` as
-documented in the big daddy Unity Assertion Guide, you will learn that they are
-not really asserting that two values are equal but rather that two values are
-"close enough" to equal. "Close enough" is controlled by these precision
-configuration options. If you are working with 32-bit floats and/or 64-bit
-doubles (the normal on most processors), you should have no need to change these
-options. They are both set to give you approximately 1 significant bit in either
-direction. The float precision is 0.00001 while the double is 10-12.
-For further details on how this works, see the appendix of the Unity Assertion
-Guide.
-
-_Example:_
-        #define UNITY_FLOAT_PRECISION 0.001f
-
-
-### Toolset Customization
-
-In addition to the options listed above, there are a number of other options
-which will come in handy to customize Unity's behavior for your specific
-toolchain. It is possible that you may not need to touch any of these... but
-certain platforms, particularly those running in simulators, may need to jump
-through extra hoops to operate properly. These macros will help in those
-situations.
-
-
-##### `UNITY_OUTPUT_CHAR(a)`
-
-##### `UNITY_OUTPUT_FLUSH()`
-
-##### `UNITY_OUTPUT_START()`
-
-##### `UNITY_OUTPUT_COMPLETE()`
-
-By default, Unity prints its results to `stdout` as it runs. This works
-perfectly fine in most situations where you are using a native compiler for
-testing. It works on some simulators as well so long as they have `stdout`
-routed back to the command line. There are times, however, where the simulator
-will lack support for dumping results or you will want to route results
-elsewhere for other reasons. In these cases, you should define the
-`UNITY_OUTPUT_CHAR` macro. This macro accepts a single character at a time (as
-an `int`, since this is the parameter type of the standard C `putchar` function
-most commonly used). You may replace this with whatever function call you like.
-
-_Example:_
-Say you are forced to run your test suite on an embedded processor with no
-`stdout` option. You decide to route your test result output to a custom serial
-`RS232_putc()` function you wrote like thus:
-
-        #define UNITY_OUTPUT_CHAR(a) RS232_putc(a)
-        #define UNITY_OUTPUT_START() RS232_config(115200,1,8,0)
-        #define UNITY_OUTPUT_FLUSH() RS232_flush()
-        #define UNITY_OUTPUT_COMPLETE() RS232_close()
-
-_Note:_
-`UNITY_OUTPUT_FLUSH()` can be set to the standard out flush function simply by
-specifying `UNITY_USE_FLUSH_STDOUT`. No other defines are required. If you
-specify a custom flush function instead with `UNITY_OUTPUT_FLUSH` directly, it
-will declare an instance of your function by default. If you want to disable
-this behavior, add `UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION`.
-
-
-##### `UNITY_WEAK_ATTRIBUTE`
-
-##### `UNITY_WEAK_PRAGMA`
-
-##### `UNITY_NO_WEAK`
-
-For some targets, Unity can make the otherwise required setUp() and tearDown()
-functions optional. This is a nice convenience for test writers since setUp and
-tearDown don’t often actually do anything. If you’re using gcc or clang, this
-option is automatically defined for you. Other compilers can also support this
-behavior, if they support a C feature called weak functions. A weak function is
-a function that is compiled into your executable unless a non-weak version of
-the same function is defined elsewhere. If a non-weak version is found, the weak
-version is ignored as if it never existed. If your compiler supports this feature,
-you can let Unity know by defining UNITY_WEAK_ATTRIBUTE or UNITY_WEAK_PRAGMA as
-the function attributes that would need to be applied to identify a function as
-weak. If your compiler lacks support for weak functions, you will always need to
-define setUp and tearDown functions (though they can be and often will be just
-empty). You can also force Unity to NOT use weak functions by defining
-UNITY_NO_WEAK. The most common options for this feature are:
-
-_Example:_
-        #define UNITY_WEAK_ATTRIBUTE weak
-        #define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
-        #define UNITY_WEAK_PRAGMA
-        #define UNITY_NO_WEAK
-
-
-##### `UNITY_PTR_ATTRIBUTE`
-
-Some compilers require a custom attribute to be assigned to pointers, like
-`near` or `far`. In these cases, you can give Unity a safe default for these by
-defining this option with the attribute you would like.
-
-_Example:_
-        #define UNITY_PTR_ATTRIBUTE __attribute__((far))
-        #define UNITY_PTR_ATTRIBUTE near
-
-
-##### `UNITY_PRINT_EOL`
-
-By default, Unity outputs \n at the end of each line of output. This is easy
-to parse by the scripts, by Ceedling, etc, but it might not be ideal for YOUR
-system. Feel free to override this and to make it whatever you wish.
-
-_Example:_
-        #define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\r'); UNITY_OUTPUT_CHAR('\n') }
-
-
-
-##### `UNITY_EXCLUDE_DETAILS`
-
-This is an option for if you absolutely must squeeze every byte of memory out of
-your system. Unity stores a set of internal scratchpads which are used to pass
-extra detail information around. It's used by systems like CMock in order to
-report which function or argument flagged an error. If you're not using CMock and
-you're not using these details for other things, then you can exclude them.
-
-_Example:_
-        #define UNITY_EXCLUDE_DETAILS
-
-
-
-##### `UNITY_EXCLUDE_SETJMP`
-
-If your embedded system doesn't support the standard library setjmp, you can
-exclude Unity's reliance on this by using this define. This dropped dependence
-comes at a price, though. You will be unable to use custom helper functions for
-your tests, and you will be unable to use tools like CMock. Very likely, if your
-compiler doesn't support setjmp, you wouldn't have had the memory space for those
-things anyway, though... so this option exists for those situations.
-
-_Example:_
-        #define UNITY_EXCLUDE_SETJMP
-
-##### `UNITY_OUTPUT_COLOR`
-
-If you want to add color using ANSI escape codes you can use this define.
-t
-_Example:_
-        #define UNITY_OUTPUT_COLOR
-
-
-
-## Getting Into The Guts
-
-There will be cases where the options above aren't quite going to get everything
-perfect. They are likely sufficient for any situation where you are compiling
-and executing your tests with a native toolchain (e.g. clang on Mac). These
-options may even get you through the majority of cases encountered in working
-with a target simulator run from your local command line. But especially if you
-must run your test suite on your target hardware, your Unity configuration will
-require special help. This special help will usually reside in one of two
-places: the `main()` function or the `RUN_TEST` macro. Let's look at how these
-work.
-
-
-##### `main()`
-
-Each test module is compiled and run on its own, separate from the other test
-files in your project. Each test file, therefore, has a `main` function. This
-`main` function will need to contain whatever code is necessary to initialize
-your system to a workable state. This is particularly true for situations where
-you must set up a memory map or initialize a communication channel for the
-output of your test results.
-
-A simple main function looks something like this:
-
-        int main(void) {
-            UNITY_BEGIN();
-            RUN_TEST(test_TheFirst);
-            RUN_TEST(test_TheSecond);
-            RUN_TEST(test_TheThird);
-            return UNITY_END();
-        }
-
-You can see that our main function doesn't bother taking any arguments. For our
-most barebones case, we'll never have arguments because we just run all the
-tests each time. Instead, we start by calling `UNITY_BEGIN`. We run each test
-(in whatever order we wish). Finally, we call `UNITY_END`, returning its return
-value (which is the total number of failures).
-
-It should be easy to see that you can add code before any test cases are run or
-after all the test cases have completed. This allows you to do any needed
-system-wide setup or teardown that might be required for your special
-circumstances.
-
-
-##### `RUN_TEST`
-
-The `RUN_TEST` macro is called with each test case function. Its job is to
-perform whatever setup and teardown is necessary for executing a single test
-case function. This includes catching failures, calling the test module's
-`setUp()` and `tearDown()` functions, and calling `UnityConcludeTest()`. If
-using CMock or test coverage, there will be additional stubs in use here. A
-simple minimalist RUN_TEST macro looks something like this:
-
-        #define RUN_TEST(testfunc) \
-            UNITY_NEW_TEST(#testfunc) \
-            if (TEST_PROTECT()) { \
-                setUp(); \
-                testfunc(); \
-            } \
-            if (TEST_PROTECT() && (!TEST_IS_IGNORED)) \
-                tearDown(); \
-            UnityConcludeTest();
-
-So that's quite a macro, huh? It gives you a glimpse of what kind of stuff Unity
-has to deal with for every single test case. For each test case, we declare that
-it is a new test. Then we run `setUp` and our test function. These are run
-within a `TEST_PROTECT` block, the function of which is to handle failures that
-occur during the test. Then, assuming our test is still running and hasn't been
-ignored, we run `tearDown`. No matter what, our last step is to conclude this
-test before moving on to the next.
-
-Let's say you need to add a call to `fsync` to force all of your output data to
-flush to a file after each test. You could easily insert this after your
-`UnityConcludeTest` call. Maybe you want to write an xml tag before and after
-each result set. Again, you could do this by adding lines to this macro. Updates
-to this macro are for the occasions when you need an action before or after
-every single test case throughout your entire suite of tests.
-
-
-## Happy Porting
-
-The defines and macros in this guide should help you port Unity to just about
-any C target we can imagine. If you run into a snag or two, don't be afraid of
-asking for help on the forums. We love a good challenge!
-
-
-*Find The Latest of This And More at [ThrowTheSwitch.org](https://throwtheswitch.org)*
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/UnityGettingStartedGuide.md b/external_libs/cJSON/cJSON/tests/unity/docs/UnityGettingStartedGuide.md
deleted file mode 100644
index 50fc91c7..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/UnityGettingStartedGuide.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# Unity - Getting Started
-
-## Welcome
-
-Congratulations. You're now the proud owner of your very own pile of bits! What
-are you going to do with all these ones and zeros? This document should be able
-to help you decide just that.
-
-Unity is a unit test framework. The goal has been to keep it small and
-functional. The core Unity test framework is three files: a single C file and a
-couple header files. These team up to provide functions and macros to make
-testing easier.
-
-Unity was designed to be cross platform. It works hard to stick with C standards
-while still providing support for the many embedded C compilers that bend the
-rules. Unity has been used with many compilers, including GCC, IAR, Clang,
-Green Hills, Microchip, and MS Visual Studio. It's not much work to get it to
-work with a new target.
-
-
-### Overview of the Documents
-
-#### Unity Assertions reference
-
-This document will guide you through all the assertion options provided by
-Unity. This is going to be your unit testing bread and butter. You'll spend more
-time with assertions than any other part of Unity.
-
-
-#### Unity Assertions Cheat Sheet
-
-This document contains an abridged summary of the assertions described in the
-previous document. It's perfect for printing and referencing while you
-familiarize yourself with Unity's options.
-
-
-#### Unity Configuration Guide
-
-This document is the one to reference when you are going to use Unity with a new
-target or compiler. It'll guide you through the configuration options and will
-help you customize your testing experience to meet your needs.
-
-
-#### Unity Helper Scripts
-
-This document describes the helper scripts that are available for simplifying
-your testing workflow. It describes the collection of optional Ruby scripts
-included in the auto directory of your Unity installation. Neither Ruby nor
-these scripts are necessary for using Unity. They are provided as a convenience
-for those who wish to use them.
-
-
-#### Unity License
-
-What's an open source project without a license file? This brief document
-describes the terms you're agreeing to when you use this software. Basically, we
-want it to be useful to you in whatever context you want to use it, but please
-don't blame us if you run into problems.
-
-
-### Overview of the Folders
-
-If you have obtained Unity through Github or something similar, you might be
-surprised by just how much stuff you suddenly have staring you in the face.
-Don't worry, Unity itself is very small. The rest of it is just there to make
-your life easier. You can ignore it or use it at your convenience. Here's an
-overview of everything in the project.
-
-- `src` - This is the code you care about! This folder contains a C file and two
-header files. These three files _are_ Unity.
-- `docs` - You're reading this document, so it's possible you have found your way
-into this folder already. This is where all the handy documentation can be
-found.
-- `examples` - This contains a few examples of using Unity.
-- `extras` - These are optional add ons to Unity that are not part of the core
-project. If you've reached us through James Grenning's book, you're going to
-want to look here.
-- `test` - This is how Unity and its scripts are all tested. If you're just using
-Unity, you'll likely never need to go in here. If you are the lucky team member
-who gets to port Unity to a new toolchain, this is a good place to verify
-everything is configured properly.
-- `auto` - Here you will find helpful Ruby scripts for simplifying your test
-workflow. They are purely optional and are not required to make use of Unity.
-
-
-## How to Create A Test File
-
-Test files are C files. Most often you will create a single test file for each C
-module that you want to test. The test file should include unity.h and the
-header for your C module to be tested.
-
-Next, a test file will include a `setUp()` and `tearDown()` function. The setUp
-function can contain anything you would like to run before each test. The
-tearDown function can contain anything you would like to run after each test.
-Both functions accept no arguments and return nothing. You may leave either or
-both of these blank if you have no need for them. If you're using a compiler
-that is configured to make these functions optional, you may leave them off
-completely. Not sure? Give it a try. If you compiler complains that it can't
-find setUp or tearDown when it links, you'll know you need to at least include
-an empty function for these.
-
-The majority of the file will be a series of test functions. Test functions
-follow the convention of starting with the word "test" or "spec". You don't HAVE
-to name them this way, but it makes it clear what functions are tests for other
-developers.  Test functions take no arguments and return nothing. All test
-accounting is handled internally in Unity.
-
-Finally, at the bottom of your test file, you will write a `main()` function.
-This function will call `UNITY_BEGIN()`, then `RUN_TEST` for each test, and
-finally `UNITY_END()`.This is what will actually trigger each of those test
-functions to run, so it is important that each function gets its own `RUN_TEST`
-call.
-
-Remembering to add each test to the main function can get to be tedious. If you
-enjoy using helper scripts in your build process, you might consider making use
-of our handy generate_test_runner.rb script. This will create the main function
-and all the calls for you, assuming that you have followed the suggested naming
-conventions. In this case, there is no need for you to include the main function
-in your test file at all.
-
-When you're done, your test file will look something like this:
-
-```C
-#include "unity.h"
-#include "file_to_test.h"
-
-void setUp(void) {
-    // set stuff up here
-}
-
-void tearDown(void) {
-    // clean stuff up here
-}
-
-void test_function_should_doBlahAndBlah(void) {
-    //test stuff
-}
-
-void test_function_should_doAlsoDoBlah(void) {
-    //more test stuff
-}
-
-int main(void) {
-    UNITY_BEGIN();
-    RUN_TEST(test_function_should_doBlahAndBlah);
-    RUN_TEST(test_function_should_doAlsoDoBlah);
-    return UNITY_END();
-}
-```
-
-It's possible that you will require more customization than this, eventually.
-For that sort of thing, you're going to want to look at the configuration guide.
-This should be enough to get you going, though.
-
-
-## How to Build and Run A Test File
-
-This is the single biggest challenge to picking up a new unit testing framework,
-at least in a language like C or C++. These languages are REALLY good at getting
-you "close to the metal" (why is the phrase metal? Wouldn't it be more accurate
-to say "close to the silicon"?). While this feature is usually a good thing, it
-can make testing more challenging.
-
-You have two really good options for toolchains. Depending on where you're
-coming from, it might surprise you that neither of these options is running the
-unit tests on your hardware.
-There are many reasons for this, but here's a short version:
-- On hardware, you have too many constraints (processing power, memory, etc),
-- On hardware, you don't have complete control over all registers,
-- On hardware, unit testing is more challenging,
-- Unit testing isn't System testing. Keep them separate.
-
-Instead of running your tests on your actual hardware, most developers choose to
-develop them as native applications (using gcc or MSVC for example) or as
-applications running on a simulator. Either is a good option. Native apps have
-the advantages of being faster and easier to set up. Simulator apps have the
-advantage of working with the same compiler as your target application. The
-options for configuring these are discussed in the configuration guide.
-
-To get either to work, you might need to make a few changes to the file
-containing your register set (discussed later).
-
-In either case, a test is built by linking unity, the test file, and the C
-file(s) being tested. These files create an executable which can be run as the
-test set for that module. Then, this process is repeated for the next test file.
-This flexibility of separating tests into individual executables allows us to
-much more thoroughly unit test our system and it keeps all the test code out of
-our final release!
-
-
-*Find The Latest of This And More at [ThrowTheSwitch.org](https://throwtheswitch.org)*
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/UnityHelperScriptsGuide.md b/external_libs/cJSON/cJSON/tests/unity/docs/UnityHelperScriptsGuide.md
deleted file mode 100644
index 42429900..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/UnityHelperScriptsGuide.md
+++ /dev/null
@@ -1,254 +0,0 @@
-# Unity Helper Scripts
-
-## With a Little Help From Our Friends
-
-Sometimes what it takes to be a really efficient C programmer is a little non-C.
-The Unity project includes a couple Ruby scripts for making your life just a tad
-easier. They are completely optional. If you choose to use them, you'll need a
-copy of Ruby, of course. Just install whatever the latest version is, and it is
-likely to work. You can find Ruby at [ruby-lang.org](https://ruby-labg.org/).
-
-
-### `generate_test_runner.rb`
-
-Are you tired of creating your own `main` function in your test file? Do you
-keep forgetting to add a `RUN_TEST` call when you add a new test case to your
-suite? Do you want to use CMock or other fancy add-ons but don't want to figure
-out how to create your own `RUN_TEST` macro?
-
-Well then we have the perfect script for you!
-
-The `generate_test_runner` script processes a given test file and automatically
-creates a separate test runner file that includes ?main?to execute the test
-cases within the scanned test file. All you do then is add the generated runner
-to your list of files to be compiled and linked, and presto you're done!
-
-This script searches your test file for void function signatures having a
-function name beginning with "test" or "spec". It treats each of these
-functions as a test case and builds up a test suite of them. For example, the
-following includes three test cases:
-
-```C
-void testVerifyThatUnityIsAwesomeAndWillMakeYourLifeEasier(void)
-{
-  ASSERT_TRUE(1);
-}
-void test_FunctionName_should_WorkProperlyAndReturn8(void) {
-  ASSERT_EQUAL_INT(8, FunctionName());
-}
-void spec_Function_should_DoWhatItIsSupposedToDo(void) {
-  ASSERT_NOT_NULL(Function(5));
-}
-```
-
-You can run this script a couple of ways. The first is from the command line:
-
-```Shell
-ruby generate_test_runner.rb TestFile.c NameOfRunner.c
-```
-
-Alternatively, if you include only the test file parameter, the script will copy
-the name of the test file and automatically append "_Runner" to the name of the
-generated file. The example immediately below will create TestFile_Runner.c.
-
-```Shell
-ruby generate_test_runner.rb TestFile.c
-```
-
-You can also add a [YAML](http://www.yaml.org/) file to configure extra options.
-Conveniently, this YAML file is of the same format as that used by Unity and
-CMock. So if you are using YAML files already, you can simply pass the very same
-file into the generator script.
-
-```Shell
-ruby generate_test_runner.rb TestFile.c my_config.yml
-```
-
-The contents of the YAML file `my_config.yml` could look something like the
-example below. If you're wondering what some of these options do, you're going
-to love the next section of this document.
-
-```YAML
-:unity:
-  :includes:
-    - stdio.h
-    - microdefs.h
-  :cexception: 1
-  :suit_setup: "blah = malloc(1024);"
-  :suite_teardown: "free(blah);"
-```
-
-If you would like to force your generated test runner to include one or more
-header files, you can just include those at the command line too. Just make sure
-these are _after_ the YAML file, if you are using one:
-
-```Shell
-ruby generate_test_runner.rb TestFile.c my_config.yml extras.h
-```
-
-Another option, particularly if you are already using Ruby to orchestrate your
-builds - or more likely the Ruby-based build tool Rake - is requiring this
-script directly. Anything that you would have specified in a YAML file can be
-passed to the script as part of a hash. Let's push the exact same requirement
-set as we did above but this time through Ruby code directly:
-
-```Ruby
-require "generate_test_runner.rb"
-options = {
-  :includes => ["stdio.h", "microdefs.h"],
-  :cexception => 1,
-  :suite_setup => "blah = malloc(1024);",
-  :suite_teardown => "free(blah);"
-}
-UnityTestRunnerGenerator.new.run(testfile, runner_name, options)
-```
-
-If you have multiple files to generate in a build script (such as a Rakefile),
-you might want to instantiate a generator object with your options and call it
-to generate each runner thereafter. Like thus:
-
-```Ruby
-gen = UnityTestRunnerGenerator.new(options)
-test_files.each do |f|
-  gen.run(f, File.basename(f,'.c')+"Runner.c"
-end
-```
-
-#### Options accepted by generate_test_runner.rb:
-
-The following options are available when executing `generate_test_runner`. You
-may pass these as a Ruby hash directly or specify them in a YAML file, both of
-which are described above. In the `examples` directory, Example 3's Rakefile
-demonstrates using a Ruby hash.
-
-
-##### `:includes`
-
-This option specifies an array of file names to be `#include`'d at the top of
-your runner C file. You might use it to reference custom types or anything else
-universally needed in your generated runners.
-
-
-##### `:suite_setup`
-
-Define this option with C code to be executed _before any_ test cases are run.
-
-Alternatively, if your C compiler supports weak symbols, you can leave this
-option unset and instead provide a `void suiteSetUp(void)` function in your test
-suite.  The linker will look for this symbol and fall back to a Unity-provided
-stub if it is not found.
-
-
-##### `:suite_teardown`
-
-Define this option with C code to be executed _after all_ test cases have
-finished.  An integer variable `num_failures` is available for diagnostics.
-The code should end with a `return` statement; the value returned will become
-the exit code of `main`.  You can normally just return `num_failures`.
-
-Alternatively, if your C compiler supports weak symbols, you can leave this
-option unset and instead provide a `int suiteTearDown(int num_failures)`
-function in your test suite.  The linker will look for this symbol and fall
-back to a Unity-provided stub if it is not found.
-
-
-##### `:enforce_strict_ordering`
-
-This option should be defined if you have the strict order feature enabled in
-CMock (see CMock documentation). This generates extra variables required for
-everything to run smoothly. If you provide the same YAML to the generator as
-used in CMock's configuration, you've already configured the generator properly.
-
-
-##### `:plugins`
-
-This option specifies an array of plugins to be used (of course, the array can
-contain only a single plugin). This is your opportunity to enable support for
-CException support, which will add a check for unhandled exceptions in each
-test, reporting a failure if one is detected. To enable this feature using Ruby:
-
-```Ruby
-:plugins => [ :cexception ]
-```
-
-Or as a yaml file:
-
-```YAML
-:plugins:
-  -:cexception
-```
-
-If you are using CMock, it is very likely that you are already passing an array
-of plugins to CMock. You can just use the same array here. This script will just
-ignore the plugins that don't require additional support.
-
-
-### `unity_test_summary.rb`
-
-A Unity test file contains one or more test case functions. Each test case can
-pass, fail, or be ignored. Each test file is run individually producing results
-for its collection of test cases. A given project will almost certainly be
-composed of multiple test files. Therefore, the suite of tests is comprised of
-one or more test cases spread across one or more test files. This script
-aggregates individual test file results to generate a summary of all executed
-test cases. The output includes how many tests were run, how many were ignored,
-and how many failed. In addition, the output includes a listing of which
-specific tests were ignored and failed. A good example of the breadth and
-details of these results can be found in the `examples` directory. Intentionally
-ignored and failing tests in this project generate corresponding entries in the
-summary report.
-
-If you're interested in other (prettier?) output formats, check into the
-Ceedling build tool project (ceedling.sourceforge.net) that works with Unity and
-CMock and supports xunit-style xml as well as other goodies.
-
-This script assumes the existence of files ending with the extensions
-`.testpass` and `.testfail`.The contents of these files includes the test
-results summary corresponding to each test file executed with the extension set
-according to the presence or absence of failures for that test file. The script
-searches a specified path for these files, opens each one it finds, parses the
-results, and aggregates and prints a summary. Calling it from the command line
-looks like this:
-
-```Shell
-ruby unity_test_summary.rb build/test/
-```
-
-You can optionally specify a root path as well. This is really helpful when you
-are using relative paths in your tools' setup, but you want to pull the summary
-into an IDE like Eclipse for clickable shortcuts.
-
-```Shell
-ruby unity_test_summary.rb build/test/ ~/projects/myproject/
-```
-
-Or, if you're more of a Windows sort of person:
-
-```Shell
-ruby unity_test_summary.rb build\teat\ C:\projects\myproject\
-```
-
-When configured correctly, you'll see a final summary, like so:
-
-```Shell
---------------------------
-UNITY IGNORED TEST SUMMARY
---------------------------
-blah.c:22:test_sandwiches_should_HaveBreadOnTwoSides:IGNORE
-
--------------------------
-UNITY FAILED TEST SUMMARY
--------------------------
-blah.c:87:test_sandwiches_should_HaveCondiments:FAIL:Expected 1 was 0
-meh.c:38:test_soda_should_BeCalledPop:FAIL:Expected "pop" was "coke"
-
---------------------------
-OVERALL UNITY TEST SUMMARY
---------------------------
-45 TOTAL TESTS 2 TOTAL FAILURES 1 IGNORED
-```
-
-How convenient is that?
-
-
-*Find The Latest of This And More at [ThrowTheSwitch.org](https://throwtheswitch.org)*
diff --git a/external_libs/cJSON/cJSON/tests/unity/docs/license.txt b/external_libs/cJSON/cJSON/tests/unity/docs/license.txt
deleted file mode 100644
index d66fba53..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/docs/license.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) <year> 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/makefile b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/makefile
deleted file mode 100644
index cca79b42..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-#We try to detect the OS we are running on, and adjust commands as needed
-ifeq ($(OS),Windows_NT)
-  ifeq ($(shell uname -s),) # not in a bash-like shell
-	CLEANUP = del /F /Q
-	MKDIR = mkdir
-  else # in a bash-like shell, like msys
-	CLEANUP = rm -f
-	MKDIR = mkdir -p
-  endif
-	TARGET_EXTENSION=.exe
-else
-	CLEANUP = rm -f
-	MKDIR = mkdir -p
-	TARGET_EXTENSION=.out
-endif
-
-C_COMPILER=gcc
-ifeq ($(shell uname -s), Darwin)
-C_COMPILER=clang
-endif
-
-UNITY_ROOT=../..
-
-CFLAGS=-std=c89
-CFLAGS += -Wall
-CFLAGS += -Wextra
-CFLAGS += -Wpointer-arith
-CFLAGS += -Wcast-align
-CFLAGS += -Wwrite-strings
-CFLAGS += -Wswitch-default
-CFLAGS += -Wunreachable-code
-CFLAGS += -Winit-self
-CFLAGS += -Wmissing-field-initializers
-CFLAGS += -Wno-unknown-pragmas
-CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wundef
-CFLAGS += -Wold-style-definition
-
-TARGET_BASE1=test1
-TARGET_BASE2=test2
-TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)
-TARGET2 = $(TARGET_BASE2)$(TARGET_EXTENSION)
-SRC_FILES1=$(UNITY_ROOT)/src/unity.c src/ProductionCode.c  test/TestProductionCode.c  test/test_runners/TestProductionCode_Runner.c
-SRC_FILES2=$(UNITY_ROOT)/src/unity.c src/ProductionCode2.c test/TestProductionCode2.c test/test_runners/TestProductionCode2_Runner.c
-INC_DIRS=-Isrc -I$(UNITY_ROOT)/src
-SYMBOLS=
-
-all: clean default
-
-default: $(SRC_FILES1) $(SRC_FILES2)
-	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
-	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES2) -o $(TARGET2)
-	- ./$(TARGET1)
-	./$(TARGET2)
-
-test/test_runners/TestProductionCode_Runner.c: test/TestProductionCode.c
-	ruby $(UNITY_ROOT)/auto/generate_test_runner.rb test/TestProductionCode.c  test/test_runners/TestProductionCode_Runner.c
-test/test_runners/TestProductionCode2_Runner.c: test/TestProductionCode2.c
-	ruby $(UNITY_ROOT)/auto/generate_test_runner.rb test/TestProductionCode2.c test/test_runners/TestProductionCode2_Runner.c
-
-clean:
-	$(CLEANUP) $(TARGET1) $(TARGET2)
-
-ci: CFLAGS += -Werror
-ci: default
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/readme.txt b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/readme.txt
deleted file mode 100644
index dfed8150..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Example 1
-=========
-
-Close to the simplest possible example of Unity, using only basic features.
-Run make to build & run the example tests.
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.c
deleted file mode 100644
index d039c3e8..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "ProductionCode.h"
-
-int Counter = 0;
-int NumbersToFind[9] = { 0, 34, 55, 66, 32, 11, 1, 77, 888 }; /* some obnoxious array to search that is 1-based indexing instead of 0. */
-
-/* This function is supposed to search through NumbersToFind and find a particular number.  
- * If it finds it, the index is returned.  Otherwise 0 is returned which sorta makes sense since 
- * NumbersToFind is indexed from 1.  Unfortunately it's broken 
- * (and should therefore be caught by our tests) */
-int FindFunction_WhichIsBroken(int NumberToFind)
-{
-    int i = 0;
-    while (i <= 8) /* Notice I should have been in braces */
-        i++;
-        if (NumbersToFind[i] == NumberToFind) /* Yikes!  I'm getting run after the loop finishes instead of during it! */
-            return i;
-    return 0;
-}
-
-int FunctionWhichReturnsLocalVariable(void)
-{
-    return Counter;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.h
deleted file mode 100644
index 250ca0dc..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-int FindFunction_WhichIsBroken(int NumberToFind);
-int FunctionWhichReturnsLocalVariable(void);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.c
deleted file mode 100644
index 98ee7eeb..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include "ProductionCode2.h"
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction)
-{
-  (void)Poor;
-  (void)LittleFunction;
-  /* Since There Are No Tests Yet, This Function Could Be Empty For All We Know.
-   * Which isn't terribly useful... but at least we put in a TEST_IGNORE so we won't forget */
-  return (char*)0;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.h
deleted file mode 100644
index 34ae980d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/makefile b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/makefile
deleted file mode 100644
index 99d8d968..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-#We try to detect the OS we are running on, and adjust commands as needed
-ifeq ($(OS),Windows_NT)
-  ifeq ($(shell uname -s),) # not in a bash-like shell
-	CLEANUP = del /F /Q
-	MKDIR = mkdir
-  else # in a bash-like shell, like msys
-	CLEANUP = rm -f
-	MKDIR = mkdir -p
-  endif
-	TARGET_EXTENSION=.exe
-else
-	CLEANUP = rm -f
-	MKDIR = mkdir -p
-	TARGET_EXTENSION=.out
-endif
-
-C_COMPILER=gcc
-ifeq ($(shell uname -s), Darwin)
-C_COMPILER=clang
-endif
-
-UNITY_ROOT=../..
-
-CFLAGS=-std=c99
-CFLAGS += -Wall
-CFLAGS += -Wextra
-CFLAGS += -Wpointer-arith
-CFLAGS += -Wcast-align
-CFLAGS += -Wwrite-strings
-CFLAGS += -Wswitch-default
-CFLAGS += -Wunreachable-code
-CFLAGS += -Winit-self
-CFLAGS += -Wmissing-field-initializers
-CFLAGS += -Wno-unknown-pragmas
-CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wundef
-CFLAGS += -Wold-style-definition
-
-TARGET_BASE1=all_tests
-TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)
-SRC_FILES1=\
-  $(UNITY_ROOT)/src/unity.c \
-  $(UNITY_ROOT)/extras/fixture/src/unity_fixture.c \
-  src/ProductionCode.c \
-  src/ProductionCode2.c \
-  test/TestProductionCode.c \
-  test/TestProductionCode2.c \
-  test/test_runners/TestProductionCode_Runner.c \
-  test/test_runners/TestProductionCode2_Runner.c \
-  test/test_runners/all_tests.c
-INC_DIRS=-Isrc -I$(UNITY_ROOT)/src -I$(UNITY_ROOT)/extras/fixture/src
-SYMBOLS=
-
-all: clean default
-
-default:
-	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
-	- ./$(TARGET1) -v
-
-clean:
-	$(CLEANUP) $(TARGET1)
-
-ci: CFLAGS += -Werror
-ci: default
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/readme.txt b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/readme.txt
deleted file mode 100644
index f0fce657..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Example 2
-=========
-
-Same as the first example, but now using Unity's test fixture to group tests
-together. Using the test fixture also makes writing test runners much easier.
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.c
deleted file mode 100644
index 500b44b5..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "ProductionCode.h"
-
-int Counter = 0;
-int NumbersToFind[9] = { 0, 34, 55, 66, 32, 11, 1, 77, 888 }; //some obnoxious array to search that is 1-based indexing instead of 0.
-
-// This function is supposed to search through NumbersToFind and find a particular number.  
-// If it finds it, the index is returned.  Otherwise 0 is returned which sorta makes sense since 
-// NumbersToFind is indexed from 1.  Unfortunately it's broken 
-// (and should therefore be caught by our tests)
-int FindFunction_WhichIsBroken(int NumberToFind)
-{
-    int i = 0;
-    while (i <= 8) //Notice I should have been in braces
-        i++;
-        if (NumbersToFind[i] == NumberToFind) //Yikes!  I'm getting run after the loop finishes instead of during it!
-            return i;
-    return 0;
-}
-
-int FunctionWhichReturnsLocalVariable(void)
-{
-    return Counter;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.h
deleted file mode 100644
index 250ca0dc..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-int FindFunction_WhichIsBroken(int NumberToFind);
-int FunctionWhichReturnsLocalVariable(void);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.c
deleted file mode 100644
index 77c969f1..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include "ProductionCode2.h"
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction)
-{
-  (void)Poor;
-  (void)LittleFunction;
-  //Since There Are No Tests Yet, This Function Could Be Empty For All We Know.
-  // Which isn't terribly useful... but at least we put in a TEST_IGNORE so we won't forget
-  return (char*)0;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.h
deleted file mode 100644
index 34ae980d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.c
deleted file mode 100644
index 9cf42c67..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "unity.h"
-#include "UnityHelper.h"
-#include <stdio.h>
-#include <string.h>
-
-void AssertEqualExampleStruct(const EXAMPLE_STRUCT_T expected, const EXAMPLE_STRUCT_T actual, const unsigned short line)
-{
-    UNITY_TEST_ASSERT_EQUAL_INT(expected.x, actual.x, line, "Example Struct Failed For Field x");
-    UNITY_TEST_ASSERT_EQUAL_INT(expected.y, actual.y, line, "Example Struct Failed For Field y");
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.h
deleted file mode 100644
index 15161115..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _TESTHELPER_H
-#define _TESTHELPER_H
-
-#include "Types.h"
-
-void AssertEqualExampleStruct(const EXAMPLE_STRUCT_T expected, const EXAMPLE_STRUCT_T actual, const unsigned short line);
-
-#define UNITY_TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual, line, message) AssertEqualExampleStruct(expected, actual, line);
-
-#define TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual) UNITY_TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual, __LINE__, NULL);
-
-#endif // _TESTHELPER_H
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile.rb b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile.rb
deleted file mode 100644
index bf9f42be..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-HERE = File.expand_path(File.dirname(__FILE__)) + '/'
-UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/../..'
-
-require 'rake'
-require 'rake/clean'
-require HERE + 'rakefile_helper'
-
-TEMP_DIRS = [
-  File.join(HERE, 'build')
-].freeze
-
-TEMP_DIRS.each do |dir|
-  directory(dir)
-  CLOBBER.include(dir)
-end
-
-task prepare_for_tests: TEMP_DIRS
-
-include RakefileHelpers
-
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'target_gcc_32.yml'.freeze
-configure_toolchain(DEFAULT_CONFIG_FILE)
-
-task unit: [:prepare_for_tests] do
-  run_tests unit_test_files
-end
-
-desc 'Generate test summary'
-task :summary do
-  report_summary
-end
-
-desc 'Build and test Unity'
-task all: %i(clean unit summary)
-task default: %i(clobber all)
-task ci: [:default]
-task cruise: [:default]
-
-desc 'Load configuration'
-task :config, :config_file do |_t, args|
-  configure_toolchain(args[:config_file])
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile_helper.rb b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile_helper.rb
deleted file mode 100644
index a186cf0f..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile_helper.rb
+++ /dev/null
@@ -1,249 +0,0 @@
-require 'yaml'
-require 'fileutils'
-require UNITY_ROOT + '/auto/unity_test_summary'
-require UNITY_ROOT + '/auto/generate_test_runner'
-require UNITY_ROOT + '/auto/colour_reporter'
-
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
-
-  def load_configuration(config_file)
-    $cfg_file = config_file
-    $cfg = YAML.load(File.read($cfg_file))
-  end
-
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
-  end
-
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    load_configuration(config_file)
-    configure_clean
-  end
-
-  def unit_test_files
-    path = $cfg['compiler']['unit_tests_path'] + 'Test*' + C_EXTENSION
-    path.tr!('\\', '/')
-    FileList.new(path)
-  end
-
-  def local_include_dirs
-    include_dirs = $cfg['compiler']['includes']['items'].dup
-    include_dirs.delete_if { |dir| dir.is_a?(Array) }
-    include_dirs
-  end
-
-  def extract_headers(filename)
-    includes = []
-    lines = File.readlines(filename)
-    lines.each do |line|
-      m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/)
-      includes << m[1] unless m.nil?
-    end
-    includes
-  end
-
-  def find_source_file(header, paths)
-    paths.each do |dir|
-      src_file = dir + header.ext(C_EXTENSION)
-      return src_file if File.exist?(src_file)
-    end
-    nil
-  end
-
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
-             else
-               strings
-             end
-    result
-  end
-
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
-
-  def build_compiler_fields
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'])
-              end
-    options  = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, defines: defines, options: options, includes: includes }
-  end
-
-  def compile(file, _defines = [])
-    compiler = build_compiler_fields
-    cmd_str  = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{file} " \
-               "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}"
-    obj_file = "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
-    execute(cmd_str + obj_file)
-    obj_file
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, options: options, includes: includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-
-    { command: command, pre_support: pre_support, post_support: post_support }
-  end
-
-  def execute(command_string, verbose = true, raise_on_fail = true)
-    report command_string
-    output = `#{command_string}`.chomp
-    report(output) if verbose && !output.nil? && !output.empty?
-    if !$?.exitstatus.zero? && raise_on_fail
-      raise "Command failed. (Returned #{$?.exitstatus})"
-    end
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = HERE
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    summary.run
-    fail_out 'FAIL: There were failures' if summary.failures > 0
-  end
-
-  def run_tests(test_files)
-    report 'Running system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
-    $cfg['compiler']['defines']['items'] << 'TEST'
-
-    include_dirs = local_include_dirs
-
-    # Build and execute each unit test
-    test_files.each do |test|
-      obj_list = []
-
-      # Detect dependencies and build required required modules
-      extract_headers(test).each do |header|
-        # Compile corresponding source file if it exists
-        src_file = find_source_file(header, include_dirs)
-        obj_list << compile(src_file, test_defines) unless src_file.nil?
-      end
-
-      # Build the test runner (generate if configured to do so)
-      test_base = File.basename(test, C_EXTENSION)
-      runner_name = test_base + '_Runner.c'
-      if $cfg['compiler']['runner_path'].nil?
-        runner_path = $cfg['compiler']['build_path'] + runner_name
-        test_gen = UnityTestRunnerGenerator.new($cfg_file)
-        test_gen.run(test, runner_path)
-      else
-        runner_path = $cfg['compiler']['runner_path'] + runner_name
-      end
-
-      obj_list << compile(runner_path, test_defines)
-
-      # Build the test module
-      obj_list << compile(test, test_defines)
-
-      # Link the test executable
-      link_it(test_base, obj_list)
-
-      # Execute unit test and generate results file
-      simulator = build_simulator_fields
-      executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-      cmd_str = if simulator.nil?
-                  executable
-                else
-                  "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-                end
-      output = execute(cmd_str, true, false)
-      test_results = $cfg['compiler']['build_path'] + test_base
-      test_results += if output.match(/OK$/m).nil?
-                        '.testfail'
-                      else
-                        '.testpass'
-                      end
-      File.open(test_results, 'w') { |f| f.print output }
-    end
-  end
-
-  def build_application(main)
-    report 'Building application...'
-
-    obj_list = []
-    load_configuration($cfg_file)
-    main_path = $cfg['compiler']['source_path'] + main + C_EXTENSION
-
-    # Detect dependencies and build required required modules
-    include_dirs = get_local_include_dirs
-    extract_headers(main_path).each do |header|
-      src_file = find_source_file(header, include_dirs)
-      obj_list << compile(src_file) unless src_file.nil?
-    end
-
-    # Build the main source file
-    main_base = File.basename(main_path, C_EXTENSION)
-    obj_list << compile(main_path)
-
-    # Create the executable
-    link_it(main_base, obj_list)
-  end
-
-  def fail_out(msg)
-    puts msg
-    puts 'Not returning exit code so continuous integration can pass'
-    #    exit(-1) # Only removed to pass example_3, which has failing tests on purpose.
-    #               Still fail if the build fails for any other reason.
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/readme.txt b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/readme.txt
deleted file mode 100644
index 7371fea0..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Example 3
-=========
-
-This example project gives an example of some passing, ignored, and failing tests.
-It's simple and meant for you to look over and get an idea for what all of this stuff does.
-
-You can build and test using rake. The rake version will let you test with gcc or a couple
-versions of IAR.  You can tweak the yaml files to get those versions running.
-
-Ruby is required if you're using the rake version (obviously).  This version shows off most of
-Unity's advanced features (automatically creating test runners, fancy summaries, etc.)
-Without ruby, you have to maintain your own test runners.  Do that for a while and you'll learn
-why you really want to start using the Ruby tools.
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.c
deleted file mode 100644
index 500b44b5..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "ProductionCode.h"
-
-int Counter = 0;
-int NumbersToFind[9] = { 0, 34, 55, 66, 32, 11, 1, 77, 888 }; //some obnoxious array to search that is 1-based indexing instead of 0.
-
-// This function is supposed to search through NumbersToFind and find a particular number.  
-// If it finds it, the index is returned.  Otherwise 0 is returned which sorta makes sense since 
-// NumbersToFind is indexed from 1.  Unfortunately it's broken 
-// (and should therefore be caught by our tests)
-int FindFunction_WhichIsBroken(int NumberToFind)
-{
-    int i = 0;
-    while (i <= 8) //Notice I should have been in braces
-        i++;
-        if (NumbersToFind[i] == NumberToFind) //Yikes!  I'm getting run after the loop finishes instead of during it!
-            return i;
-    return 0;
-}
-
-int FunctionWhichReturnsLocalVariable(void)
-{
-    return Counter;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.h
deleted file mode 100644
index 250ca0dc..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-int FindFunction_WhichIsBroken(int NumberToFind);
-int FunctionWhichReturnsLocalVariable(void);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.c b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.c
deleted file mode 100644
index 77c969f1..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include "ProductionCode2.h"
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction)
-{
-  (void)Poor;
-  (void)LittleFunction;
-  //Since There Are No Tests Yet, This Function Could Be Empty For All We Know.
-  // Which isn't terribly useful... but at least we put in a TEST_IGNORE so we won't forget
-  return (char*)0;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.h b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.h
deleted file mode 100644
index 34ae980d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction);
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/target_gcc_32.yml b/external_libs/cJSON/cJSON/tests/unity/examples/example_3/target_gcc_32.yml
deleted file mode 100644
index f155508c..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/example_3/target_gcc_32.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copied from ~Unity/targets/gcc_32.yml
-unity_root:  &unity_root '../..'
-compiler:
-  path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m32'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../../src/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m32'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/external_libs/cJSON/cJSON/tests/unity/examples/unity_config.h b/external_libs/cJSON/cJSON/tests/unity/examples/unity_config.h
deleted file mode 100644
index a2f161a7..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/examples/unity_config.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Unity Configuration
- * As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529
- * Update: December 29th, 2016
- * See Also: Unity/docs/UnityConfigurationGuide.pdf
- *
- * Unity is designed to run on almost anything that is targeted by a C compiler.
- * It would be awesome if this could be done with zero configuration. While
- * there are some targets that come close to this dream, it is sadly not
- * universal. It is likely that you are going to need at least a couple of the
- * configuration options described in this document.
- *
- * All of Unity's configuration options are `#defines`. Most of these are simple
- * definitions. A couple are macros with arguments. They live inside the
- * unity_internals.h header file. We don't necessarily recommend opening that
- * file unless you really need to. That file is proof that a cross-platform
- * library is challenging to build. From a more positive perspective, it is also
- * proof that a great deal of complexity can be centralized primarily to one
- * place in order to provide a more consistent and simple experience elsewhere.
- *
- * Using These Options
- * It doesn't matter if you're using a target-specific compiler and a simulator
- * or a native compiler. In either case, you've got a couple choices for
- * configuring these options:
- *
- *  1. Because these options are specified via C defines, you can pass most of
- *     these options to your compiler through command line compiler flags. Even
- *     if you're using an embedded target that forces you to use their
- *     overbearing IDE for all configuration, there will be a place somewhere in
- *     your project to configure defines for your compiler.
- *  2. You can create a custom `unity_config.h` configuration file (present in
- *     your toolchain's search paths). In this file, you will list definitions
- *     and macros specific to your target. All you must do is define
- *     `UNITY_INCLUDE_CONFIG_H` and Unity will rely on `unity_config.h` for any
- *     further definitions it may need.
- */
-
-#ifndef UNITY_CONFIG_H
-#define UNITY_CONFIG_H
-
-/* ************************* AUTOMATIC INTEGER TYPES ***************************
- * C's concept of an integer varies from target to target. The C Standard has
- * rules about the `int` matching the register size of the target
- * microprocessor. It has rules about the `int` and how its size relates to
- * other integer types. An `int` on one target might be 16 bits while on another
- * target it might be 64. There are more specific types in compilers compliant
- * with C99 or later, but that's certainly not every compiler you are likely to
- * encounter. Therefore, Unity has a number of features for helping to adjust
- * itself to match your required integer sizes. It starts off by trying to do it
- * automatically.
- **************************************************************************** */
-
-/* The first attempt to guess your types is to check `limits.h`. Some compilers
- * that don't support `stdint.h` could include `limits.h`. If you don't
- * want Unity to check this file, define this to make it skip the inclusion.
- * Unity looks at UINT_MAX & ULONG_MAX, which were available since C89.
- */
-/* #define UNITY_EXCLUDE_LIMITS_H */
-
-/* The second thing that Unity does to guess your types is check `stdint.h`.
- * This file defines `UINTPTR_MAX`, since C99, that Unity can make use of to
- * learn about your system. It's possible you don't want it to do this or it's
- * possible that your system doesn't support `stdint.h`. If that's the case,
- * you're going to want to define this. That way, Unity will know to skip the
- * inclusion of this file and you won't be left with a compiler error.
- */
-/* #define UNITY_EXCLUDE_STDINT_H */
-
-/* ********************** MANUAL INTEGER TYPE DEFINITION ***********************
- * If you've disabled all of the automatic options above, you're going to have
- * to do the configuration yourself. There are just a handful of defines that
- * you are going to specify if you don't like the defaults.
- **************************************************************************** */
-
- /* Define this to be the number of bits an `int` takes up on your system. The
- * default, if not auto-detected, is 32 bits.
- *
- * Example:
- */
-/* #define UNITY_INT_WIDTH 16 */
-
-/* Define this to be the number of bits a `long` takes up on your system. The
- * default, if not autodetected, is 32 bits. This is used to figure out what
- * kind of 64-bit support your system can handle.  Does it need to specify a
- * `long` or a `long long` to get a 64-bit value. On 16-bit systems, this option
- * is going to be ignored.
- *
- * Example:
- */
-/* #define UNITY_LONG_WIDTH 16 */
-
-/* Define this to be the number of bits a pointer takes up on your system. The
- * default, if not autodetected, is 32-bits. If you're getting ugly compiler
- * warnings about casting from pointers, this is the one to look at.
- *
- * Example:
- */
-/* #define UNITY_POINTER_WIDTH 64 */
-
-/* Unity will automatically include 64-bit support if it auto-detects it, or if
- * your `int`, `long`, or pointer widths are greater than 32-bits. Define this
- * to enable 64-bit support if none of the other options already did it for you.
- * There can be a significant size and speed impact to enabling 64-bit support
- * on small targets, so don't define it if you don't need it.
- */
-/* #define UNITY_INCLUDE_64 */
-
-
-/* *************************** FLOATING POINT TYPES ****************************
- * In the embedded world, it's not uncommon for targets to have no support for
- * floating point operations at all or to have support that is limited to only
- * single precision. We are able to guess integer sizes on the fly because
- * integers are always available in at least one size. Floating point, on the
- * other hand, is sometimes not available at all. Trying to include `float.h` on
- * these platforms would result in an error. This leaves manual configuration as
- * the only option.
- **************************************************************************** */
-
- /* By default, Unity guesses that you will want single precision floating point
-  * support, but not double precision. It's easy to change either of these using
-  * the include and exclude options here. You may include neither, just float,
-  * or both, as suits your needs.
-  */
-/* #define UNITY_EXCLUDE_FLOAT  */
-#define UNITY_INCLUDE_DOUBLE
-/* #define UNITY_EXCLUDE_DOUBLE */
-
-/* For features that are enabled, the following floating point options also
- * become available.
- */
-
-/* Unity aims for as small of a footprint as possible and avoids most standard
- * library calls (some embedded platforms don't have a standard library!).
- * Because of this, its routines for printing integer values are minimalist and
- * hand-coded. To keep Unity universal, though, we eventually chose to develop
- * our own floating point print routines. Still, the display of floating point
- * values during a failure are optional. By default, Unity will print the
- * actual results of floating point assertion failures. So a failed assertion
- * will produce a message like "Expected 4.0 Was 4.25". If you would like less
- * verbose failure messages for floating point assertions, use this option to
- * give a failure message `"Values Not Within Delta"` and trim the binary size.
- */
-/* #define UNITY_EXCLUDE_FLOAT_PRINT */
-
-/* If enabled, Unity assumes you want your `FLOAT` asserts to compare standard C
- * floats. If your compiler supports a specialty floating point type, you can
- * always override this behavior by using this definition.
- *
- * Example:
- */
-/* #define UNITY_FLOAT_TYPE float16_t */
-
-/* If enabled, Unity assumes you want your `DOUBLE` asserts to compare standard
- * C doubles. If you would like to change this, you can specify something else
- * by using this option. For example, defining `UNITY_DOUBLE_TYPE` to `long
- * double` could enable gargantuan floating point types on your 64-bit processor
- * instead of the standard `double`.
- *
- * Example:
- */
-/* #define UNITY_DOUBLE_TYPE long double */
-
-/* If you look up `UNITY_ASSERT_EQUAL_FLOAT` and `UNITY_ASSERT_EQUAL_DOUBLE` as
- * documented in the Unity Assertion Guide, you will learn that they are not
- * really asserting that two values are equal but rather that two values are
- * "close enough" to equal. "Close enough" is controlled by these precision
- * configuration options. If you are working with 32-bit floats and/or 64-bit
- * doubles (the normal on most processors), you should have no need to change
- * these options. They are both set to give you approximately 1 significant bit
- * in either direction. The float precision is 0.00001 while the double is
- * 10^-12. For further details on how this works, see the appendix of the Unity
- * Assertion Guide.
- *
- * Example:
- */
-/* #define UNITY_FLOAT_PRECISION 0.001f  */
-/* #define UNITY_DOUBLE_PRECISION 0.001f */
-
-
-/* *************************** TOOLSET CUSTOMIZATION ***************************
- * In addition to the options listed above, there are a number of other options
- * which will come in handy to customize Unity's behavior for your specific
- * toolchain. It is possible that you may not need to touch any of these but
- * certain platforms, particularly those running in simulators, may need to jump
- * through extra hoops to operate properly. These macros will help in those
- * situations.
- **************************************************************************** */
-
-/* By default, Unity prints its results to `stdout` as it runs. This works
- * perfectly fine in most situations where you are using a native compiler for
- * testing. It works on some simulators as well so long as they have `stdout`
- * routed back to the command line. There are times, however, where the
- * simulator will lack support for dumping results or you will want to route
- * results elsewhere for other reasons. In these cases, you should define the
- * `UNITY_OUTPUT_CHAR` macro. This macro accepts a single character at a time
- * (as an `int`, since this is the parameter type of the standard C `putchar`
- * function most commonly used). You may replace this with whatever function
- * call you like.
- *
- * Example:
- * Say you are forced to run your test suite on an embedded processor with no
- * `stdout` option. You decide to route your test result output to a custom
- * serial `RS232_putc()` function you wrote like thus:
- */
-/* #define UNITY_OUTPUT_CHAR(a)                    RS232_putc(a) */
-/* #define UNITY_OUTPUT_CHAR_HEADER_DECLARATION    RS232_putc(int) */
-/* #define UNITY_OUTPUT_FLUSH()                    RS232_flush() */
-/* #define UNITY_OUTPUT_FLUSH_HEADER_DECLARATION   RS232_flush(void) */
-/* #define UNITY_OUTPUT_START()                    RS232_config(115200,1,8,0) */
-/* #define UNITY_OUTPUT_COMPLETE()                 RS232_close() */
-
-/* For some targets, Unity can make the otherwise required `setUp()` and
- * `tearDown()` functions optional. This is a nice convenience for test writers
- * since `setUp` and `tearDown` don't often actually _do_ anything. If you're
- * using gcc or clang, this option is automatically defined for you. Other
- * compilers can also support this behavior, if they support a C feature called
- * weak functions. A weak function is a function that is compiled into your
- * executable _unless_ a non-weak version of the same function is defined
- * elsewhere. If a non-weak version is found, the weak version is ignored as if
- * it never existed. If your compiler supports this feature, you can let Unity
- * know by defining `UNITY_SUPPORT_WEAK` as the function attributes that would
- * need to be applied to identify a function as weak. If your compiler lacks
- * support for weak functions, you will always need to define `setUp` and
- * `tearDown` functions (though they can be and often will be just empty). The
- * most common options for this feature are:
- */
-/* #define UNITY_SUPPORT_WEAK weak */
-/* #define UNITY_SUPPORT_WEAK __attribute__((weak)) */
-/* #define UNITY_NO_WEAK */
-
-/* Some compilers require a custom attribute to be assigned to pointers, like
- * `near` or `far`. In these cases, you can give Unity a safe default for these
- * by defining this option with the attribute you would like.
- *
- * Example:
- */
-/* #define UNITY_PTR_ATTRIBUTE __attribute__((far)) */
-/* #define UNITY_PTR_ATTRIBUTE near */
-
-#endif /* UNITY_CONFIG_H */
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/eclipse/error_parsers.txt b/external_libs/cJSON/cJSON/tests/unity/extras/eclipse/error_parsers.txt
deleted file mode 100644
index 94e34ff3..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/eclipse/error_parsers.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Eclipse error parsers
-=====================
-
-These are a godsend for extracting  & quickly navigating to
-warnings & error messages from console output. Unforunately
-I don't know how to write an Eclipse plugin so you'll have
-to add them manually.
-
-To add a console parser to Eclipse, go to Window --> Preferences
---> C/C++ --> Build --> Settings. Click on the 'Error Parsers'
-tab and then click the 'Add...' button. See the table below for
-the parser fields to add.
-
-Eclipse will only parse the console output during a build, so
-running your unit tests must be part of your build process.
-Either add this to your make/rakefile, or add it as a post-
-build step in your Eclipse project settings.
-
-
-Unity unit test error parsers
------------------------------
-Severity    Pattern                                 File    Line    Description
--------------------------------------------------------------------------------
-Error       (\.+)(.*?):(\d+):(.*?):FAIL: (.*)       $2      $3      $5
-Warning     (\.+)(.*?):(\d+):(.*?):IGNORE: (.*)     $2      $3      $5
-Warning     (\.+)(.*?):(\d+):(.*?):IGNORE\s*$       $2      $3      Ignored test
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile.rb b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile.rb
deleted file mode 100644
index 7603e574..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-HERE = File.expand_path(File.dirname(__FILE__)) + '/'
-
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require HERE + 'rakefile_helper'
-
-TEMP_DIRS = [
-  File.join(HERE, 'build')
-].freeze
-
-TEMP_DIRS.each do |dir|
-  directory(dir)
-  CLOBBER.include(dir)
-end
-
-task prepare_for_tests: TEMP_DIRS
-
-include RakefileHelpers
-
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'.freeze
-configure_toolchain(DEFAULT_CONFIG_FILE)
-
-task unit: [:prepare_for_tests] do
-  run_tests
-end
-
-desc 'Build and test Unity Framework'
-task all: %i(clean unit)
-task default: %i(clobber all)
-task ci: %i(no_color default)
-task cruise: %i(no_color default)
-
-desc 'Load configuration'
-task :config, :config_file do |_t, args|
-  configure_toolchain(args[:config_file])
-end
-
-task :no_color do
-  $colour_output = false
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile_helper.rb b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile_helper.rb
deleted file mode 100644
index c45b2393..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile_helper.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-require 'yaml'
-require 'fileutils'
-require HERE + '../../auto/unity_test_summary'
-require HERE + '../../auto/generate_test_runner'
-require HERE + '../../auto/colour_reporter'
-
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
-
-  def load_configuration(config_file)
-    return if $configured
-
-    $cfg_file = HERE + "../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/
-    $cfg = YAML.load(File.read($cfg_file))
-    $colour_output = false unless $cfg['colour']
-    $configured = true if config_file != DEFAULT_CONFIG_FILE
-  end
-
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
-  end
-
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    config_file = config_file unless config_file =~ /[\\|\/]/
-    load_configuration(config_file)
-    configure_clean
-  end
-
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
-             else
-               strings
-             end
-    result
-  end
-
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
-
-  def build_compiler_fields
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar'] + ['UNITY_OUTPUT_CHAR_HEADER_DECLARATION=UnityOutputCharSpy_OutputChar\(int\)'])
-              end
-    options  = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, defines: defines, options: options, includes: includes }
-  end
-
-  def compile(file, _defines = [])
-    compiler = build_compiler_fields
-    unity_include = $cfg['compiler']['includes']['prefix'] + '../../src'
-    cmd_str = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{unity_include} #{file} " \
-              "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}" \
-              "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
-
-    execute(cmd_str)
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, options: options, includes: includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-    { command: command, pre_support: pre_support, post_support: post_support }
-  end
-
-  def execute(command_string, verbose = true)
-    report command_string
-    output = `#{command_string}`.chomp
-    report(output) if verbose && !output.nil? && !output.empty?
-    raise "Command failed. (Returned #{$?.exitstatus})" if $?.exitstatus != 0
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = HERE
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    summary.run
-  end
-
-  def run_tests
-    report 'Running Unity system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
-
-    # Get a list of all source files needed
-    src_files  = Dir[HERE + 'src/*.c']
-    src_files += Dir[HERE + 'test/*.c']
-    src_files += Dir[HERE + 'test/main/*.c']
-    src_files << '../../src/unity.c'
-
-    # Build object files
-    src_files.each { |f| compile(f, test_defines) }
-    obj_list = src_files.map { |f| File.basename(f.ext($cfg['compiler']['object_files']['extension'])) }
-
-    # Link the test executable
-    test_base = 'framework_test'
-    link_it(test_base, obj_list)
-
-    # Execute unit test and generate results file
-    simulator = build_simulator_fields
-    executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-    cmd_str = if simulator.nil?
-                executable + ' -v -r'
-              else
-                "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-              end
-    output = execute(cmd_str)
-    test_results = $cfg['compiler']['build_path'] + test_base
-    test_results += if output.match(/OK$/m).nil?
-                      '.testfail'
-                    else
-                      '.testpass'
-                    end
-    File.open(test_results, 'w') { |f| f.print output }
-  end
-end
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/readme.txt b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/readme.txt
deleted file mode 100644
index 6b9a78c1..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) 2010 James Grenning and Contributed to Unity Project
-
-Unity Project - A Test Framework for C
-Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-[Released under MIT License. Please refer to license.txt for details]
-
-This Framework is an optional add-on to Unity.  By including unity_framework.h in place of unity.h,
-you may now work with Unity in a manner similar to CppUTest.  This framework adds the concepts of 
-test groups and gives finer control of your tests over the command line.
\ No newline at end of file
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.c b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.c
deleted file mode 100644
index 3872bd8f..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-#include "unity_internals.h"
-#include <string.h>
-
-struct UNITY_FIXTURE_T UnityFixture;
-
-/* If you decide to use the function pointer approach.
- * Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>
- * int (*outputChar)(int) = putchar; */
-
-#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
-void setUp(void)    { /*does nothing*/ }
-void tearDown(void) { /*does nothing*/ }
-#endif
-
-static void announceTestRun(unsigned int runNumber)
-{
-    UnityPrint("Unity test run ");
-    UnityPrintNumberUnsigned(runNumber+1);
-    UnityPrint(" of ");
-    UnityPrintNumberUnsigned(UnityFixture.RepeatCount);
-    UNITY_PRINT_EOL();
-}
-
-int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
-{
-    int result = UnityGetCommandLineOptions(argc, argv);
-    unsigned int r;
-    if (result != 0)
-        return result;
-
-    for (r = 0; r < UnityFixture.RepeatCount; r++)
-    {
-        UnityBegin(argv[0]);
-        announceTestRun(r);
-        runAllTests();
-        if (!UnityFixture.Verbose) UNITY_PRINT_EOL();
-        UnityEnd();
-    }
-
-    return (int)Unity.TestFailures;
-}
-
-static int selected(const char* filter, const char* name)
-{
-    if (filter == 0)
-        return 1;
-    return strstr(name, filter) ? 1 : 0;
-}
-
-static int testSelected(const char* test)
-{
-    return selected(UnityFixture.NameFilter, test);
-}
-
-static int groupSelected(const char* group)
-{
-    return selected(UnityFixture.GroupFilter, group);
-}
-
-void UnityTestRunner(unityfunction* setup,
-                     unityfunction* testBody,
-                     unityfunction* teardown,
-                     const char* printableName,
-                     const char* group,
-                     const char* name,
-                     const char* file,
-                     unsigned int line)
-{
-    if (testSelected(name) && groupSelected(group))
-    {
-        Unity.TestFile = file;
-        Unity.CurrentTestName = printableName;
-        Unity.CurrentTestLineNumber = line;
-        if (!UnityFixture.Verbose)
-            UNITY_OUTPUT_CHAR('.');
-        else
-        {
-            UnityPrint(printableName);
-        #ifndef UNITY_REPEAT_TEST_NAME
-            Unity.CurrentTestName = NULL;
-        #endif
-        }
-
-        Unity.NumberOfTests++;
-        UnityMalloc_StartTest();
-        UnityPointer_Init();
-
-        if (TEST_PROTECT())
-        {
-            setup();
-            testBody();
-        }
-        if (TEST_PROTECT())
-        {
-            teardown();
-        }
-        if (TEST_PROTECT())
-        {
-            UnityPointer_UndoAllSets();
-            if (!Unity.CurrentTestFailed)
-                UnityMalloc_EndTest();
-        }
-        UnityConcludeFixtureTest();
-    }
-}
-
-void UnityIgnoreTest(const char* printableName, const char* group, const char* name)
-{
-    if (testSelected(name) && groupSelected(group))
-    {
-        Unity.NumberOfTests++;
-        Unity.TestIgnores++;
-        if (!UnityFixture.Verbose)
-            UNITY_OUTPUT_CHAR('!');
-        else
-        {
-            UnityPrint(printableName);
-            UNITY_PRINT_EOL();
-        }
-    }
-}
-
-
-/*------------------------------------------------- */
-/* Malloc and free stuff */
-#define MALLOC_DONT_FAIL -1
-static int malloc_count;
-static int malloc_fail_countdown = MALLOC_DONT_FAIL;
-
-void UnityMalloc_StartTest(void)
-{
-    malloc_count = 0;
-    malloc_fail_countdown = MALLOC_DONT_FAIL;
-}
-
-void UnityMalloc_EndTest(void)
-{
-    malloc_fail_countdown = MALLOC_DONT_FAIL;
-    if (malloc_count != 0)
-    {
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "This test leaks!");
-    }
-}
-
-void UnityMalloc_MakeMallocFailAfterCount(int countdown)
-{
-    malloc_fail_countdown = countdown;
-}
-
-/* These definitions are always included from unity_fixture_malloc_overrides.h */
-/* We undef to use them or avoid conflict with <stdlib.h> per the C standard */
-#undef malloc
-#undef free
-#undef calloc
-#undef realloc
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES];
-static size_t heap_index;
-#else
-#include <stdlib.h>
-#endif
-
-typedef struct GuardBytes
-{
-    size_t size;
-    size_t guard_space;
-} Guard;
-
-
-static const char end[] = "END";
-
-void* unity_malloc(size_t size)
-{
-    char* mem;
-    Guard* guard;
-    size_t total_size = size + sizeof(Guard) + sizeof(end);
-
-    if (malloc_fail_countdown != MALLOC_DONT_FAIL)
-    {
-        if (malloc_fail_countdown == 0)
-            return NULL;
-        malloc_fail_countdown--;
-    }
-
-    if (size == 0) return NULL;
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    if (heap_index + total_size > UNITY_INTERNAL_HEAP_SIZE_BYTES)
-    {
-        guard = NULL;
-    }
-    else
-    {
-        guard = (Guard*)&unity_heap[heap_index];
-        heap_index += total_size;
-    }
-#else
-    guard = (Guard*)UNITY_FIXTURE_MALLOC(total_size);
-#endif
-    if (guard == NULL) return NULL;
-    malloc_count++;
-    guard->size = size;
-    guard->guard_space = 0;
-    mem = (char*)&(guard[1]);
-    memcpy(&mem[size], end, sizeof(end));
-
-    return (void*)mem;
-}
-
-static int isOverrun(void* mem)
-{
-    Guard* guard = (Guard*)mem;
-    char* memAsChar = (char*)mem;
-    guard--;
-
-    return guard->guard_space != 0 || strcmp(&memAsChar[guard->size], end) != 0;
-}
-
-static void release_memory(void* mem)
-{
-    Guard* guard = (Guard*)mem;
-    guard--;
-
-    malloc_count--;
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    if (mem == unity_heap + heap_index - guard->size - sizeof(end))
-    {
-        heap_index -= (guard->size + sizeof(Guard) + sizeof(end));
-    }
-#else
-    UNITY_FIXTURE_FREE(guard);
-#endif
-}
-
-void unity_free(void* mem)
-{
-    int overrun;
-
-    if (mem == NULL)
-    {
-        return;
-    }
-
-    overrun = isOverrun(mem);
-    release_memory(mem);
-    if (overrun)
-    {
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "Buffer overrun detected during free()");
-    }
-}
-
-void* unity_calloc(size_t num, size_t size)
-{
-    void* mem = unity_malloc(num * size);
-    if (mem == NULL) return NULL;
-    memset(mem, 0, num * size);
-    return mem;
-}
-
-void* unity_realloc(void* oldMem, size_t size)
-{
-    Guard* guard = (Guard*)oldMem;
-    void* newMem;
-
-    if (oldMem == NULL) return unity_malloc(size);
-
-    guard--;
-    if (isOverrun(oldMem))
-    {
-        release_memory(oldMem);
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "Buffer overrun detected during realloc()");
-    }
-
-    if (size == 0)
-    {
-        release_memory(oldMem);
-        return NULL;
-    }
-
-    if (guard->size >= size) return oldMem;
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC /* Optimization if memory is expandable */
-    if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) &&
-        heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES)
-    {
-        release_memory(oldMem);    /* Not thread-safe, like unity_heap generally */
-        return unity_malloc(size); /* No memcpy since data is in place */
-    }
-#endif
-    newMem = unity_malloc(size);
-    if (newMem == NULL) return NULL; /* Do not release old memory */
-    memcpy(newMem, oldMem, guard->size);
-    release_memory(oldMem);
-    return newMem;
-}
-
-
-/*-------------------------------------------------------- */
-/*Automatic pointer restoration functions */
-struct PointerPair
-{
-    void** pointer;
-    void* old_value;
-};
-
-static struct PointerPair pointer_store[UNITY_MAX_POINTERS];
-static int pointer_index = 0;
-
-void UnityPointer_Init(void)
-{
-    pointer_index = 0;
-}
-
-void UnityPointer_Set(void** pointer, void* newValue, UNITY_LINE_TYPE line)
-{
-    if (pointer_index >= UNITY_MAX_POINTERS)
-    {
-        UNITY_TEST_FAIL(line, "Too many pointers set");
-    }
-    else
-    {
-        pointer_store[pointer_index].pointer = pointer;
-        pointer_store[pointer_index].old_value = *pointer;
-        *pointer = newValue;
-        pointer_index++;
-    }
-}
-
-void UnityPointer_UndoAllSets(void)
-{
-    while (pointer_index > 0)
-    {
-        pointer_index--;
-        *(pointer_store[pointer_index].pointer) =
-            pointer_store[pointer_index].old_value;
-    }
-}
-
-int UnityGetCommandLineOptions(int argc, const char* argv[])
-{
-    int i;
-    UnityFixture.Verbose = 0;
-    UnityFixture.GroupFilter = 0;
-    UnityFixture.NameFilter = 0;
-    UnityFixture.RepeatCount = 1;
-
-    if (argc == 1)
-        return 0;
-
-    for (i = 1; i < argc; )
-    {
-        if (strcmp(argv[i], "-v") == 0)
-        {
-            UnityFixture.Verbose = 1;
-            i++;
-        }
-        else if (strcmp(argv[i], "-g") == 0)
-        {
-            i++;
-            if (i >= argc)
-                return 1;
-            UnityFixture.GroupFilter = argv[i];
-            i++;
-        }
-        else if (strcmp(argv[i], "-n") == 0)
-        {
-            i++;
-            if (i >= argc)
-                return 1;
-            UnityFixture.NameFilter = argv[i];
-            i++;
-        }
-        else if (strcmp(argv[i], "-r") == 0)
-        {
-            UnityFixture.RepeatCount = 2;
-            i++;
-            if (i < argc)
-            {
-                if (*(argv[i]) >= '0' && *(argv[i]) <= '9')
-                {
-                    unsigned int digit = 0;
-                    UnityFixture.RepeatCount = 0;
-                    while (argv[i][digit] >= '0' && argv[i][digit] <= '9')
-                    {
-                        UnityFixture.RepeatCount *= 10;
-                        UnityFixture.RepeatCount += (unsigned int)argv[i][digit++] - '0';
-                    }
-                    i++;
-                }
-            }
-        }
-        else
-        {
-            /* ignore unknown parameter */
-            i++;
-        }
-    }
-    return 0;
-}
-
-void UnityConcludeFixtureTest(void)
-{
-    if (Unity.CurrentTestIgnored)
-    {
-        Unity.TestIgnores++;
-        UNITY_PRINT_EOL();
-    }
-    else if (!Unity.CurrentTestFailed)
-    {
-        if (UnityFixture.Verbose)
-        {
-            UnityPrint(" PASS");
-            UNITY_PRINT_EOL();
-        }
-    }
-    else /* Unity.CurrentTestFailed */
-    {
-        Unity.TestFailures++;
-        UNITY_PRINT_EOL();
-    }
-
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-}
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.h b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.h
deleted file mode 100644
index 6f8d6234..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_H_
-#define UNITY_FIXTURE_H_
-
-#include "unity.h"
-#include "unity_internals.h"
-#include "unity_fixture_malloc_overrides.h"
-#include "unity_fixture_internals.h"
-
-int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
-
-
-#define TEST_GROUP(group)\
-    static const char* TEST_GROUP_##group = #group
-
-#define TEST_SETUP(group) void TEST_##group##_SETUP(void);\
-    void TEST_##group##_SETUP(void)
-
-#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void);\
-    void TEST_##group##_TEAR_DOWN(void)
-
-
-#define TEST(group, name) \
-    void TEST_##group##_##name##_(void);\
-    void TEST_##group##_##name##_run(void);\
-    void TEST_##group##_##name##_run(void)\
-    {\
-        UnityTestRunner(TEST_##group##_SETUP,\
-            TEST_##group##_##name##_,\
-            TEST_##group##_TEAR_DOWN,\
-            "TEST(" #group ", " #name ")",\
-            TEST_GROUP_##group, #name,\
-            __FILE__, __LINE__);\
-    }\
-    void  TEST_##group##_##name##_(void)
-
-#define IGNORE_TEST(group, name) \
-    void TEST_##group##_##name##_(void);\
-    void TEST_##group##_##name##_run(void);\
-    void TEST_##group##_##name##_run(void)\
-    {\
-        UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")", TEST_GROUP_##group, #name);\
-    }\
-    void TEST_##group##_##name##_(void)
-
-/* Call this for each test, insider the group runner */
-#define RUN_TEST_CASE(group, name) \
-    { void TEST_##group##_##name##_run(void);\
-      TEST_##group##_##name##_run(); }
-
-/* This goes at the bottom of each test file or in a separate c file */
-#define TEST_GROUP_RUNNER(group)\
-    void TEST_##group##_GROUP_RUNNER(void);\
-    void TEST_##group##_GROUP_RUNNER(void)
-
-/* Call this from main */
-#define RUN_TEST_GROUP(group)\
-    { void TEST_##group##_GROUP_RUNNER(void);\
-      TEST_##group##_GROUP_RUNNER(); }
-
-/* CppUTest Compatibility Macros */
-#ifndef UNITY_EXCLUDE_CPPUTEST_ASSERTS
-/* Sets a pointer and automatically restores it to its old value after teardown */
-#define UT_PTR_SET(ptr, newPointerValue)               UnityPointer_Set((void**)&(ptr), (void*)(newPointerValue), __LINE__)
-#define TEST_ASSERT_POINTERS_EQUAL(expected, actual)   TEST_ASSERT_EQUAL_PTR((expected), (actual))
-#define TEST_ASSERT_BYTES_EQUAL(expected, actual)      TEST_ASSERT_EQUAL_HEX8(0xff & (expected), 0xff & (actual))
-#define FAIL(message)                                  TEST_FAIL_MESSAGE((message))
-#define CHECK(condition)                               TEST_ASSERT_TRUE((condition))
-#define LONGS_EQUAL(expected, actual)                  TEST_ASSERT_EQUAL_INT((expected), (actual))
-#define STRCMP_EQUAL(expected, actual)                 TEST_ASSERT_EQUAL_STRING((expected), (actual))
-#define DOUBLES_EQUAL(expected, actual, delta)         TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual))
-#endif
-
-/* You must compile with malloc replacement, as defined in unity_fixture_malloc_overrides.h */
-void UnityMalloc_MakeMallocFailAfterCount(int count);
-
-#endif /* UNITY_FIXTURE_H_ */
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_internals.h b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_internals.h
deleted file mode 100644
index aa0d9e7c..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_internals.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_INTERNALS_H_
-#define UNITY_FIXTURE_INTERNALS_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-struct UNITY_FIXTURE_T
-{
-    int Verbose;
-    unsigned int RepeatCount;
-    const char* NameFilter;
-    const char* GroupFilter;
-};
-extern struct UNITY_FIXTURE_T UnityFixture;
-
-typedef void unityfunction(void);
-void UnityTestRunner(unityfunction* setup,
-                     unityfunction* body,
-                     unityfunction* teardown,
-                     const char* printableName,
-                     const char* group,
-                     const char* name,
-                     const char* file, unsigned int line);
-
-void UnityIgnoreTest(const char* printableName, const char* group, const char* name);
-void UnityMalloc_StartTest(void);
-void UnityMalloc_EndTest(void);
-int UnityGetCommandLineOptions(int argc, const char* argv[]);
-void UnityConcludeFixtureTest(void);
-
-void UnityPointer_Set(void** ptr, void* newValue, UNITY_LINE_TYPE line);
-void UnityPointer_UndoAllSets(void);
-void UnityPointer_Init(void);
-#ifndef UNITY_MAX_POINTERS
-#define UNITY_MAX_POINTERS 5
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* UNITY_FIXTURE_INTERNALS_H_ */
diff --git a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_malloc_overrides.h b/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_malloc_overrides.h
deleted file mode 100644
index 7daba50a..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_malloc_overrides.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_MALLOC_OVERRIDES_H_
-#define UNITY_FIXTURE_MALLOC_OVERRIDES_H_
-
-#include <stddef.h>
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-/* Define this macro to remove the use of stdlib.h, malloc, and free.
- * Many embedded systems do not have a heap or malloc/free by default.
- * This internal unity_malloc() provides allocated memory deterministically from
- * the end of an array only, unity_free() only releases from end-of-array,
- * blocks are not coalesced, and memory not freed in LIFO order is stranded. */
-    #ifndef UNITY_INTERNAL_HEAP_SIZE_BYTES
-    #define UNITY_INTERNAL_HEAP_SIZE_BYTES 256
-    #endif
-#endif
-
-/* These functions are used by the Unity Fixture to allocate and release memory
- * on the heap and can be overridden with platform-specific implementations.
- * For example, when using FreeRTOS UNITY_FIXTURE_MALLOC becomes pvPortMalloc()
- * and UNITY_FIXTURE_FREE becomes vPortFree(). */
-#if !defined(UNITY_FIXTURE_MALLOC) || !defined(UNITY_FIXTURE_FREE)
-    #include <stdlib.h>
-    #define UNITY_FIXTURE_MALLOC(size) malloc(size)
-    #define UNITY_FIXTURE_FREE(ptr)    free(ptr)
-#else
-    extern void* UNITY_FIXTURE_MALLOC(size_t size);
-    extern void UNITY_FIXTURE_FREE(void* ptr);
-#endif
-
-#define malloc  unity_malloc
-#define calloc  unity_calloc
-#define realloc unity_realloc
-#define free    unity_free
-
-void* unity_malloc(size_t size);
-void* unity_calloc(size_t num, size_t size);
-void* unity_realloc(void * oldMem, size_t size);
-void unity_free(void * mem);
-
-#endif /* UNITY_FIXTURE_MALLOC_OVERRIDES_H_ */
diff --git a/external_libs/cJSON/cJSON/tests/unity/release/build.info b/external_libs/cJSON/cJSON/tests/unity/release/build.info
deleted file mode 100644
index 56d59128..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/release/build.info
+++ /dev/null
@@ -1,2 +0,0 @@
-122
-
diff --git a/external_libs/cJSON/cJSON/tests/unity/release/version.info b/external_libs/cJSON/cJSON/tests/unity/release/version.info
deleted file mode 100644
index cf12b30d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/release/version.info
+++ /dev/null
@@ -1,2 +0,0 @@
-2.4.3
-
diff --git a/external_libs/cJSON/cJSON/tests/unity/src/unity.c b/external_libs/cJSON/cJSON/tests/unity/src/unity.c
deleted file mode 100644
index 0f2d2dea..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/src/unity.c
+++ /dev/null
@@ -1,1570 +0,0 @@
-/* =========================================================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-============================================================================ */
-
-#define UNITY_INCLUDE_SETUP_STUBS
-#include "unity.h"
-#include <stddef.h>
-
-/* If omitted from header, declare overrideable prototypes here so they're ready for use */
-#ifdef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
-void UNITY_OUTPUT_CHAR(int);
-#endif
-
-/* Helpful macros for us to use here in Assert functions */
-#define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; TEST_ABORT(); }
-#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; TEST_ABORT(); }
-#define RETURN_IF_FAIL_OR_IGNORE if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) return
-
-struct UNITY_STORAGE_T Unity;
-
-#ifdef UNITY_OUTPUT_COLOR
-static const char UnityStrOk[]                     = "\033[42mOK\033[00m";
-static const char UnityStrPass[]                   = "\033[42mPASS\033[00m";
-static const char UnityStrFail[]                   = "\033[41mFAIL\033[00m";
-static const char UnityStrIgnore[]                 = "\033[43mIGNORE\033[00m";
-#else
-static const char UnityStrOk[]                     = "OK";
-static const char UnityStrPass[]                   = "PASS";
-static const char UnityStrFail[]                   = "FAIL";
-static const char UnityStrIgnore[]                 = "IGNORE";
-#endif
-static const char UnityStrNull[]                   = "NULL";
-static const char UnityStrSpacer[]                 = ". ";
-static const char UnityStrExpected[]               = " Expected ";
-static const char UnityStrWas[]                    = " Was ";
-static const char UnityStrGt[]                     = " to be greater than ";
-static const char UnityStrLt[]                     = " to be less than ";
-static const char UnityStrOrEqual[]                = "or equal to ";
-static const char UnityStrElement[]                = " Element ";
-static const char UnityStrByte[]                   = " Byte ";
-static const char UnityStrMemory[]                 = " Memory Mismatch.";
-static const char UnityStrDelta[]                  = " Values Not Within Delta ";
-static const char UnityStrPointless[]              = " You Asked Me To Compare Nothing, Which Was Pointless.";
-static const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
-static const char UnityStrNullPointerForActual[]   = " Actual pointer was NULL";
-#ifndef UNITY_EXCLUDE_FLOAT
-static const char UnityStrNot[]                    = "Not ";
-static const char UnityStrInf[]                    = "Infinity";
-static const char UnityStrNegInf[]                 = "Negative Infinity";
-static const char UnityStrNaN[]                    = "NaN";
-static const char UnityStrDet[]                    = "Determinate";
-static const char UnityStrInvalidFloatTrait[]      = "Invalid Float Trait";
-#endif
-const char UnityStrErrFloat[]                      = "Unity Floating Point Disabled";
-const char UnityStrErrDouble[]                     = "Unity Double Precision Disabled";
-const char UnityStrErr64[]                         = "Unity 64-bit Support Disabled";
-static const char UnityStrBreaker[]                = "-----------------------";
-static const char UnityStrResultsTests[]           = " Tests ";
-static const char UnityStrResultsFailures[]        = " Failures ";
-static const char UnityStrResultsIgnored[]         = " Ignored ";
-static const char UnityStrDetail1Name[]            = UNITY_DETAIL1_NAME " ";
-static const char UnityStrDetail2Name[]            = " " UNITY_DETAIL2_NAME " ";
-
-/*-----------------------------------------------
- * Pretty Printers & Test Result Output Handlers
- *-----------------------------------------------*/
-
-void UnityPrint(const char* string)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-#ifdef UNITY_OUTPUT_COLOR
-            /* print ANSI escape code */
-            else if (*pch == 27 && *(pch + 1) == '[')
-            {
-                while (*pch && *pch != 'm')
-                {
-                    UNITY_OUTPUT_CHAR(*pch);
-                    pch++;
-                }
-                UNITY_OUTPUT_CHAR('m');
-            }
-#endif
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-void UnityPrintLen(const char* string, const UNITY_UINT32 length)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch && (UNITY_UINT32)(pch - string) < length)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style)
-{
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        UnityPrintNumber(number);
-    }
-    else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT)
-    {
-        UnityPrintNumberUnsigned((UNITY_UINT)number);
-    }
-    else
-    {
-        UNITY_OUTPUT_CHAR('0');
-        UNITY_OUTPUT_CHAR('x');
-        UnityPrintNumberHex((UNITY_UINT)number, (char)((style & 0xF) * 2));
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumber(const UNITY_INT number_to_print)
-{
-    UNITY_UINT number = (UNITY_UINT)number_to_print;
-
-    if (number_to_print < 0)
-    {
-        /* A negative number, including MIN negative */
-        UNITY_OUTPUT_CHAR('-');
-        number = (UNITY_UINT)(-number_to_print);
-    }
-    UnityPrintNumberUnsigned(number);
-}
-
-/*-----------------------------------------------
- * basically do an itoa using as little ram as possible */
-void UnityPrintNumberUnsigned(const UNITY_UINT number)
-{
-    UNITY_UINT divisor = 1;
-
-    /* figure out initial divisor */
-    while (number / divisor > 9)
-    {
-        divisor *= 10;
-    }
-
-    /* now mod and print, then divide divisor */
-    do
-    {
-        UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
-        divisor /= 10;
-    } while (divisor > 0);
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles_to_print)
-{
-    int nibble;
-    char nibbles = nibbles_to_print;
-    if ((unsigned)nibbles > (2 * sizeof(number)))
-        nibbles = 2 * sizeof(number);
-
-    while (nibbles > 0)
-    {
-        nibbles--;
-        nibble = (int)(number >> (nibbles * 4)) & 0x0F;
-        if (nibble <= 9)
-        {
-            UNITY_OUTPUT_CHAR((char)('0' + nibble));
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble));
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number)
-{
-    UNITY_UINT current_bit = (UNITY_UINT)1 << (UNITY_INT_WIDTH - 1);
-    UNITY_INT32 i;
-
-    for (i = 0; i < UNITY_INT_WIDTH; i++)
-    {
-        if (current_bit & mask)
-        {
-            if (current_bit & number)
-            {
-                UNITY_OUTPUT_CHAR('1');
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('0');
-            }
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR('X');
-        }
-        current_bit = current_bit >> 1;
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-/* This function prints a floating-point value in a format similar to
- * printf("%.6g").  It can work with either single- or double-precision,
- * but for simplicity, it prints only 6 significant digits in either case.
- * Printing more than 6 digits accurately is hard (at least in the single-
- * precision case) and isn't attempted here. */
-void UnityPrintFloat(const UNITY_DOUBLE input_number)
-{
-    UNITY_DOUBLE number = input_number;
-
-    /* print minus sign (including for negative zero) */
-    if (number < 0.0f || (number == 0.0f && 1.0f / number < 0.0f))
-    {
-        UNITY_OUTPUT_CHAR('-');
-        number = -number;
-    }
-
-    /* handle zero, NaN, and +/- infinity */
-    if (number == 0.0f) UnityPrint("0");
-    else if (isnan(number)) UnityPrint("nan");
-    else if (isinf(number)) UnityPrint("inf");
-    else
-    {
-        int exponent = 0;
-        int decimals, digits;
-        UNITY_INT32 n;
-        char buf[16];
-
-        /* scale up or down by powers of 10 */
-        while (number < 100000.0f / 1e6f)  { number *= 1e6f; exponent -= 6; }
-        while (number < 100000.0f)         { number *= 10.0f; exponent--; }
-        while (number > 1000000.0f * 1e6f) { number /= 1e6f; exponent += 6; }
-        while (number > 1000000.0f)        { number /= 10.0f; exponent++; }
-
-        /* round to nearest integer */
-        n = ((UNITY_INT32)(number + number) + 1) / 2;
-        if (n > 999999)
-        {
-            n = 100000;
-            exponent++;
-        }
-
-        /* determine where to place decimal point */
-        decimals = (exponent <= 0 && exponent >= -9) ? -exponent : 5;
-        exponent += decimals;
-
-        /* truncate trailing zeroes after decimal point */
-        while (decimals > 0 && n % 10 == 0)
-        {
-            n /= 10;
-            decimals--;
-        }
-
-        /* build up buffer in reverse order */
-        digits = 0;
-        while (n != 0 || digits < decimals + 1)
-        {
-            buf[digits++] = (char)('0' + n % 10);
-            n /= 10;
-        }
-        while (digits > 0)
-        {
-            if(digits == decimals) UNITY_OUTPUT_CHAR('.');
-            UNITY_OUTPUT_CHAR(buf[--digits]);
-        }
-
-        /* print exponent if needed */
-        if (exponent != 0)
-        {
-            UNITY_OUTPUT_CHAR('e');
-
-            if(exponent < 0)
-            {
-                UNITY_OUTPUT_CHAR('-');
-                exponent = -exponent;
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('+');
-            }
-
-            digits = 0;
-            while (exponent != 0 || digits < 2)
-            {
-                buf[digits++] = (char)('0' + exponent % 10);
-                exponent /= 10;
-            }
-            while (digits > 0)
-            {
-                UNITY_OUTPUT_CHAR(buf[--digits]);
-            }
-        }
-    }
-}
-#endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */
-
-/*-----------------------------------------------*/
-static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
-{
-    UnityPrint(file);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrintNumber((UNITY_INT)line);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrint(Unity.CurrentTestName);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
-{
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-void UnityConcludeTest(void)
-{
-    if (Unity.CurrentTestIgnored)
-    {
-        Unity.TestIgnores++;
-    }
-    else if (!Unity.CurrentTestFailed)
-    {
-        UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
-        UnityPrint(UnityStrPass);
-    }
-    else
-    {
-        Unity.TestFailures++;
-    }
-
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-}
-
-/*-----------------------------------------------*/
-static void UnityAddMsgIfSpecified(const char* msg)
-{
-    if (msg)
-    {
-        UnityPrint(UnityStrSpacer);
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        UnityPrint(msg);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(expected);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(actual);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStringsLen(const char* expected,
-                                                  const char* actual,
-                                                  const UNITY_UINT32 length)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(expected, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(actual, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------
- * Assertion & Control Helpers
- *-----------------------------------------------*/
-
-static int UnityIsOneArrayNull(UNITY_INTERNAL_PTR expected,
-                               UNITY_INTERNAL_PTR actual,
-                               const UNITY_LINE_TYPE lineNumber,
-                               const char* msg)
-{
-    if (expected == actual) return 0; /* Both are NULL or same pointer */
-
-    /* print and return true if just expected is NULL */
-    if (expected == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForExpected);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    /* print and return true if just actual is NULL */
-    if (actual == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForActual);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    return 0; /* return false if neither is NULL */
-}
-
-/*-----------------------------------------------
- * Assertion Functions
- *-----------------------------------------------*/
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((mask & expected) != (mask & actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)expected);
-        UnityPrint(UnityStrWas);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (expected != actual)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style)
-{
-    int failed = 0;
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (threshold == actual && compare & UNITY_EQUAL_TO) return;
-    if (threshold == actual) failed = 1;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if (actual < threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-    else /* UINT or HEX */
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if ((UNITY_UINT)actual < (UNITY_UINT)threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-
-    if (failed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(actual, style);
-        if (compare & UNITY_GREATER_THAN) UnityPrint(UnityStrGt);
-        if (compare & UNITY_SMALLER_THAN) UnityPrint(UnityStrLt);
-        if (compare & UNITY_EQUAL_TO)     UnityPrint(UnityStrOrEqual);
-        UnityPrintNumberByStyle(threshold, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#define UnityPrintPointlessAndBail()       \
-{                                          \
-    UnityTestResultsFailBegin(lineNumber); \
-    UnityPrint(UnityStrPointless);         \
-    UnityAddMsgIfSpecified(msg);           \
-    UNITY_FAIL_AND_BAIL; }
-
-/*-----------------------------------------------*/
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    unsigned int length   = style & 0xF;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        UNITY_INT expect_val;
-        UNITY_INT actual_val;
-        switch (length)
-        {
-            case 1:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)actual;
-                break;
-            case 2:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)actual;
-                break;
-#ifdef UNITY_SUPPORT_64
-            case 8:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)actual;
-                break;
-#endif
-            default: /* length 4 bytes */
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
-                length = 4;
-                break;
-        }
-
-        if (expect_val != actual_val)
-        {
-            if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof(expect_val))
-            {   /* For UINT, remove sign extension (padding 1's) from signed type casts above */
-                UNITY_INT mask = 1;
-                mask = (mask << 8 * length) - 1;
-                expect_val &= mask;
-                actual_val &= mask;
-            }
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UnityPrint(UnityStrExpected);
-            UnityPrintNumberByStyle(expect_val, style);
-            UnityPrint(UnityStrWas);
-            UnityPrintNumberByStyle(actual_val, style);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expected = (UNITY_INTERNAL_PTR)(length + (const char*)expected);
-        }
-        actual   = (UNITY_INTERNAL_PTR)(length + (const char*)actual);
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT
-/* Wrap this define in a function with variable types as float or double */
-#define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff)                       \
-    if (isinf(expected) && isinf(actual) && ((expected < 0) == (actual < 0))) return 1;   \
-    if (UNITY_NAN_CHECK) return 1;                                                        \
-    diff = actual - expected;                                                             \
-    if (diff < 0) diff = -diff;                                                           \
-    if (delta < 0) delta = -delta;                                                        \
-    return !(isnan(diff) || isinf(diff) || (diff > delta))
-    /* This first part of this condition will catch any NaN or Infinite values */
-#ifndef UNITY_NAN_NOT_EQUAL_NAN
-  #define UNITY_NAN_CHECK isnan(expected) && isnan(actual)
-#else
-  #define UNITY_NAN_CHECK 0
-#endif
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-  {                                                               \
-    UnityPrint(UnityStrExpected);                                 \
-    UnityPrintFloat(expected);                                    \
-    UnityPrint(UnityStrWas);                                      \
-    UnityPrintFloat(actual); }
-#else
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-    UnityPrint(UnityStrDelta)
-#endif /* UNITY_EXCLUDE_FLOAT_PRINT */
-
-static int UnityFloatsWithin(UNITY_FLOAT delta, UNITY_FLOAT expected, UNITY_FLOAT actual)
-{
-    UNITY_FLOAT diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityFloatsWithin(*ptr_expected * UNITY_FLOAT_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)*ptr_expected, (UNITY_DOUBLE)*ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-
-    if (!UnityFloatsWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat((UNITY_DOUBLE)actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_FLOAT */
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_DOUBLE
-static int UnityDoublesWithin(UNITY_DOUBLE delta, UNITY_DOUBLE expected, UNITY_DOUBLE actual)
-{
-    UNITY_DOUBLE diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityDoublesWithin(*ptr_expected * UNITY_DOUBLE_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*ptr_expected, *ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (!UnityDoublesWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat(actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_DOUBLE */
-
-/*-----------------------------------------------*/
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > expected)
-          Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-    else
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)expected)
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrDelta);
-        UnityPrintNumberByStyle((UNITY_INT)delta, style);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; expected[i] || actual[i]; i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStrings(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringLen(const char* expected,
-                               const char* actual,
-                               const UNITY_UINT32 length,
-                               const char* msg,
-                               const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; (i < length) && (expected[i] || actual[i]); i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStringsLen(expected, actual, length);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
-                                 const char** actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 i = 0;
-    UNITY_UINT32 j = 0;
-    const char* expd = NULL;
-    const char* act = NULL;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if no elements, it's an error */
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if ((const void*)expected == (const void*)actual)
-    {
-        return; /* Both are NULL or same pointer */
-    }
-
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-    {
-        UNITY_FAIL_AND_BAIL;
-    }
-
-    if (flags != UNITY_ARRAY_TO_ARRAY)
-    {
-        expd = (const char*)expected;
-    }
-
-    do
-    {
-        act = actual[j];
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expd = ((const char* const*)expected)[j];
-        }
-
-        /* if both pointers not null compare the strings */
-        if (expd && act)
-        {
-            for (i = 0; expd[i] || act[i]; i++)
-            {
-                if (expd[i] != act[i])
-                {
-                    Unity.CurrentTestFailed = 1;
-                    break;
-                }
-            }
-        }
-        else
-        { /* handle case of one pointers being null (if both null, test should pass) */
-            if (expd != act)
-            {
-                Unity.CurrentTestFailed = 1;
-            }
-        }
-
-        if (Unity.CurrentTestFailed)
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            if (num_elements > 1)
-            {
-                UnityPrint(UnityStrElement);
-                UnityPrintNumberUnsigned(j);
-            }
-            UnityPrintExpectedAndActualStrings(expd, act);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-    } while (++j < num_elements);
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected,
-                            UNITY_INTERNAL_PTR actual,
-                            const UNITY_UINT32 length,
-                            const UNITY_UINT32 num_elements,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_FLAGS_T flags)
-{
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
-    UNITY_UINT32 elements = num_elements;
-    UNITY_UINT32 bytes;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((elements == 0) || (length == 0))
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        bytes = length;
-        while (bytes--)
-        {
-            if (*ptr_exp != *ptr_act)
-            {
-                UnityTestResultsFailBegin(lineNumber);
-                UnityPrint(UnityStrMemory);
-                if (num_elements > 1)
-                {
-                    UnityPrint(UnityStrElement);
-                    UnityPrintNumberUnsigned(num_elements - elements - 1);
-                }
-                UnityPrint(UnityStrByte);
-                UnityPrintNumberUnsigned(length - bytes - 1);
-                UnityPrint(UnityStrExpected);
-                UnityPrintNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8);
-                UnityPrint(UnityStrWas);
-                UnityPrintNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8);
-                UnityAddMsgIfSpecified(msg);
-                UNITY_FAIL_AND_BAIL;
-            }
-            ptr_exp++;
-            ptr_act++;
-        }
-        if (flags == UNITY_ARRAY_TO_VAL)
-        {
-            ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-
-static union
-{
-    UNITY_INT8 i8;
-    UNITY_INT16 i16;
-    UNITY_INT32 i32;
-#ifdef UNITY_SUPPORT_64
-    UNITY_INT64 i64;
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT
-    float f;
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-    double d;
-#endif
-} UnityQuickCompare;
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size)
-{
-    switch(size)
-    {
-        case 1:
-          UnityQuickCompare.i8 = (UNITY_INT8)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i8);
-
-        case 2:
-          UnityQuickCompare.i16 = (UNITY_INT16)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i16);
-
-#ifdef UNITY_SUPPORT_64
-        case 8:
-          UnityQuickCompare.i64 = (UNITY_INT64)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i64);
-#endif
-        default: /* 4 bytes */
-          UnityQuickCompare.i32 = (UNITY_INT32)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i32);
-    }
-}
-
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num)
-{
-    UnityQuickCompare.f = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.f);
-}
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num)
-{
-    UnityQuickCompare.d = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.d);
-}
-#endif
-
-/*-----------------------------------------------
- * Control Functions
- *-----------------------------------------------*/
-
-void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        if (msg[0] != ' ')
-        {
-            UNITY_OUTPUT_CHAR(' ');
-        }
-        UnityPrint(msg);
-    }
-
-    UNITY_FAIL_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrIgnore);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-        UNITY_OUTPUT_CHAR(' ');
-        UnityPrint(msg);
-    }
-    UNITY_IGNORE_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
-{
-    Unity.CurrentTestName = FuncName;
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)FuncLineNum;
-    Unity.NumberOfTests++;
-    UNITY_CLR_DETAILS();
-    if (TEST_PROTECT())
-    {
-        setUp();
-        Func();
-    }
-    if (TEST_PROTECT())
-    {
-        tearDown();
-    }
-    UnityConcludeTest();
-}
-
-/*-----------------------------------------------*/
-void UnityBegin(const char* filename)
-{
-    Unity.TestFile = filename;
-    Unity.CurrentTestName = NULL;
-    Unity.CurrentTestLineNumber = 0;
-    Unity.NumberOfTests = 0;
-    Unity.TestFailures = 0;
-    Unity.TestIgnores = 0;
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-
-    UNITY_CLR_DETAILS();
-    UNITY_OUTPUT_START();
-}
-
-/*-----------------------------------------------*/
-int UnityEnd(void)
-{
-    UNITY_PRINT_EOL();
-    UnityPrint(UnityStrBreaker);
-    UNITY_PRINT_EOL();
-    UnityPrintNumber((UNITY_INT)(Unity.NumberOfTests));
-    UnityPrint(UnityStrResultsTests);
-    UnityPrintNumber((UNITY_INT)(Unity.TestFailures));
-    UnityPrint(UnityStrResultsFailures);
-    UnityPrintNumber((UNITY_INT)(Unity.TestIgnores));
-    UnityPrint(UnityStrResultsIgnored);
-    UNITY_PRINT_EOL();
-    if (Unity.TestFailures == 0U)
-    {
-        UnityPrint(UnityStrOk);
-    }
-    else
-    {
-        UnityPrint(UnityStrFail);
-#ifdef UNITY_DIFFERENTIATE_FINAL_FAIL
-        UNITY_OUTPUT_CHAR('E'); UNITY_OUTPUT_CHAR('D');
-#endif
-    }
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-    UNITY_OUTPUT_COMPLETE();
-    return (int)(Unity.TestFailures);
-}
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-
-char* UnityOptionIncludeNamed = NULL;
-char* UnityOptionExcludeNamed = NULL;
-int UnityVerbosity            = 1;
-
-int UnityParseOptions(int argc, char** argv)
-{
-    UnityOptionIncludeNamed = NULL;
-    UnityOptionExcludeNamed = NULL;
-
-    for (int i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == '-')
-        {
-            switch (argv[i][1])
-            {
-                case 'l': /* list tests */
-                    return -1;
-                case 'n': /* include tests with name including this string */
-                case 'f': /* an alias for -n */
-                    if (argv[i][2] == '=')
-                        UnityOptionIncludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionIncludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Include Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                case 'q': /* quiet */
-                    UnityVerbosity = 0;
-                    break;
-                case 'v': /* verbose */
-                    UnityVerbosity = 2;
-                    break;
-                case 'x': /* exclude tests with name including this string */
-                    if (argv[i][2] == '=')
-                        UnityOptionExcludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionExcludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Exclude Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                default:
-                    UnityPrint("ERROR: Unknown Option ");
-                    UNITY_OUTPUT_CHAR(argv[i][1]);
-                    UNITY_PRINT_EOL();
-                    return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int IsStringInBiggerString(const char* longstring, const char* shortstring)
-{
-    const char* lptr = longstring;
-    const char* sptr = shortstring;
-    const char* lnext = lptr;
-
-    if (*sptr == '*')
-        return 1;
-
-    while (*lptr)
-    {
-        lnext = lptr + 1;
-
-        /* If they current bytes match, go on to the next bytes */
-        while (*lptr && *sptr && (*lptr == *sptr))
-        {
-            lptr++;
-            sptr++;
-
-            /* We're done if we match the entire string or up to a wildcard */
-            if (*sptr == '*')
-                return 1;
-            if (*sptr == ',')
-                return 1;
-            if (*sptr == '"')
-                return 1;
-            if (*sptr == '\'')
-                return 1;
-            if (*sptr == ':')
-                return 2;
-            if (*sptr == 0)
-                return 1;
-        }
-
-        /* Otherwise we start in the long pointer 1 character further and try again */
-        lptr = lnext;
-        sptr = shortstring;
-    }
-    return 0;
-}
-
-int UnityStringArgumentMatches(const char* str)
-{
-    int retval;
-    const char* ptr1;
-    const char* ptr2;
-    const char* ptrf;
-
-    /* Go through the options and get the substrings for matching one at a time */
-    ptr1 = str;
-    while (ptr1[0] != 0)
-    {
-        if ((ptr1[0] == '"') || (ptr1[0] == '\''))
-            ptr1++;
-
-        /* look for the start of the next partial */
-        ptr2 = ptr1;
-        ptrf = 0;
-        do
-        {
-            ptr2++;
-            if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','))
-                ptrf = &ptr2[1];
-        } while ((ptr2[0] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','));
-        while ((ptr2[0] != 0) && ((ptr2[0] == ':') || (ptr2[0] == '\'') || (ptr2[0] == '"') || (ptr2[0] == ',')))
-            ptr2++;
-
-        /* done if complete filename match */
-        retval = IsStringInBiggerString(Unity.TestFile, ptr1);
-        if (retval == 1)
-            return retval;
-
-        /* done if testname match after filename partial match */
-        if ((retval == 2) && (ptrf != 0))
-        {
-            if (IsStringInBiggerString(Unity.CurrentTestName, ptrf))
-                return 1;
-        }
-
-        /* done if complete testname match */
-        if (IsStringInBiggerString(Unity.CurrentTestName, ptr1) == 1)
-            return 1;
-
-        ptr1 = ptr2;
-    }
-
-    /* we couldn't find a match for any substrings */
-    return 0;
-}
-
-int UnityTestMatches(void)
-{
-    /* Check if this test name matches the included test pattern */
-    int retval;
-    if (UnityOptionIncludeNamed)
-    {
-        retval = UnityStringArgumentMatches(UnityOptionIncludeNamed);
-    }
-    else
-        retval = 1;
-
-    /* Check if this test name matches the excluded test pattern */
-    if (UnityOptionExcludeNamed)
-    {
-        if (UnityStringArgumentMatches(UnityOptionExcludeNamed))
-            retval = 0;
-    }
-    return retval;
-}
-
-#endif /* UNITY_USE_COMMAND_LINE_ARGS */
-/*-----------------------------------------------*/
diff --git a/external_libs/cJSON/cJSON/tests/unity/src/unity.h b/external_libs/cJSON/cJSON/tests/unity/src/unity.h
deleted file mode 100644
index 32ff0e6d..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/src/unity.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_FRAMEWORK_H
-#define UNITY_FRAMEWORK_H
-#define UNITY
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "unity_internals.h"
-
-/*-------------------------------------------------------
- * Test Setup / Teardown
- *-------------------------------------------------------*/
-
-/* These functions are intended to be called before and after each test. */
-void setUp(void);
-void tearDown(void);
-
-/* These functions are intended to be called at the beginning and end of an
- * entire test suite.  suiteTearDown() is passed the number of tests that
- * failed, and its return value becomes the exit code of main(). */
-void suiteSetUp(void);
-int suiteTearDown(int num_failures);
-
-/* If the compiler supports it, the following block provides stub
- * implementations of the above functions as weak symbols.  Note that on
- * some platforms (MinGW for example), weak function implementations need
- * to be in the same translation unit they are called from.  This can be
- * achieved by defining UNITY_INCLUDE_SETUP_STUBS before including unity.h. */
-#ifdef UNITY_INCLUDE_SETUP_STUBS
-  #ifdef UNITY_WEAK_ATTRIBUTE
-    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
-    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
-    UNITY_WEAK_ATTRIBUTE void suiteSetUp(void) { }
-    UNITY_WEAK_ATTRIBUTE int suiteTearDown(int num_failures) { return num_failures; }
-  #elif defined(UNITY_WEAK_PRAGMA)
-    #pragma weak setUp
-    void setUp(void) { }
-    #pragma weak tearDown
-    void tearDown(void) { }
-    #pragma weak suiteSetUp
-    void suiteSetUp(void) { }
-    #pragma weak suiteTearDown
-    int suiteTearDown(int num_failures) { return num_failures; }
-  #endif
-#endif
-
-/*-------------------------------------------------------
- * Configuration Options
- *-------------------------------------------------------
- * All options described below should be passed as a compiler flag to all files using Unity. If you must add #defines, place them BEFORE the #include above.
-
- * Integers/longs/pointers
- *     - Unity attempts to automatically discover your integer sizes
- *       - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h>
- *       - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h>
- *     - If you cannot use the automatic methods above, you can force Unity by using these options:
- *       - define UNITY_SUPPORT_64
- *       - set UNITY_INT_WIDTH
- *       - set UNITY_LONG_WIDTH
- *       - set UNITY_POINTER_WIDTH
-
- * Floats
- *     - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
- *     - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT
- *     - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats
- *     - define UNITY_INCLUDE_DOUBLE to allow double floating point comparisons
- *     - define UNITY_EXCLUDE_DOUBLE to disallow double floating point comparisons (default)
- *     - define UNITY_DOUBLE_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_DOUBLE
- *     - define UNITY_DOUBLE_TYPE to specify something other than double
- *     - define UNITY_EXCLUDE_FLOAT_PRINT to trim binary size, won't print floating point values in errors
-
- * Output
- *     - by default, Unity prints to standard out with putchar.  define UNITY_OUTPUT_CHAR(a) with a different function if desired
- *     - define UNITY_DIFFERENTIATE_FINAL_FAIL to print FAILED (vs. FAIL) at test end summary - for automated search for failure
-
- * Optimization
- *     - by default, line numbers are stored in unsigned shorts.  Define UNITY_LINE_TYPE with a different type if your files are huge
- *     - by default, test and failure counters are unsigned shorts.  Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests.
-
- * Test Cases
- *     - define UNITY_SUPPORT_TEST_CASES to include the TEST_CASE macro, though really it's mostly about the runner generator script
-
- * Parameterized Tests
- *     - you'll want to create a define of TEST_CASE(...) which basically evaluates to nothing
-
- * Tests with Arguments
- *     - you'll want to define UNITY_USE_COMMAND_LINE_ARGS if you have the test runner passing arguments to Unity
-
- *-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define TEST_FAIL_MESSAGE(message)                                                                 UNITY_TEST_FAIL(__LINE__, (message))
-#define TEST_FAIL()                                                                                UNITY_TEST_FAIL(__LINE__, NULL)
-#define TEST_IGNORE_MESSAGE(message)                                                               UNITY_TEST_IGNORE(__LINE__, (message))
-#define TEST_IGNORE()                                                                              UNITY_TEST_IGNORE(__LINE__, NULL)
-#define TEST_ONLY()
-
-/* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails.
- * This method allows you to abort a test immediately with a PASS state, ignoring the remainder of the test. */
-#define TEST_PASS()                                                                                TEST_ABORT()
-
-/* This macro does nothing, but it is useful for build tools (like Ceedling) to make use of this to figure out
- * which files should be linked to in order to perform a test. Use it like TEST_FILE("sandwiches.c") */
-#define TEST_FILE(a)
-
-/*-------------------------------------------------------
- * Test Asserts (simple)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT(condition)                                                                     UNITY_TEST_ASSERT(       (condition), __LINE__, " Expression Evaluated To FALSE")
-#define TEST_ASSERT_TRUE(condition)                                                                UNITY_TEST_ASSERT(       (condition), __LINE__, " Expected TRUE Was FALSE")
-#define TEST_ASSERT_UNLESS(condition)                                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expression Evaluated To TRUE")
-#define TEST_ASSERT_FALSE(condition)                                                               UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expected FALSE Was TRUE")
-#define TEST_ASSERT_NULL(pointer)                                                                  UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, " Expected NULL")
-#define TEST_ASSERT_NOT_NULL(pointer)                                                              UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL")
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL(expected, actual)                                                        UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_NOT_EQUAL(expected, actual)                                                    UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, " Expected Not-Equal")
-#define TEST_ASSERT_EQUAL_UINT(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS(mask, expected, actual)                                                   UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_HIGH(mask, actual)                                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_LOW(mask, actual)                                                         UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_HIGH(bit, actual)                                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_LOW(bit, actual)                                                           UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN(threshold, actual)                                                UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_THAN(threshold, actual)                                                   UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT8(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT16(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT32(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT64(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_GREATER_OR_EQUAL(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual)                                        UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_OR_EQUAL(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT(threshold, actual)                                           UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT8_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT16_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT32_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT64_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len)                                        UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len)                                            UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, NULL)
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements)                        UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Arrays Compared To Single Value */
-#define TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements)                         UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_INF(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NEG_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NAN(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual)                                               UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_INF(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NAN(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual)                                              UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/*-------------------------------------------------------
- * Test Asserts (with additional messages)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT_MESSAGE(condition, message)                                                    UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_TRUE_MESSAGE(condition, message)                                               UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_UNLESS_MESSAGE(condition, message)                                             UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_FALSE_MESSAGE(condition, message)                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_NULL_MESSAGE(pointer, message)                                                 UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, (message))
-#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message)                                             UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, (message))
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message)                                       UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message)                                  UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message)                                       UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message)                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message)                                         UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message)                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN_MESSAGE(threshold, actual, message)                               UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_THAN_MESSAGE(threshold, actual, message)                                  UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT8_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT16_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT32_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT64_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_GREATER_OR_EQUAL_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_OR_EQUAL_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT8_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT16_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT32_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT64_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message)                       UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message)                           UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, (message))
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_PTR_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message)       UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Arrays Compared To Single Value*/
-#define TEST_ASSERT_EACH_EQUAL_INT_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT8_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT16_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT32_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT64_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_PTR_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_STRING_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_MEMORY_MESSAGE(expected, actual, len, num_elements, message)        UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_FLOAT_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_INF_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NEG_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NAN_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE_MESSAGE(actual, message)                              UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_INF_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NAN_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* end of UNITY_FRAMEWORK_H */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/external_libs/cJSON/cJSON/tests/unity/src/unity_internals.h b/external_libs/cJSON/cJSON/tests/unity/src/unity_internals.h
deleted file mode 100644
index f78cebac..00000000
--- a/external_libs/cJSON/cJSON/tests/unity/src/unity_internals.h
+++ /dev/null
@@ -1,870 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_INTERNALS_H
-#define UNITY_INTERNALS_H
-
-#include "../examples/unity_config.h"
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#include <setjmp.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_MATH_H
-#include <math.h>
-#endif
-
-/* Unity Attempts to Auto-Detect Integer Types
- * Attempt 1: UINT_MAX, ULONG_MAX in <limits.h>, or default to 32 bits
- * Attempt 2: UINTPTR_MAX in <stdint.h>, or default to same size as long
- * The user may override any of these derived constants:
- * UNITY_INT_WIDTH, UNITY_LONG_WIDTH, UNITY_POINTER_WIDTH */
-#ifndef UNITY_EXCLUDE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_LIMITS_H
-#include <limits.h>
-#endif
-
-/*-------------------------------------------------------
- * Guess Widths If Not Specified
- *-------------------------------------------------------*/
-
-/* Determine the size of an int, if not already specified.
- * We cannot use sizeof(int), because it is not yet defined
- * at this stage in the translation of the C program.
- * Therefore, infer it from UINT_MAX if possible. */
-#ifndef UNITY_INT_WIDTH
-  #ifdef UINT_MAX
-    #if (UINT_MAX == 0xFFFF)
-      #define UNITY_INT_WIDTH (16)
-    #elif (UINT_MAX == 0xFFFFFFFF)
-      #define UNITY_INT_WIDTH (32)
-    #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_INT_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_INT_WIDTH (32)
-  #endif /* UINT_MAX */
-#endif
-
-/* Determine the size of a long, if not already specified. */
-#ifndef UNITY_LONG_WIDTH
-  #ifdef ULONG_MAX
-    #if (ULONG_MAX == 0xFFFF)
-      #define UNITY_LONG_WIDTH (16)
-    #elif (ULONG_MAX == 0xFFFFFFFF)
-      #define UNITY_LONG_WIDTH (32)
-    #elif (ULONG_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_LONG_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_LONG_WIDTH (32)
-  #endif /* ULONG_MAX */
-#endif
-
-/* Determine the size of a pointer, if not already specified. */
-#ifndef UNITY_POINTER_WIDTH
-  #ifdef UINTPTR_MAX
-    #if (UINTPTR_MAX <= 0xFFFF)
-      #define UNITY_POINTER_WIDTH (16)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (32)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
-  #endif /* UINTPTR_MAX */
-#endif
-
-/*-------------------------------------------------------
- * Int Support (Define types based on detected sizes)
- *-------------------------------------------------------*/
-
-#if (UNITY_INT_WIDTH == 32)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned short  UNITY_UINT16;
-    typedef unsigned int    UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed short    UNITY_INT16;
-    typedef signed int      UNITY_INT32;
-#elif (UNITY_INT_WIDTH == 16)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned int    UNITY_UINT16;
-    typedef unsigned long   UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed int      UNITY_INT16;
-    typedef signed long     UNITY_INT32;
-#else
-    #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported)
-#endif
-
-/*-------------------------------------------------------
- * 64-bit Support
- *-------------------------------------------------------*/
-
-#ifndef UNITY_SUPPORT_64
-  #if UNITY_LONG_WIDTH == 64 || UNITY_POINTER_WIDTH == 64
-    #define UNITY_SUPPORT_64
-  #endif
-#endif
-
-#ifndef UNITY_SUPPORT_64
-    /* No 64-bit Support */
-    typedef UNITY_UINT32 UNITY_UINT;
-    typedef UNITY_INT32 UNITY_INT;
-#else
-
-    /* 64-bit Support */
-  #if (UNITY_LONG_WIDTH == 32)
-    typedef unsigned long long UNITY_UINT64;
-    typedef signed long long   UNITY_INT64;
-  #elif (UNITY_LONG_WIDTH == 64)
-    typedef unsigned long      UNITY_UINT64;
-    typedef signed long        UNITY_INT64;
-  #else
-    #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported)
-  #endif
-    typedef UNITY_UINT64 UNITY_UINT;
-    typedef UNITY_INT64 UNITY_INT;
-
-#endif
-
-/*-------------------------------------------------------
- * Pointer Support
- *-------------------------------------------------------*/
-
-#if (UNITY_POINTER_WIDTH == 32)
-#define UNITY_PTR_TO_INT UNITY_INT32
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32
-#elif (UNITY_POINTER_WIDTH == 64)
-#define UNITY_PTR_TO_INT UNITY_INT64
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64
-#elif (UNITY_POINTER_WIDTH == 16)
-#define UNITY_PTR_TO_INT UNITY_INT16
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16
-#else
-    #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported)
-#endif
-
-#ifndef UNITY_PTR_ATTRIBUTE
-#define UNITY_PTR_ATTRIBUTE
-#endif
-
-#ifndef UNITY_INTERNAL_PTR
-#define UNITY_INTERNAL_PTR UNITY_PTR_ATTRIBUTE const void*
-#endif
-
-/*-------------------------------------------------------
- * Float Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_FLOAT
-
-/* No Floating Point Support */
-#ifndef UNITY_EXCLUDE_DOUBLE
-#define UNITY_EXCLUDE_DOUBLE /* Remove double when excluding float support */
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-#define UNITY_EXCLUDE_FLOAT_PRINT
-#endif
-
-#else
-
-/* Floating Point Support */
-#ifndef UNITY_FLOAT_PRECISION
-#define UNITY_FLOAT_PRECISION (0.00001f)
-#endif
-#ifndef UNITY_FLOAT_TYPE
-#define UNITY_FLOAT_TYPE float
-#endif
-typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
-
-/* isinf & isnan macros should be provided by math.h */
-#ifndef isinf
-/* The value of Inf - Inf is NaN */
-#define isinf(n) (isnan((n) - (n)) && !isnan(n))
-#endif
-
-#ifndef isnan
-/* NaN is the only floating point value that does NOT equal itself.
- * Therefore if n != n, then it is NaN. */
-#define isnan(n) ((n != n) ? 1 : 0)
-#endif
-
-#endif
-
-/*-------------------------------------------------------
- * Double Float Support
- *-------------------------------------------------------*/
-
-/* unlike float, we DON'T include by default */
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(UNITY_INCLUDE_DOUBLE)
-
-  /* No Floating Point Support */
-  #ifndef UNITY_EXCLUDE_DOUBLE
-  #define UNITY_EXCLUDE_DOUBLE
-  #else
-    #undef UNITY_INCLUDE_DOUBLE
-  #endif
-
-  #ifndef UNITY_EXCLUDE_FLOAT
-    #ifndef UNITY_DOUBLE_TYPE
-    #define UNITY_DOUBLE_TYPE double
-    #endif
-  typedef UNITY_FLOAT UNITY_DOUBLE;
-  /* For parameter in UnityPrintFloat(UNITY_DOUBLE), which aliases to double or float */
-  #endif
-
-#else
-
-  /* Double Floating Point Support */
-  #ifndef UNITY_DOUBLE_PRECISION
-  #define UNITY_DOUBLE_PRECISION (1e-12)
-  #endif
-
-  #ifndef UNITY_DOUBLE_TYPE
-  #define UNITY_DOUBLE_TYPE double
-  #endif
-  typedef UNITY_DOUBLE_TYPE UNITY_DOUBLE;
-
-#endif
-
-/*-------------------------------------------------------
- * Output Method: stdout (DEFAULT)
- *-------------------------------------------------------*/
-#ifndef UNITY_OUTPUT_CHAR
-/* Default to using putchar, which is defined in stdio.h */
-#include <stdio.h>
-#define UNITY_OUTPUT_CHAR(a) (void)putchar(a)
-#else
-  /* If defined as something else, make sure we declare it here so it's ready for use */
-  #ifdef UNITY_OUTPUT_CHAR_HEADER_DECLARATION
-extern void UNITY_OUTPUT_CHAR_HEADER_DECLARATION;
-  #endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#ifdef UNITY_USE_FLUSH_STDOUT
-/* We want to use the stdout flush utility */
-#include <stdio.h>
-#define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
-#else
-/* We've specified nothing, therefore flush should just be ignored */
-#define UNITY_OUTPUT_FLUSH()
-#endif
-#else
-/* We've defined flush as something else, so make sure we declare it here so it's ready for use */
-#ifdef UNITY_OUTPUT_FLUSH_HEADER_DECLARATION
-extern void UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION;
-#endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#define UNITY_FLUSH_CALL()
-#else
-#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH()
-#endif
-
-#ifndef UNITY_PRINT_EOL
-#define UNITY_PRINT_EOL()    UNITY_OUTPUT_CHAR('\n')
-#endif
-
-#ifndef UNITY_OUTPUT_START
-#define UNITY_OUTPUT_START()
-#endif
-
-#ifndef UNITY_OUTPUT_COMPLETE
-#define UNITY_OUTPUT_COMPLETE()
-#endif
-
-/*-------------------------------------------------------
- * Footprint
- *-------------------------------------------------------*/
-
-#ifndef UNITY_LINE_TYPE
-#define UNITY_LINE_TYPE UNITY_UINT
-#endif
-
-#ifndef UNITY_COUNTER_TYPE
-#define UNITY_COUNTER_TYPE UNITY_UINT
-#endif
-
-/*-------------------------------------------------------
- * Language Features Available
- *-------------------------------------------------------*/
-#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
-#   if defined(__GNUC__) || defined(__ghs__) /* __GNUC__ includes clang */
-#       if !(defined(__WIN32__) && defined(__clang__)) && !defined(__TMS470__)
-#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
-#       endif
-#   endif
-#endif
-
-#ifdef UNITY_NO_WEAK
-#   undef UNITY_WEAK_ATTRIBUTE
-#   undef UNITY_WEAK_PRAGMA
-#endif
-
-
-/*-------------------------------------------------------
- * Internal Structs Needed
- *-------------------------------------------------------*/
-
-typedef void (*UnityTestFunction)(void);
-
-#define UNITY_DISPLAY_RANGE_INT  (0x10)
-#define UNITY_DISPLAY_RANGE_UINT (0x20)
-#define UNITY_DISPLAY_RANGE_HEX  (0x40)
-
-typedef enum
-{
-UNITY_DISPLAY_STYLE_INT = sizeof(int)+ UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT8     = 1 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT16    = 2 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT32    = 4 + UNITY_DISPLAY_RANGE_INT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_INT64    = 8 + UNITY_DISPLAY_RANGE_INT,
-#endif
-
-UNITY_DISPLAY_STYLE_UINT = sizeof(unsigned) + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT8    = 1 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT16   = 2 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT32   = 4 + UNITY_DISPLAY_RANGE_UINT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_UINT64   = 8 + UNITY_DISPLAY_RANGE_UINT,
-#endif
-
-    UNITY_DISPLAY_STYLE_HEX8     = 1 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX16    = 2 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX32    = 4 + UNITY_DISPLAY_RANGE_HEX,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_HEX64    = 8 + UNITY_DISPLAY_RANGE_HEX,
-#endif
-
-    UNITY_DISPLAY_STYLE_UNKNOWN
-} UNITY_DISPLAY_STYLE_T;
-
-typedef enum
-{
-    UNITY_EQUAL_TO         = 1,
-    UNITY_GREATER_THAN     = 2,
-    UNITY_GREATER_OR_EQUAL = 2 + UNITY_EQUAL_TO,
-    UNITY_SMALLER_THAN     = 4,
-    UNITY_SMALLER_OR_EQUAL = 4 + UNITY_EQUAL_TO
-} UNITY_COMPARISON_T;
-
-#ifndef UNITY_EXCLUDE_FLOAT
-typedef enum UNITY_FLOAT_TRAIT
-{
-    UNITY_FLOAT_IS_NOT_INF       = 0,
-    UNITY_FLOAT_IS_INF,
-    UNITY_FLOAT_IS_NOT_NEG_INF,
-    UNITY_FLOAT_IS_NEG_INF,
-    UNITY_FLOAT_IS_NOT_NAN,
-    UNITY_FLOAT_IS_NAN,
-    UNITY_FLOAT_IS_NOT_DET,
-    UNITY_FLOAT_IS_DET,
-    UNITY_FLOAT_INVALID_TRAIT
-} UNITY_FLOAT_TRAIT_T;
-#endif
-
-typedef enum
-{
-    UNITY_ARRAY_TO_VAL = 0,
-    UNITY_ARRAY_TO_ARRAY
-} UNITY_FLAGS_T;
-
-struct UNITY_STORAGE_T
-{
-    const char* TestFile;
-    const char* CurrentTestName;
-#ifndef UNITY_EXCLUDE_DETAILS
-    const char* CurrentDetail1;
-    const char* CurrentDetail2;
-#endif
-    UNITY_LINE_TYPE CurrentTestLineNumber;
-    UNITY_COUNTER_TYPE NumberOfTests;
-    UNITY_COUNTER_TYPE TestFailures;
-    UNITY_COUNTER_TYPE TestIgnores;
-    UNITY_COUNTER_TYPE CurrentTestFailed;
-    UNITY_COUNTER_TYPE CurrentTestIgnored;
-#ifndef UNITY_EXCLUDE_SETJMP_H
-    jmp_buf AbortFrame;
-#endif
-};
-
-extern struct UNITY_STORAGE_T Unity;
-
-/*-------------------------------------------------------
- * Test Suite Management
- *-------------------------------------------------------*/
-
-void UnityBegin(const char* filename);
-int  UnityEnd(void);
-void UnityConcludeTest(void);
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
-
-/*-------------------------------------------------------
- * Details Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_DETAILS
-#define UNITY_CLR_DETAILS()
-#define UNITY_SET_DETAIL(d1)
-#define UNITY_SET_DETAILS(d1,d2)
-#else
-#define UNITY_CLR_DETAILS()      { Unity.CurrentDetail1 = 0;   Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAIL(d1)     { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAILS(d1,d2) { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = d2; }
-
-#ifndef UNITY_DETAIL1_NAME
-#define UNITY_DETAIL1_NAME "Function"
-#endif
-
-#ifndef UNITY_DETAIL2_NAME
-#define UNITY_DETAIL2_NAME "Argument"
-#endif
-#endif
-
-/*-------------------------------------------------------
- * Test Output
- *-------------------------------------------------------*/
-
-void UnityPrint(const char* string);
-void UnityPrintLen(const char* string, const UNITY_UINT32 length);
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number);
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style);
-void UnityPrintNumber(const UNITY_INT number);
-void UnityPrintNumberUnsigned(const UNITY_UINT number);
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles);
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-void UnityPrintFloat(const UNITY_DOUBLE input_number);
-#endif
-
-/*-------------------------------------------------------
- * Test Assertion Functions
- *-------------------------------------------------------
- *  Use the macros below this section instead of calling
- *  these directly. The macros have a consistent naming
- *  convention and will pull in file and line information
- *  for you. */
-
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags);
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringLen(const char* expected,
-                            const char* actual,
-                            const UNITY_UINT32 length,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringArray( UNITY_INTERNAL_PTR expected,
-                                  const char** actual,
-                                  const UNITY_UINT32 num_elements,
-                                  const char* msg,
-                                  const UNITY_LINE_TYPE lineNumber,
-                                  const UNITY_FLAGS_T flags);
-
-void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected,
-                             UNITY_INTERNAL_PTR actual,
-                             const UNITY_UINT32 length,
-                             const UNITY_UINT32 num_elements,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLAGS_T flags);
-
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style);
-
-void UnityFail(const char* message, const UNITY_LINE_TYPE line);
-
-void UnityIgnore(const char* message, const UNITY_LINE_TYPE line);
-
-#ifndef UNITY_EXCLUDE_FLOAT
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags);
-
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags);
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-/*-------------------------------------------------------
- * Helpers
- *-------------------------------------------------------*/
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size);
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num);
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num);
-#endif
-
-/*-------------------------------------------------------
- * Error Strings We Might Need
- *-------------------------------------------------------*/
-
-extern const char UnityStrErrFloat[];
-extern const char UnityStrErrDouble[];
-extern const char UnityStrErr64[];
-
-/*-------------------------------------------------------
- * Test Running Macros
- *-------------------------------------------------------*/
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
-#define TEST_ABORT() longjmp(Unity.AbortFrame, 1)
-#else
-#define TEST_PROTECT() 1
-#define TEST_ABORT() return
-#endif
-
-/* This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__) */
-#ifndef RUN_TEST
-#ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L
-#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
-#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
-#define RUN_TEST_FIRST_HELPER(first, ...) (first), #first
-#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
-#define RUN_TEST_SECOND_HELPER(first, second, ...) (second)
-#endif
-#endif
-#endif
-
-/* If we can't do the tricky version, we'll just have to require them to always include the line number */
-#ifndef RUN_TEST
-#ifdef CMOCK
-#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
-#else
-#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
-#endif
-#endif
-
-#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
-#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
-#define UNITY_NEW_TEST(a) \
-    Unity.CurrentTestName = (a); \
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)(__LINE__); \
-    Unity.NumberOfTests++;
-
-#ifndef UNITY_BEGIN
-#define UNITY_BEGIN() UnityBegin(__FILE__)
-#endif
-
-#ifndef UNITY_END
-#define UNITY_END() UnityEnd()
-#endif
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-int UnityParseOptions(int argc, char** argv);
-int UnityTestMatches(void);
-#endif
-
-/*-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_FAIL(line, message)   UnityFail(   (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)(line))
-
-/*-------------------------------------------------------
- * Test Asserts
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_ASSERT(condition, line, message)                                              if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));}
-#define UNITY_TEST_ASSERT_NULL(pointer, line, message)                                           UNITY_TEST_ASSERT(((pointer) == NULL),  (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)(line), (message))
-
-#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line))
-
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER)
-#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message)                          UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len, line, message)                 UnityAssertEqualStringLen((const char*)(expected), (const char*)(actual), (UNITY_UINT32)(len), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message)                     UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), 1, (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(int)),  (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(unsigned int)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT8 )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT16)expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT32)expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_PTR_TO_INT)       expected, sizeof(int*)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements, line, message)       UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements, line, message)  UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-
-#ifdef UNITY_SUPPORT_64
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#else
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#endif
-
-#ifdef UNITY_EXCLUDE_FLOAT
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#else
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UnityAssertFloatsWithin((UNITY_FLOAT)(delta), (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_ASSERT_FLOAT_WITHIN((UNITY_FLOAT)(expected) * (UNITY_FLOAT)UNITY_FLOAT_PRECISION, (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualFloatArray((UNITY_FLOAT*)(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UnityAssertEqualFloatArray(UnityFloatToPtr(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-#ifdef UNITY_EXCLUDE_DOUBLE
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#else
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UnityAssertDoublesWithin((UNITY_DOUBLE)(delta), (UNITY_DOUBLE)(expected), (UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)line)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_ASSERT_DOUBLE_WITHIN((UNITY_DOUBLE)(expected) * (UNITY_DOUBLE)UNITY_DOUBLE_PRECISION, (UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual, (UNITY_LINE_TYPE)(line), message)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualDoubleArray((UNITY_DOUBLE*)(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UnityAssertEqualDoubleArray(UnityDoubleToPtr(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-/* End of UNITY_INTERNALS_H */
-#endif
diff --git a/external_libs/cJSON/cJSON/valgrind.supp b/external_libs/cJSON/cJSON/valgrind.supp
deleted file mode 100644
index 79b55c67..00000000
--- a/external_libs/cJSON/cJSON/valgrind.supp
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	suppress_ld_on_armv7
-	Memcheck:Cond
-	...
-	obj:*/ld-*.so
-}
diff --git a/external_libs/cJSON/component.mk b/external_libs/cJSON/component.mk
deleted file mode 100644
index e93e1d05..00000000
--- a/external_libs/cJSON/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INC_DIRS += $(cJSON_ROOT)/cJSON
-
-cJSON_INC_DIR = $(cJSON_ROOT)/cJSON
-cJSON_SRC_DIR = $(cJSON_ROOT)/cJSON
-
-$(eval $(call component_compile_rules,cJSON))
-
diff --git a/libs/adv_logger_ntp/adv_logger_ntp.h b/libs/adv_logger_ntp/adv_logger_ntp.h
deleted file mode 100644
index 3479638d..00000000
--- a/libs/adv_logger_ntp/adv_logger_ntp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Advanced ESP Logger with NTP support
- *
- * Copyright 2020-2022 José Antonio Jiménez Campos (@RavenSystem)
- *
- */
-
-#ifndef __ADV_LOGGER_H__
-#define __ADV_LOGGER_H__
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Use    nc -kulnw0 45678    to collect UDP network output
-
-#define ADV_LOGGER_NONE                 (0)
-#define ADV_LOGGER_UART0                (1)
-#define ADV_LOGGER_UART1                (2)
-#define ADV_LOGGER_UDP                  (3)
-#define ADV_LOGGER_UART0_UDP            (4)
-#define ADV_LOGGER_UART1_UDP            (5)
-#define ADV_LOGGER_UDP_BUFFERED         (6)
-#define ADV_LOGGER_UART0_UDP_BUFFERED   (7)
-#define ADV_LOGGER_UART1_UDP_BUFFERED   (8)
-
-
-void adv_logger_init(const uint8_t log_type, char* dest_addr, const bool with_header);
-
-#ifdef ADV_LOGGER_REMOVE
-int adv_logger_remove();
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // __ADV_LOGGER_H__
diff --git a/libs/adv_pwm/times.txt b/libs/adv_pwm/times.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/libs/homekit-rsf/Kconfig b/libs/homekit-rsf/Kconfig
deleted file mode 100644
index 54a54cc9..00000000
--- a/libs/homekit-rsf/Kconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-menu "HomeKit"
-
-config HOMEKIT_SPI_FLASH_BASE_ADDR
-    string "SPI flash address for storing HomeKit data"
-    default 0x200000
-    help
-        SPI flash address to store HomeKit related persisted data
-
-config HOMEKIT_MAX_CLIENTS
-    int "Maximum number of simultaneous clients"
-    default 16
-    help
-        Maximum number of simultaneous clients allowed. New connections above this
-        limit will be rejected. Each connection requires ~1100-1200 bytes of RAM
-
-config HOMEKIT_SMALL
-    bool "Minimize firmware size"
-    default n
-    help
-        Configures components to use smaller (but slower) implementations. Helps
-        decrease firmware size ~70KB at cost of increasing pair verify time
-
-config HOMEKIT_DEBUG
-    bool "Debug output"
-    default n
-    help
-        Enable debug output to serial console
-
-endmenu
diff --git a/libs/homekit-rsf/Makefile.projbuild b/libs/homekit-rsf/Makefile.projbuild
deleted file mode 100644
index e6df73a8..00000000
--- a/libs/homekit-rsf/Makefile.projbuild
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_WOLFSSL_CFLAGS = \
-	-DWOLFCRYPT_HAVE_SRP \
-	-DWOLFSSL_SHA512 \
-	-DWOLFSSL_BASE64_ENCODE \
-	-DNO_MD5 \
-	-DNO_SHA \
-	-DHAVE_HKDF \
-	-DHAVE_CHACHA \
-	-DHAVE_POLY1305 \
-	-DHAVE_ED25519 \
-	-DHAVE_CURVE25519 \
-	-DNO_SESSION_CACHE \
-	-DRSA_LOW_MEM \
-	-DGCM_SMALL \
-	-DUSE_SLOW_SHA512 \
-	-DWOLFCRYPT_ONLY
-
-ifeq ($(CONFIG_HOMEKIT_SMALL),y)
-EXTRA_WOLFSSL_CFLAGS += \
-	-DCURVE25519_SMALL \
-	-DED25519_SMALL
-endif
-
-CFLAGS += \
-	-Wno-error=unused-value \
-	-DSPIFLASH_BASE_ADDR=$(CONFIG_HOMEKIT_SPI_FLASH_BASE_ADDR) \
-	-DHOMEKIT_MAX_CLIENTS=$(CONFIG_HOMEKIT_MAX_CLIENTS) \
-	$(EXTRA_WOLFSSL_CFLAGS)
-
-ifeq ($(CONFIG_HOMEKIT_DEBUG),y)
-CFLAGS += -DHOMEKIT_DEBUG
-endif
-
-ifeq ($(CONFIG_HOMEKIT_DEBUG_MDNS),y)
-CFLAGS += -DHOMEKIT_DEBUG_MDNS
-endif
diff --git a/libs/homekit-rsf/include/homekit/homekit.h b/libs/homekit-rsf/include/homekit/homekit.h
index ea764098..061a38b6 100644
--- a/libs/homekit-rsf/include/homekit/homekit.h
+++ b/libs/homekit-rsf/include/homekit/homekit.h
@@ -71,6 +71,9 @@ int homekit_get_accessory_id(char *buffer, size_t size);
 bool homekit_is_pairing();
 bool homekit_is_paired();
 
+int32_t homekit_get_unique_client_ipaddr();
+int homekit_get_client_count();
+
 // Client related stuff
 //homekit_client_id_t homekit_get_client_id();
 
diff --git a/libs/homekit-rsf/src/server.c b/libs/homekit-rsf/src/server.c
index 7a9456b1..266648b6 100644
--- a/libs/homekit-rsf/src/server.c
+++ b/libs/homekit-rsf/src/server.c
@@ -213,6 +213,26 @@ struct _client_context_t {
     struct _client_context_t *next;
 };
 
+int32_t homekit_get_unique_client_ipaddr() {
+    if (homekit_server && homekit_server->client_count == 1) {
+        struct sockaddr_in addr;
+        socklen_t addr_len = sizeof(addr);
+        if (getpeername(homekit_server->clients->socket, (struct sockaddr*) &addr, &addr_len) == 0) {
+            return ((((const uint8_t*) &addr.sin_addr.s_addr)[2]) * 1000) + ((const uint8_t*) &addr.sin_addr.s_addr)[3];
+        }
+    }
+    
+    return -1;
+}
+
+int homekit_get_client_count() {
+    if (homekit_server) {
+        return homekit_server->client_count;
+    }
+    
+    return -1;
+}
+
 void client_context_free(client_context_t *c);
 void pairing_context_free(pairing_context_t *context);
 void homekit_server_on_reset(client_context_t *context);
@@ -1072,7 +1092,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
 
     tlv_values_t *message = tlv_new();
     if (tlv_parse(data, size, message)) {
-        CLIENT_ERROR(context, "Parse TLV payload");
+        CLIENT_ERROR(context, "TLV payload");
         tlv_free(message);
         send_tlv_error_response(context, 2, TLVError_Unknown);
         homekit_server->is_pairing = false;
@@ -1168,7 +1188,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
             DEBUG_HEAP();
             tlv_t *device_public_key = tlv_get_value(message, TLVType_PublicKey);
             if (!device_public_key) {
-                CLIENT_ERROR(context, "No public key");
+                CLIENT_ERROR(context, "No pub key");
                 send_tlv_error_response(context, 4, TLVError_Authentication);
                 break;
             }
@@ -1324,7 +1344,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
 
             tlv_t *tlv_device_public_key = tlv_get_value(decrypted_message, TLVType_PublicKey);
             if (!tlv_device_public_key) {
-                CLIENT_ERROR(context, "No public key");
+                CLIENT_ERROR(context, "No pub key");
 
                 tlv_free(decrypted_message);
 
@@ -1349,7 +1369,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
                 tlv_device_public_key->value, tlv_device_public_key->size
             );
             if (r) {
-                CLIENT_ERROR(context, "Import public Key (%d)", r);
+                CLIENT_ERROR(context, "Import pub key (%d)", r);
 
                 crypto_ed25519_free(device_key);
                 tlv_free(decrypted_message);
@@ -1371,7 +1391,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
                 device_x, &device_x_size
             );
             if (r) {
-                CLIENT_ERROR(context, "Generate DeviceX (%d)", r);
+                CLIENT_ERROR(context, "Generate DevX (%d)", r);
 
                 crypto_ed25519_free(device_key);
                 tlv_free(decrypted_message);
@@ -1402,7 +1422,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
             free(device_info);
             
             if (r) {
-                CLIENT_ERROR(context, "Generate DeviceX (%d)", r);
+                CLIENT_ERROR(context, "Generate DevX (%d)", r);
                 
                 crypto_ed25519_free(device_key);
                 tlv_free(decrypted_message);
@@ -1438,7 +1458,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
             byte *accessory_public_key = malloc(accessory_public_key_size);
             r = crypto_ed25519_export_public_key(homekit_server->accessory_key, accessory_public_key, &accessory_public_key_size);
             if (r) {
-                CLIENT_ERROR(context, "Export public key (%d)", r);
+                CLIENT_ERROR(context, "Export pub key (%d)", r);
 
                 free(accessory_public_key);
 
@@ -1461,7 +1481,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
                 accessory_info, &accessory_x_size
             );
             if (r) {
-                CLIENT_ERROR(context, "Generate AccessoryX (%d)", r);
+                CLIENT_ERROR(context, "Generate AccX (%d)", r);
 
                 free(accessory_info);
                 free(accessory_public_key);
@@ -1494,7 +1514,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
             free(accessory_info);
             
             if (r) {
-                CLIENT_ERROR(context, "Generate accessory sign (%d)", r);
+                CLIENT_ERROR(context, "Generate acc sign (%d)", r);
                 
                 free(accessory_signature);
                 free(accessory_public_key);
@@ -1551,7 +1571,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
             free(response_data);
 
             if (r) {
-                CLIENT_ERROR(context, "Encrypt response data (%d)", r);
+                CLIENT_ERROR(context, "Encrypt response (%d)", r);
 
                 free(encrypted_response_data);
 
@@ -1581,7 +1601,7 @@ void homekit_server_on_pair_setup(client_context_t *context, const byte *data, s
         }
         
         default: {
-            CLIENT_ERROR(context, "Unknown state: %d", tlv_get_integer_value(message, TLVType_State, -1));
+            CLIENT_ERROR(context, "State %d", tlv_get_integer_value(message, TLVType_State, -1));
             homekit_disconnect_client(context);
             break;
         }
@@ -1603,7 +1623,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
     
     tlv_values_t *message = tlv_new();
     if (tlv_parse(data, size, message)) {
-        CLIENT_ERROR(context, "Parse TLV payload");
+        CLIENT_ERROR(context, "TLV payload");
         tlv_free(message);
         send_tlv_error_response(context, 2, TLVError_Unknown);
         return;
@@ -1625,7 +1645,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
             CLIENT_DEBUG(context, "Importing device Curve25519 public key");
             tlv_t *tlv_device_public_key = tlv_get_value(message, TLVType_PublicKey);
             if (!tlv_device_public_key) {
-                CLIENT_ERROR(context, "Curve25519 public key not found");
+                CLIENT_ERROR(context, "Curve25519 pub key not found");
                 send_tlv_error_response(context, 2, TLVError_Unknown);
                 break;
             }
@@ -1635,7 +1655,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
                 tlv_device_public_key->value, tlv_device_public_key->size
             );
             if (r) {
-                CLIENT_ERROR(context, "Import Curve25519 public key (%d)", r);
+                CLIENT_ERROR(context, "Import Curve25519 pub key (%d)", r);
                 crypto_curve25519_free(device_key);
                 send_tlv_error_response(context, 2, TLVError_Unknown);
                 break;
@@ -1657,7 +1677,7 @@ void homekit_server_on_pair_verify(client_context_t *context, const byte *data,
             byte *my_key_public = malloc(my_key_public_size);
             r = crypto_curve25519_export_public(my_key, my_key_public, &my_key_public_size);
             if (r) {
-                CLIENT_ERROR(context, "Export Curve25519 public key (%d)", r);
+                CLIENT_ERROR(context, "Export Curve25519 pub key (%d)", r);
                 free(my_key_public);
                 crypto_curve25519_free(my_key);
                 crypto_curve25519_free(device_key);
@@ -2773,7 +2793,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
 
     tlv_values_t *message = tlv_new();
     if (tlv_parse(data, size, message)) {
-        CLIENT_ERROR(context, "Parse TLV payload");
+        CLIENT_ERROR(context, "TLV payload");
         tlv_free(message);
         send_tlv_error_response(context, 2, TLVError_Unknown);
         return;
@@ -2794,7 +2814,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
             CLIENT_INFO(context, "Pairing");
 
             if (!(context->permissions & pairing_permissions_admin)) {
-                CLIENT_ERROR(context, "Non-admin controller");
+                CLIENT_ERROR(context, "Non-admin");
                 send_tlv_error_response(context, 2, TLVError_Authentication);
                 break;
             }
@@ -2807,13 +2827,13 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
             }
             tlv_t *tlv_device_public_key = tlv_get_value(message, TLVType_PublicKey);
             if (!tlv_device_public_key) {
-                CLIENT_ERROR(context, "No public key");
+                CLIENT_ERROR(context, "No pub key");
                 send_tlv_error_response(context, 2, TLVError_Unknown);
                 break;
             }
             int device_permissions = tlv_get_integer_value(message, TLVType_Permissions, -1);
             if (device_permissions == -1) {
-                CLIENT_ERROR(context, "No permissions");
+                CLIENT_ERROR(context, "No perm");
                 send_tlv_error_response(context, 2, TLVError_Unknown);
                 break;
             }
@@ -2823,7 +2843,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
                 device_key, tlv_device_public_key->value, tlv_device_public_key->size
             );
             if (r) {
-                CLIENT_ERROR(context, "Import public key");
+                CLIENT_ERROR(context, "Import pub key (%d)", r);
                 crypto_ed25519_free(device_key);
                 send_tlv_error_response(context, 2, TLVError_Unknown);
                 break;
@@ -2842,7 +2862,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
                 byte *pairing_public_key = malloc(pairing_public_key_size);
                 r = crypto_ed25519_export_public_key(pairing->device_key, pairing_public_key, &pairing_public_key_size);
                 if (r) {
-                    CLIENT_ERROR(context, "Exporting public key (%d)", r);
+                    CLIENT_ERROR(context, "Export pub key (%d)", r);
                     free(pairing_public_key);
                     pairing_free(pairing);
                     free(device_identifier);
@@ -2854,7 +2874,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
 
                 if (pairing_public_key_size != tlv_device_public_key->size ||
                         memcmp(tlv_device_public_key->value, pairing_public_key, pairing_public_key_size)) {
-                    CLIENT_ERROR(context, "Public key differs from given");
+                    CLIENT_ERROR(context, "Pub key != given");
                     free(pairing_public_key);
                     free(device_identifier);
                     crypto_ed25519_free(device_key);
@@ -2871,8 +2891,8 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
                     send_tlv_error_response(context, 2, TLVError_Unknown);
                     break;
                 }
-
-                HOMEKIT_INFO("Updated pairing with %s", device_identifier);
+                
+                HOMEKIT_INFO("Updated pairing %s", device_identifier);
             } else {
                 if (!homekit_storage_can_add_pairing()) {
                     CLIENT_ERROR(context, "Max peers");
@@ -2912,7 +2932,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
             CLIENT_INFO(context, "Removing Pairing");
 
             if (!(context->permissions & pairing_permissions_admin)) {
-                CLIENT_ERROR(context, "Non-admin controller");
+                CLIENT_ERROR(context, "Non-admin");
                 send_tlv_error_response(context, 2, TLVError_Authentication);
                 break;
             }
@@ -2937,7 +2957,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
 
                 r = homekit_storage_remove_pairing(device_identifier);
                 if (r) {
-                    CLIENT_ERROR(context, "Storage error (%d)", r);
+                    CLIENT_ERROR(context, "Storage (%d)", r);
                     free(device_identifier);
                     send_tlv_error_response(context, 2, TLVError_Unknown);
                     break;
@@ -2992,7 +3012,7 @@ void homekit_server_on_pairings(client_context_t *context, const byte *data, siz
             CLIENT_INFO(context, "List");
 
             if (!(context->permissions & pairing_permissions_admin)) {
-                CLIENT_INFO(context, "Non-admin controller");
+                CLIENT_INFO(context, "Non-admin");
                 send_tlv_error_response(context, 2, TLVError_Authentication);
                 break;
             }
@@ -3118,7 +3138,7 @@ int homekit_server_on_url(http_parser *parser, const char *data, size_t length)
 
     if (context->endpoint == HOMEKIT_ENDPOINT_UNKNOWN) {
         char *url = strndup(data, length);
-        HOMEKIT_ERROR("Unknown: %s %s", http_method_str(parser->method), url);
+        HOMEKIT_ERROR("? %s %s", http_method_str(parser->method), url);
         free(url);
     }
 
@@ -3270,7 +3290,7 @@ static inline void IRAM homekit_client_process(client_context_t *context) {
         
     } else {    // if (data_len < 0)
         if (errno != EAGAIN) {
-            CLIENT_ERROR(context, "Socket (%d). Closing", errno);
+            CLIENT_ERROR(context, "Socket (%d)", errno);
             homekit_disconnect_client(context);
         }
     }
@@ -3314,7 +3334,7 @@ static inline void IRAM homekit_server_accept_client() {
     if (getpeername(s, (struct sockaddr *)&addr, &addr_len) == 0) {
         inet_ntop(AF_INET, &addr.sin_addr, address_buffer, sizeof(address_buffer));
     } else {
-        HOMEKIT_ERROR("[%d] New ?:%d. Closing", s, addr.sin_port);
+        HOMEKIT_ERROR("[%d] New ?:%d", s, addr.sin_port);
         close(s);
         return;
     }
@@ -3353,14 +3373,14 @@ static inline void IRAM homekit_server_accept_client() {
             homekit_server->max_fd = s;
         }
         
-        HOMEKIT_INFO("[%i] New %s:%d %i/%i Free HEAP %"HK_LONGINT_F, s, address_buffer, addr.sin_port, homekit_server->client_count, homekit_server->config->max_clients, free_heap);
+        HOMEKIT_INFO("[%i] New %s:%d %i/%i HEAP %"HK_LONGINT_F, s, address_buffer, addr.sin_port, homekit_server->client_count, homekit_server->config->max_clients, free_heap);
         
         HOMEKIT_NOTIFY_EVENT(homekit_server, HOMEKIT_EVENT_CLIENT_CONNECTED);
         
     } else {
         close(s);
         
-        HOMEKIT_ERROR("[%i] DRAM %s:%d %i/%i Free HEAP %"HK_LONGINT_F, s, address_buffer, addr.sin_port, homekit_server->client_count, homekit_server->config->max_clients, free_heap);
+        HOMEKIT_ERROR("[%i] DRAM %s:%d %i/%i HEAP %"HK_LONGINT_F, s, address_buffer, addr.sin_port, homekit_server->client_count, homekit_server->config->max_clients, free_heap);
     }
 }
 
@@ -3671,6 +3691,7 @@ char *homekit_accessory_id_generate() {
     return accessory_id;
 }
 
+/*
 ed25519_key *homekit_accessory_key_generate() {
     ed25519_key *key = crypto_ed25519_generate();
     if (!key) {
@@ -3682,6 +3703,7 @@ ed25519_key *homekit_accessory_key_generate() {
 
     return key;
 }
+*/
 
 void homekit_server_task(void *args) {
     vTaskDelay(500 / portTICK_PERIOD_MS);
@@ -3721,8 +3743,9 @@ void homekit_server_init(homekit_server_config_t *config) {
     if (!homekit_server->accessory_id || !homekit_server->accessory_key) {
         homekit_server->accessory_id = homekit_accessory_id_generate();
         homekit_storage_save_accessory_id(homekit_server->accessory_id);
-
-        homekit_server->accessory_key = homekit_accessory_key_generate();
+        
+        //homekit_server->accessory_key = homekit_accessory_key_generate();
+        homekit_server->accessory_key = crypto_ed25519_generate();
         homekit_storage_save_accessory_key(homekit_server->accessory_key);
     } else {
         HOMEKIT_INFO("HK ID: %s", homekit_server->accessory_id);
diff --git a/libs/homekit-rsf/src/storage.c b/libs/homekit-rsf/src/storage.c
index 013f43c2..be2348ae 100644
--- a/libs/homekit-rsf/src/storage.c
+++ b/libs/homekit-rsf/src/storage.c
@@ -285,7 +285,7 @@ int homekit_storage_add_pairing(const char *device_id, const ed25519_key *device
         device_key, data.device_public_key, &device_public_key_size
     );
     if (r) {
-        ERROR("Export dev public key (%d)", r);
+        ERROR("Export dev pub key (%d)", r);
         return -1;
     }
     
@@ -311,7 +311,7 @@ int homekit_storage_update_pairing(const char *device_id, byte permissions) {
                 ed25519_key *device_key = crypto_ed25519_new();
                 r = crypto_ed25519_import_public_key(device_key, data.device_public_key, sizeof(data.device_public_key));
                 if (r) {
-                    ERROR("Import dev public key (%d)", r);
+                    ERROR("Import dev pub key (%d)", r);
                     crypto_ed25519_free(device_key);
                     return -2;
                 }
@@ -329,7 +329,7 @@ int homekit_storage_update_pairing(const char *device_id, byte permissions) {
                         return -2;
                     }
                 } else {
-                    INFO("Device Public Key not needing updated");
+                    INFO("Dev pub key not updated");
                 }
                 
                 return 0;
@@ -417,7 +417,7 @@ pairing_t *homekit_storage_find_pairing(const char *device_id) {
                 ed25519_key *device_key = crypto_ed25519_new();
                 int r = crypto_ed25519_import_public_key(device_key, data.device_public_key, sizeof(data.device_public_key));
                 if (r) {
-                    ERROR("Import dev public key (%d)", r);
+                    ERROR("Import dev pub key (%d)", r);
                     return NULL;
                 }
                 
@@ -463,7 +463,7 @@ pairing_t *homekit_storage_next_pairing(pairing_iterator_t *it) {
                 ed25519_key *device_key = crypto_ed25519_new();
                 int r = crypto_ed25519_import_public_key(device_key, data.device_public_key, sizeof(data.device_public_key));
                 if (r) {
-                    ERROR("Import dev public key (%d)", r);
+                    ERROR("Import dev pub key (%d)", r);
                     crypto_ed25519_free(device_key);
                     it->idx++;
                     continue;
diff --git a/libs/ping/component.mk b/libs/ping/component.mk
deleted file mode 100644
index 956299bf..00000000
--- a/libs/ping/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Component makefile for ping
-
-INC_DIRS += $(ping_ROOT)
-
-ping_INC_DIR = $(ping_ROOT)
-ping_SRC_DIR = $(ping_ROOT)
-
-$(eval $(call component_compile_rules,ping))
diff --git a/libs/ping/ping.c b/libs/ping/ping.c
deleted file mode 100644
index d88d1529..00000000
--- a/libs/ping/ping.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Binary Ping
- *
- * Copyright 2020 José Antonio Jiménez Campos (@RavenSystem)
- *
- */
-
-/*
- * Based on ping helper example by @maxgerhardt.
- * https://github.com/maxgerhardt/esp-open-rtos-ping-example
- */
-
-#include <string.h>
-#include "lwip/opt.h"
-#include "lwip/mem.h"
-#include "lwip/raw.h"
-#include "lwip/icmp.h"
-#include "lwip/netif.h"
-#include "lwip/sys.h"
-#include "lwip/timeouts.h"
-#include "lwip/inet_chksum.h"
-#include "lwip/prot/ip4.h"
-#include "lwip/sockets.h"
-#include "lwip/inet.h"
-#include "lwip/dns.h"
-#include "lwip/netdb.h"
-#include "ping.h"
-
-/** ping receive timeout - in milliseconds */
-#ifndef PING_RCV_TIMEO
-#define PING_RCV_TIMEO 350
-#endif
-
-/** ping identifier - must fit on a u16_t */
-#ifndef PING_ID
-#define PING_ID        0xFAA0
-#endif
-
-/** ping additional data size to include in the packet */
-#ifndef PING_DATA_SIZE
-#define PING_DATA_SIZE 2
-#endif
-
-/* ping variables */
-static u16_t ping_seq_num;
-
-/** Prepare a echo ICMP request */
-static void ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len) {
-    size_t i;
-    size_t data_len = len - sizeof(struct icmp_echo_hdr);
-
-    ICMPH_TYPE_SET(iecho, ICMP_ECHO);
-    ICMPH_CODE_SET(iecho, 0);
-    iecho->chksum = 0;
-    iecho->id = PING_ID;
-    iecho->seqno = lwip_htons(++ping_seq_num);
-
-    /* fill the additional data buffer with some data */
-    for (i = 0; i < data_len; i++) {
-        ((char*) iecho)[sizeof(struct icmp_echo_hdr) + i] = (char) i;
-    }
-
-    iecho->chksum = inet_chksum(iecho, len);
-}
-
-/* Ping using the socket ip */
-static err_t ping_send(int s, const ip_addr_t *addr) {
-    int err;
-    struct icmp_echo_hdr *iecho;
-    struct sockaddr_storage to;
-    size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
-    LWIP_ASSERT("ping_size is too big", ping_size <= 0xffff);
-#if LWIP_IPV6
-	if(IP_IS_V6(addr) && !ip6_addr_isipv4mappedipv6(ip_2_ip6(addr))) {
-		/* todo: support ICMP6 echo */
-		return ERR_VAL;
-	}
-#endif /* LWIP_IPV6 */
-
-    iecho = (struct icmp_echo_hdr*) mem_malloc((mem_size_t) ping_size);
-    if (!iecho) {
-        return ERR_MEM;
-    }
-
-    ping_prepare_echo(iecho, (u16_t) ping_size);
-
-#if LWIP_IPV4
-    if (IP_IS_V4(addr)) {
-        struct sockaddr_in *to4 = (struct sockaddr_in*) &to;
-        to4->sin_len = sizeof(*to4);
-        to4->sin_family = AF_INET;
-        inet_addr_from_ip4addr(&to4->sin_addr, ip_2_ip4(addr));
-    }
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-	if (IP_IS_V6(addr)) {
-		struct sockaddr_in6 *to6 = (struct sockaddr_in6*) &to;
-		to6->sin6_len = sizeof(*to6);
-		to6->sin6_family = AF_INET6;
-		inet6_addr_from_ip6addr(&to6->sin6_addr, ip_2_ip6(addr));
-	}
-#endif /* LWIP_IPV6 */
-
-    err = lwip_sendto(s, iecho, ping_size, 0, (struct sockaddr*) &to, sizeof(to));
-
-    mem_free(iecho);
-
-    return (err ? ERR_OK : ERR_VAL);
-}
-
-static int ping_recv(int s) {
-    char buf[64];
-    int len;
-    struct sockaddr_storage from;
-    int fromlen = sizeof(from);
-
-    while ((len = lwip_recvfrom(s, buf, sizeof(buf), 0,
-            (struct sockaddr*) &from, (socklen_t*) &fromlen)) > 0) {
-        if (len >= (int) (sizeof(struct ip_hdr) + sizeof(struct icmp_echo_hdr))) {
-            ip_addr_t fromaddr;
-            memset(&fromaddr, 0, sizeof(fromaddr));
-
-#if LWIP_IPV4
-            if (from.ss_family == AF_INET) {
-                struct sockaddr_in *from4 = (struct sockaddr_in*) &from;
-                inet_addr_to_ip4addr(ip_2_ip4(&fromaddr), &from4->sin_addr);IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V4);
-            }
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-			if(from.ss_family == AF_INET6) {
-				struct sockaddr_in6 *from6 = (struct sockaddr_in6*)&from;
-				inet6_addr_to_ip6addr(ip_2_ip6(&fromaddr), &from6->sin6_addr);
-				IP_SET_TYPE_VAL(fromaddr, IPADDR_TYPE_V6);
-			}
-#endif /* LWIP_IPV6 */
-
-#if LWIP_IPV4
-            if (IP_IS_V4_VAL(fromaddr)) {
-                struct ip_hdr *iphdr;
-                struct icmp_echo_hdr *iecho;
-
-                iphdr = (struct ip_hdr*) buf;
-                iecho = (struct icmp_echo_hdr*) (buf + (IPH_HL(iphdr) * 4));
-                if (iecho->id == PING_ID &&
-                    iecho->seqno == lwip_htons(ping_seq_num) &&
-                    ICMPH_TYPE(iecho) == ICMP_ER) {
-                    return 1;
-                }
-            }
-#endif /* LWIP_IPV4 */
-        }
-        fromlen = sizeof(from);
-    }
-
-    return 0;
-}
-
-int ping(ip_addr_t ping_target) {
-    int s;
-    int result = -1;
-
-#if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
-	int timeout = PING_RCV_TIMEO;
-#else
-    const struct timeval timeout = { PING_RCV_TIMEO / 1000, (PING_RCV_TIMEO % 1000) * 1000 };
-#endif
-
-#if LWIP_IPV6
-	if(IP_IS_V4(ping_target) || ip6_addr_isipv4mappedipv6(ip_2_ip6(ping_target))) {
-		s = lwip_socket(AF_INET6, SOCK_RAW, IP_PROTO_ICMP);
-	} else {
-		s = lwip_socket(AF_INET6, SOCK_RAW, IP6_NEXTH_ICMP6);
-	}
-#else
-    fflush(stdout);
-    s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP);
-
-    fflush(stdout);
-
-#endif
-    if (s < 0) {
-        printf("ping error creating socket (%i)\n", s);
-        return s;
-    }
-    
-    const struct timeval sndtimeout = { 3, 0 };
-    lwip_setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &sndtimeout, sizeof(sndtimeout));
-    lwip_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
-    
-    if (ping_send(s, &ping_target) == ERR_OK) {
-        result = ping_recv(s);
-    }
-    lwip_close(s);
-    
-    return result;
-}
diff --git a/libs/ping/ping.h b/libs/ping/ping.h
deleted file mode 100644
index b7747dda..00000000
--- a/libs/ping/ping.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Binary Ping
- *
- * Copyright 2020 José Antonio Jiménez Campos (@RavenSystem)
- *
- */
-
-
-#ifndef __BINARY_PING__
-#define __BINARY_PING__
-
-#include "lwip/ip_addr.h"
-
-int ping(ip_addr_t ping_addr);
-
-#endif // __BINARY_PING__
diff --git a/sdk/esp-open-rtos-rsf/core/include/esp/File b/sdk/esp-open-rtos-rsf/core/include/esp/File
deleted file mode 100644
index e69de29b..00000000
diff --git a/sdk/esp-open-rtos-rsf/open_esplibs/include/esplibs/libmain.h b/sdk/esp-open-rtos-rsf/open_esplibs/include/esplibs/libmain.h
index 038c587f..d5ccd165 100644
--- a/sdk/esp-open-rtos-rsf/open_esplibs/include/esplibs/libmain.h
+++ b/sdk/esp-open-rtos-rsf/open_esplibs/include/esplibs/libmain.h
@@ -36,8 +36,8 @@ sdk_SpiFlashOpResult sdk_SPIWrite(uint32_t des_addr, uint32_t *src_addr, uint32_
 
 // timers.o
 void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg);
-void sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag);
-void sdk_os_timer_disarm(ETSTimer *ptimer);
+void IRAM sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag);
+void IRAM sdk_os_timer_disarm(ETSTimer *ptimer);
 
 // uart.o
 void sdk_uart_div_modify(uint32_t uart_no, uint32_t new_divisor);
diff --git a/sdk/esp-open-rtos-rsf/open_esplibs/libmain/timers.c b/sdk/esp-open-rtos-rsf/open_esplibs/libmain/timers.c
index 2ae54c60..7a342e80 100644
--- a/sdk/esp-open-rtos-rsf/open_esplibs/libmain/timers.c
+++ b/sdk/esp-open-rtos-rsf/open_esplibs/libmain/timers.c
@@ -18,7 +18,18 @@ struct timer_list_st {
 static struct timer_list_st *timer_list;
 //static uint8_t armed_timer_count;
 
+static void ptimer_delete(ETSTimer* ptimer) {
+    //printf("- DELETE %p\n", ptimer);
+    
+    if (ptimer->timer_handle && xTimerDelete(ptimer->timer_handle, 50) == pdPASS) {
+        ptimer->timer_handle = NULL;
+        ptimer->timer_ms = 0;
+    }
+}
+
 void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg) {
+    //printf("* SETFN %p\n", ptimer);
+    
     struct timer_list_st *entry = 0;
     struct timer_list_st *new_entry;
     struct timer_list_st **tailptr;
@@ -29,19 +40,21 @@ void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg) {
                 if (ptimer->timer_arg == parg && ptimer->timer_func == pfunction) {
                     return;
                 }
+                
+                /*
                 if (ptimer->timer_handle) {
-                    /*
                     if (!xTimerDelete(ptimer->timer_handle, 50)) {
                         printf("! Timer Delete\n");
                     }
-                    */
-                    xTimerDelete(ptimer->timer_handle, 0);
+                    
                     //armed_timer_count--;
                 }
+                */
+                
+                ptimer_delete(ptimer);
                 ptimer->timer_func = pfunction;
                 ptimer->timer_arg = parg;
-                ptimer->timer_handle = 0;
-                ptimer->timer_ms = 0;
+                
                 return;
             }
             if (!entry->next) {
@@ -51,7 +64,7 @@ void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg) {
     }
     ptimer->timer_func = pfunction;
     ptimer->timer_arg = parg;
-    ptimer->timer_handle = 0;
+    ptimer->timer_handle = NULL;
     ptimer->timer_ms = 0;
     new_entry = (struct timer_list_st *)pvPortMalloc(8);
     new_entry->timer = ptimer;
@@ -63,52 +76,88 @@ void sdk_os_timer_setfn(ETSTimer *ptimer, ETSTimerFunc *pfunction, void *parg) {
     *tailptr = new_entry;
 }
 
-static void timer_tramp(TimerHandle_t xTimer)
-{
+static void IRAM timer_tramp(TimerHandle_t xTimer) {
     ETSTimer *ptimer = pvTimerGetTimerID(xTimer);
+    
+    //printf("+ TRAMP %p\n", ptimer);
+    
     ptimer->timer_func(ptimer->timer_arg);
+    
+    if (!ptimer->timer_repeat && xTimerDelete(ptimer->timer_handle, 0) == pdPASS) {
+        ptimer->timer_handle = NULL;
+        ptimer->timer_ms = 0;
+        //printf("- TRAMP DELETE %p, t: %i\n", ptimer, ptimer->timer_ms);
+    }
 }
 
-void sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag) {
+void IRAM sdk_os_timer_arm(ETSTimer *ptimer, uint32_t milliseconds, bool repeat_flag) {
+    //printf("+ ARM %p, t: %i, r: %i\n", ptimer, milliseconds, repeat_flag);
+    
+    /*
     if (!ptimer->timer_handle) {
         ptimer->timer_repeat = repeat_flag;
         ptimer->timer_ms = milliseconds;
         ptimer->timer_handle = xTimerCreate(0, milliseconds / 10, repeat_flag, ptimer, timer_tramp);
         //armed_timer_count++;
+        
         if (!ptimer->timer_handle) {
             //FIXME: should print an error? (original code doesn't)
             return;
         }
+        
+    } else {
+        if (ptimer->timer_repeat != repeat_flag) {
+            ptimer->timer_repeat = repeat_flag;
+            
+            // FIXME: This is wrong.  The original code is directly modifying
+            // internal FreeRTOS structures to try to change the uxAutoReload of an
+            // existing timer.  The correct way to do this is probably to use
+            // xTimerDelete and then xTimerCreate to recreate the timer with a
+            // different uxAutoReload setting.
+            //((uint32_t *)ptimer->timer_handle)[7] = repeat_flag;
+            vTimerSetReloadMode(ptimer->timer_handle, repeat_flag);
+        }
+        
+        if (ptimer->timer_ms != milliseconds) {
+            ptimer->timer_ms = milliseconds;
+            xTimerChangePeriod(ptimer->timer_handle, milliseconds / 10, 10);
+        }
     }
-    if (ptimer->timer_repeat != repeat_flag) {
-        ptimer->timer_repeat = repeat_flag;
-        // FIXME: This is wrong.  The original code is directly modifying
-        // internal FreeRTOS structures to try to change the uxAutoReload of an
-        // existing timer.  The correct way to do this is probably to use
-        // xTimerDelete and then xTimerCreate to recreate the timer with a
-        // different uxAutoReload setting.
-        ((uint32_t *)ptimer->timer_handle)[7] = repeat_flag;
-    }
-    if (ptimer->timer_ms != milliseconds) {
-        ptimer->timer_ms = milliseconds;
-        xTimerChangePeriod(ptimer->timer_handle, milliseconds / 10, 0); // Was 10
-    }
-    /*
-    if (!xTimerStart(ptimer->timer_handle, 50)) {
+    
+    if (!xTimerStart(ptimer->timer_handle, 0)) {
         printf("! Timer Start\n");
     }
     */
-    xTimerStart(ptimer->timer_handle, 0);
+    
+    if (ptimer->timer_repeat != repeat_flag ||
+        ptimer->timer_ms != milliseconds) {
+        ptimer_delete(ptimer);
+    }
+    
+    if (!ptimer->timer_handle) {
+        //printf("+ NEW %p\n", ptimer);
+        
+        ptimer->timer_repeat = repeat_flag;
+        ptimer->timer_ms = milliseconds;
+        ptimer->timer_handle = xTimerCreate(NULL, milliseconds / 10, repeat_flag, ptimer, timer_tramp);
+    }
+    
+    xTimerStart(ptimer->timer_handle, 50);
 }
 
-void sdk_os_timer_disarm(ETSTimer *ptimer) {
+void IRAM sdk_os_timer_disarm(ETSTimer* ptimer) {
+    //printf("- DISARM %p\n", ptimer);
+    
+    /*
     if (ptimer->timer_handle) {
-        /*
         if (!xTimerStop(ptimer->timer_handle, 50)) {
             printf("! Timer Stop\n");
         }
-        */
-        xTimerStop(ptimer->timer_handle, 0);
+    }
+    */
+    
+    if (ptimer->timer_handle) {
+        xTimerStop(ptimer->timer_handle, 50);
     }
 }
 
diff --git a/sdk/esp-open-rtos-rsf/open_esplibs/libwpa/wpa_main.c b/sdk/esp-open-rtos-rsf/open_esplibs/libwpa/wpa_main.c
index ec6f3410..8ca4de4a 100644
--- a/sdk/esp-open-rtos-rsf/open_esplibs/libwpa/wpa_main.c
+++ b/sdk/esp-open-rtos-rsf/open_esplibs/libwpa/wpa_main.c
@@ -61,17 +61,12 @@ void sdk_dhcp_bind_check(void *parg) {
     struct sdk_g_ic_netif_info *netif_info = sdk_g_ic.v.station_netif_info;
     uint8_t connect_status = netif_info->connect_status;
     uint8_t unknown20a = sdk_g_ic.s._unknown20a;
-
+    
     if (connect_status != STATION_GOT_IP) {
         if (unknown20a == 7 || unknown20a == 8) {
             netif_info->connect_status = STATION_CONNECTING;
         }
     }
-    
-    ETSTimer *timer = &netif_info->timer;
-    if (xTimerDelete(timer->timer_handle, 0)) {
-        timer->timer_handle = NULL;
-    }
 }
 
 void sdk_eagle_auth_done() {
@@ -109,11 +104,13 @@ void sdk_eagle_auth_done() {
         return;
     }
 
+    /*
     if (ip4_addr_isany_val(sdk_info.sta_ipaddr)) {
-        printf("Expected a static IP address?\n");
+        printf("! Expected a static IP address?\n");
         return;
     }
-
+    */
+    
     LOCK_TCPIP_CORE();
     netif_set_addr(netif, &sdk_info.sta_ipaddr, &sdk_info.sta_netmask, &sdk_info.sta_gw);
     netif_set_up(netif);