From 4c13cfd4e8849ce641d11edc633894237d15dcbf Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Thu, 21 Jan 2021 23:12:44 +0100
Subject: [PATCH] New literals and removed wifi related stuff

---
 esputils.h  | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 wifiutils.h | 63 -----------------------------------------------------
 2 files changed, 56 insertions(+), 63 deletions(-)
 delete mode 100644 wifiutils.h

diff --git a/esputils.h b/esputils.h
index c200033..93ecac6 100644
--- a/esputils.h
+++ b/esputils.h
@@ -95,6 +95,62 @@ private:
     std::vector<Slot> m_slots;
 };
 
+namespace literals {
+namespace {
+/**
+ * User-defined Literals
+ *  usage:
+ *
+ *   uint32_t = test = 10_MHz; // --> 10000000
+ */
+
+constexpr unsigned long long operator"" _kHz(unsigned long long x)
+{
+    return x * 1000;
+}
+
+constexpr unsigned long long operator"" _MHz(unsigned long long x)
+{
+    return x * 1000 * 1000;
+}
+
+constexpr unsigned long long operator"" _GHz(unsigned long long x)
+{
+    return x * 1000 * 1000 * 1000;
+}
+
+constexpr unsigned long long operator"" _kBit(unsigned long long x)
+{
+    return x * 1024;
+}
+
+constexpr unsigned long long operator"" _MBit(unsigned long long x)
+{
+    return x * 1024 * 1024;
+}
+
+constexpr unsigned long long operator"" _GBit(unsigned long long x)
+{
+    return x * 1024 * 1024 * 1024;
+}
+
+constexpr unsigned long long operator"" _kB(unsigned long long x)
+{
+    return x * 1024;
+}
+
+constexpr unsigned long long operator"" _MB(unsigned long long x)
+{
+    return x * 1024 * 1024;
+}
+
+constexpr unsigned long long operator"" _GB(unsigned long long x)
+{
+    return x * 1024 * 1024 * 1024;
+}
+} // namespace
+} // namespace literals
+
 namespace {
 template<typename T>
 T vmin(T&&t)
diff --git a/wifiutils.h b/wifiutils.h
deleted file mode 100644
index 708c5e3..0000000
--- a/wifiutils.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-// Arduino includes
-#include <WiFi.h>
-#include <WiFiType.h>
-
-namespace espcpputils {
-namespace {
-template<typename T>
-T scanResultToString(int16_t result)
-{
-    if (result < 0)
-    {
-        switch (result)
-        {
-        case WIFI_SCAN_RUNNING: return "WIFI_SCAN_RUNNING";
-        case WIFI_SCAN_FAILED:  return "WIFI_SCAN_FAILED";
-        }
-
-        return T{"Failed ("} + result + ')';
-    }
-
-    return T{"Finished ("} + result + ')';
-}
-
-template<typename T>
-T toString(wifi_auth_mode_t encryptionType)
-{
-    switch (encryptionType)
-    {
-    case WIFI_AUTH_OPEN:            return "WIFI_AUTH_OPEN";
-    case WIFI_AUTH_WEP:             return "WIFI_AUTH_WEP";
-    case WIFI_AUTH_WPA_PSK:         return "WIFI_AUTH_WPA_PSK";
-    case WIFI_AUTH_WPA2_PSK:        return "WIFI_AUTH_WPA2_PSK";
-    case WIFI_AUTH_WPA_WPA2_PSK:    return "WIFI_AUTH_WPA_WPA2_PSK";
-    case WIFI_AUTH_WPA2_ENTERPRISE: return "WIFI_AUTH_WPA2_ENTERPRISE";
-    case WIFI_AUTH_WPA3_PSK:        return "WIFI_AUTH_WPA3_PSK";
-    case WIFI_AUTH_WPA2_WPA3_PSK:   return "WIFI_AUTH_WPA2_WPA3_PSK";
-    case WIFI_AUTH_MAX:             return "WIFI_AUTH_MAX";
-    }
-
-    return T{"Unknown wifi_auth_mode_t("} + encryptionType + ')';
-}
-
-template<typename T>
-T toString(wl_status_t status)
-{
-    switch (status)
-    {
-    case WL_NO_SHIELD:       return "WL_NO_SHIELD";
-    case WL_IDLE_STATUS:     return "WL_IDLE_STATUS";
-    case WL_NO_SSID_AVAIL:   return "WL_NO_SSID_AVAIL";
-    case WL_SCAN_COMPLETED:  return "WL_SCAN_COMPLETED";
-    case WL_CONNECTED:       return "WL_CONNECTED";
-    case WL_CONNECT_FAILED:  return "WL_CONNECT_FAILED";
-    case WL_CONNECTION_LOST: return "WL_CONNECTION_LOST";
-    case WL_DISCONNECTED:    return "WL_DISCONNECTED";
-    }
-
-    return T{"Unknown wl_status_t("} + int(status) + ')';
-}
-} // namespace
-} // namespace espcpputils