CPU usage depending on boards

main/boards/common/board.h

@@ -30,8 +30,8 @@ public:
         return *instance;
     }
 
-    virtual void StartNetwork() = 0;
     virtual ~Board() = default;
+    virtual std::string GetBoardType() = 0;
     virtual Led* GetLed();
     virtual AudioCodec* GetAudioCodec() = 0;
     virtual Display* GetDisplay();
@@ -39,7 +39,7 @@ public:
     virtual WebSocket* CreateWebSocket() = 0;
     virtual Mqtt* CreateMqtt() = 0;
     virtual Udp* CreateUdp() = 0;
-    virtual bool GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) = 0;
+    virtual void StartNetwork() = 0;
     virtual const char* GetNetworkStateIcon() = 0;
     virtual bool GetBatteryLevel(int &level, bool& charging);
     virtual std::string GetJson();

main/boards/common/ml307_board.cc

@@ -11,28 +11,15 @@
 #include <web_socket.h>
 #include <ml307_mqtt.h>
 #include <ml307_udp.h>
+#include <opus_encoder.h>
 
 static const char *TAG = "Ml307Board";
 
-static std::string csq_to_string(int csq) {
-    if (csq == -1) {
-        return "No network";
-    } else if (csq >= 0 && csq <= 9) {
-        return "Very bad";
-    } else if (csq >= 10 && csq <= 14) {
-        return "Bad";
-    } else if (csq >= 15 && csq <= 19) {
-        return "Fair";
-    } else if (csq >= 20 && csq <= 24) {
-        return "Good";
-    } else if (csq >= 25 && csq <= 31) {
-        return "Very good";
-    }
-    return "Invalid";
+Ml307Board::Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, size_t rx_buffer_size) : modem_(tx_pin, rx_pin, rx_buffer_size) {
 }
 
-
-Ml307Board::Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, size_t rx_buffer_size) : modem_(tx_pin, rx_pin, rx_buffer_size) {
+std::string Ml307Board::GetBoardType() {
+    return "ml307";
 }
 
 void Ml307Board::StartNetwork() {
@@ -95,16 +82,6 @@ Udp* Ml307Board::CreateUdp() {
     return new Ml307Udp(modem_, 0);
 }
 
-bool Ml307Board::GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) {
-    if (!modem_.network_ready()) {
-        return false;
-    }
-    network_name = modem_.GetCarrierName();
-    signal_quality = modem_.GetCsq();
-    signal_quality_text = csq_to_string(signal_quality);
-    return signal_quality != -1;
-}
-
 const char* Ml307Board::GetNetworkStateIcon() {
     if (!modem_.network_ready()) {
         return FONT_AWESOME_SIGNAL_OFF;

main/boards/common/ml307_board.h

@@ -13,12 +13,12 @@ protected:
 
 public:
     Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, size_t rx_buffer_size = 4096);
+    virtual std::string GetBoardType() override;
     virtual void StartNetwork() override;
     virtual Http* CreateHttp() override;
     virtual WebSocket* CreateWebSocket() override;
     virtual Mqtt* CreateMqtt() override;
     virtual Udp* CreateUdp() override;
-    virtual bool GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) override;
     virtual const char* GetNetworkStateIcon() override;
     virtual void SetPowerSaveMode(bool enabled) override;
 };

main/boards/common/wifi_board.cc

@@ -22,20 +22,6 @@
 
 static const char *TAG = "WifiBoard";
 
-static std::string rssi_to_string(int rssi) {
-    if (rssi >= -55) {
-        return "Very good";
-    } else if (rssi >= -65) {
-        return "Good";
-    } else if (rssi >= -75) {
-        return "Fair";
-    } else if (rssi >= -85) {
-        return "Poor";
-    } else {
-        return "No network";
-    }
-}
-
 WifiBoard::WifiBoard() {
     Settings settings("wifi", true);
     wifi_config_mode_ = settings.GetInt("force_ap") == 1;
@@ -45,6 +31,10 @@ WifiBoard::WifiBoard() {
     }
 }
 
+std::string WifiBoard::GetBoardType() {
+    return "wifi";
+}
+
 void WifiBoard::EnterWifiConfigMode() {
     auto& application = Application::GetInstance();
     auto display = Board::GetInstance().GetDisplay();
@@ -138,24 +128,6 @@ Udp* WifiBoard::CreateUdp() {
     return new EspUdp();
 }
 
-bool WifiBoard::GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) {
-    if (wifi_config_mode_) {
-        auto& wifi_ap = WifiConfigurationAp::GetInstance();
-        network_name = wifi_ap.GetSsid();
-        signal_quality = -99;
-        signal_quality_text = wifi_ap.GetWebServerUrl();
-        return true;
-    }
-    auto& wifi_station = WifiStation::GetInstance();
-    if (!wifi_station.IsConnected()) {
-        return false;
-    }
-    network_name = wifi_station.GetSsid();
-    signal_quality = wifi_station.GetRssi();
-    signal_quality_text = rssi_to_string(signal_quality);
-    return signal_quality != -1;
-}
-
 const char* WifiBoard::GetNetworkStateIcon() {
     if (wifi_config_mode_) {
         return FONT_AWESOME_WIFI;

main/boards/common/wifi_board.h

@@ -12,12 +12,12 @@ protected:
     virtual std::string GetBoardJson() override;
 
 public:
+    virtual std::string GetBoardType() override;
     virtual void StartNetwork() override;
     virtual Http* CreateHttp() override;
     virtual WebSocket* CreateWebSocket() override;
     virtual Mqtt* CreateMqtt() override;
     virtual Udp* CreateUdp() override;
-    virtual bool GetNetworkState(std::string& network_name, int& signal_quality, std::string& signal_quality_text) override;
     virtual const char* GetNetworkStateIcon() override;
     virtual void SetPowerSaveMode(bool enabled) override;
     virtual void ResetWifiConfiguration();