From e55fb286c3e5d32f56136e512981b2cfb52eda4e Mon Sep 17 00:00:00 2001 From: Vector Von Date: Sat, 2 Jul 2022 13:04:34 +0800 Subject: [PATCH] rename some important vars --- include/{display.h => DisplayPanel.h} | 0 include/{func_button.h => FuncButton.h} | 0 include/{monitor_items.h => MonitorItems.h} | 0 .../{client_network.h => OnlineConnector.h} | 4 +- include/{status_blink.h => StatusLed.h} | 4 +- include/{client_usb.h => UsbConnector.h} | 4 +- include/{user_data.h => UserData.h} | 0 .../{config_manager.h => WifiConfigManager.h} | 4 +- src/{display.cpp => DisplayPanel.cpp} | 2 +- src/{func_button.cpp => FuncButton.cpp} | 12 ++-- ...client_network.cpp => OnlineConnector.cpp} | 22 +++---- src/{status_blink.cpp => StatusLed.cpp} | 6 +- src/{client_usb.cpp => UsbConnector.cpp} | 4 +- src/{user_data.cpp => UserData.cpp} | 2 +- ...nfig_manager.cpp => WifiConfigManager.cpp} | 30 +++++----- src/main.cpp | 60 +++++++++---------- 16 files changed, 77 insertions(+), 77 deletions(-) rename include/{display.h => DisplayPanel.h} (100%) rename include/{func_button.h => FuncButton.h} (100%) rename include/{monitor_items.h => MonitorItems.h} (100%) rename include/{client_network.h => OnlineConnector.h} (88%) rename include/{status_blink.h => StatusLed.h} (87%) rename include/{client_usb.h => UsbConnector.h} (89%) rename include/{user_data.h => UserData.h} (100%) rename include/{config_manager.h => WifiConfigManager.h} (82%) rename src/{display.cpp => DisplayPanel.cpp} (99%) rename src/{func_button.cpp => FuncButton.cpp} (81%) rename src/{client_network.cpp => OnlineConnector.cpp} (68%) rename src/{status_blink.cpp => StatusLed.cpp} (88%) rename src/{client_usb.cpp => UsbConnector.cpp} (91%) rename src/{user_data.cpp => UserData.cpp} (98%) rename src/{config_manager.cpp => WifiConfigManager.cpp} (65%) diff --git a/include/display.h b/include/DisplayPanel.h similarity index 100% rename from include/display.h rename to include/DisplayPanel.h diff --git a/include/func_button.h b/include/FuncButton.h similarity index 100% rename from include/func_button.h rename to include/FuncButton.h diff --git a/include/monitor_items.h b/include/MonitorItems.h similarity index 100% rename from include/monitor_items.h rename to include/MonitorItems.h diff --git a/include/client_network.h b/include/OnlineConnector.h similarity index 88% rename from include/client_network.h rename to include/OnlineConnector.h index 7b3a1ac..487518b 100644 --- a/include/client_network.h +++ b/include/OnlineConnector.h @@ -4,7 +4,7 @@ #include #include -class ClientNetwork +class OnlineConnector { private: String url; @@ -13,7 +13,7 @@ private: STATUS status; public: - ClientNetwork(); + OnlineConnector(); STATUS FetchNewData(); uint8_t GetPercent(String name); uint32_t GetRate(String name); diff --git a/include/status_blink.h b/include/StatusLed.h similarity index 87% rename from include/status_blink.h rename to include/StatusLed.h index 75b77ef..632f3e9 100644 --- a/include/status_blink.h +++ b/include/StatusLed.h @@ -3,7 +3,7 @@ #define STATUS_LED_PIN 2 -class StatusBlink +class StatusLed { private: Ticker flipper; @@ -16,6 +16,6 @@ public: Rate0_5Hz, RateAlwaysOff, }; - StatusBlink(); + StatusLed(); void SetBlinkRate(BlinkRate rate); }; \ No newline at end of file diff --git a/include/client_usb.h b/include/UsbConnector.h similarity index 89% rename from include/client_usb.h rename to include/UsbConnector.h index 8853064..d77ce9c 100644 --- a/include/client_usb.h +++ b/include/UsbConnector.h @@ -13,10 +13,10 @@ struct UsbData uint32_t netReceiveRate; }; -class ClientUsb +class UsbConnector { public: - ClientUsb(); + UsbConnector(); UsbData data; private: diff --git a/include/user_data.h b/include/UserData.h similarity index 100% rename from include/user_data.h rename to include/UserData.h diff --git a/include/config_manager.h b/include/WifiConfigManager.h similarity index 82% rename from include/config_manager.h rename to include/WifiConfigManager.h index 446f3c0..a02cf82 100644 --- a/include/config_manager.h +++ b/include/WifiConfigManager.h @@ -2,7 +2,7 @@ #include #include -class ConfigManager +class WifiConfigManager { private: IPAddress localIp; @@ -10,6 +10,6 @@ private: IPAddress subnet; public: ESP8266WebServer httpServer; - ConfigManager(); + WifiConfigManager(); void ProcessConfig(); }; diff --git a/src/display.cpp b/src/DisplayPanel.cpp similarity index 99% rename from src/display.cpp rename to src/DisplayPanel.cpp index 6fbfb02..a785b39 100644 --- a/src/display.cpp +++ b/src/DisplayPanel.cpp @@ -1,4 +1,4 @@ -#include "display.h" +#include "DisplayPanel.h" #define STROBE_TM1 13 #define STROBE_TM2 12 // strobe = GPIO connected to strobe line of module diff --git a/src/func_button.cpp b/src/FuncButton.cpp similarity index 81% rename from src/func_button.cpp rename to src/FuncButton.cpp index ecd00f0..d628197 100644 --- a/src/func_button.cpp +++ b/src/FuncButton.cpp @@ -1,12 +1,12 @@ -#include "func_button.h" -#include "user_data.h" -#include "status_blink.h" +#include "FuncButton.h" +#include "UserData.h" +#include "StatusLed.h" #define FUNC_BTN 0 #define PRESSED_STATUS LOW extern UserData* userdataManager; -extern StatusBlink* statusLed; +extern StatusLed* statusLed; static int pressedTime; @@ -23,7 +23,7 @@ static void Scan() if (count >= 10) { // Factory reset userdataManager->EraseAllData(); - statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); + statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn); delay(1000); ESP.restart(); return; @@ -45,7 +45,7 @@ static void Scan() default: break; } - statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); + statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn); delay(200); ESP.restart(); return; diff --git a/src/client_network.cpp b/src/OnlineConnector.cpp similarity index 68% rename from src/client_network.cpp rename to src/OnlineConnector.cpp index d969993..a405df9 100644 --- a/src/client_network.cpp +++ b/src/OnlineConnector.cpp @@ -1,29 +1,29 @@ -#include "client_network.h" -#include "status_blink.h" -#include "user_data.h" -#include "func_button.h" +#include "OnlineConnector.h" +#include "StatusLed.h" +#include "UserData.h" +#include "FuncButton.h" #include "factory_info.h" -extern StatusBlink* statusLed; +extern StatusLed* statusLed; extern UserData* userdataManager; extern FuncButton* funcButton; -ClientNetwork::ClientNetwork() +OnlineConnector::OnlineConnector() { WiFi.begin(userdataManager->GetWifiSsid(), userdataManager->GetWifiPasswd()); - statusLed->SetBlinkRate(StatusBlink::BlinkRate::Rate2Hz); + statusLed->SetBlinkRate(StatusLed::BlinkRate::Rate2Hz); while (WiFi.status() != WL_CONNECTED) { delay(1000); } - statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOff); + statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOff); url = "http://iot.vvzero.com/topuino/getdata?SN="; url += DEVICE_SN; status = FAIL; } -STATUS ClientNetwork::FetchNewData() +STATUS OnlineConnector::FetchNewData() { status = FAIL; if (WiFi.status() == WL_CONNECTED) { @@ -42,12 +42,12 @@ STATUS ClientNetwork::FetchNewData() return status; } -uint8_t ClientNetwork::GetPercent(String name) +uint8_t OnlineConnector::GetPercent(String name) { return status == OK ? receivedData[name] : 0; } -uint32_t ClientNetwork::GetRate(String name) +uint32_t OnlineConnector::GetRate(String name) { return status == OK ? receivedData[name] : 0; } diff --git a/src/status_blink.cpp b/src/StatusLed.cpp similarity index 88% rename from src/status_blink.cpp rename to src/StatusLed.cpp index 1141bf0..4101f4a 100644 --- a/src/status_blink.cpp +++ b/src/StatusLed.cpp @@ -1,6 +1,6 @@ -#include "status_blink.h" +#include "StatusLed.h" -StatusBlink::StatusBlink() +StatusLed::StatusLed() { pinMode(STATUS_LED_PIN, OUTPUT); digitalWrite(STATUS_LED_PIN, HIGH); @@ -11,7 +11,7 @@ static void BlinkTask() digitalWrite(STATUS_LED_PIN, !digitalRead(STATUS_LED_PIN)); // set pin to the opposite state } -void StatusBlink::SetBlinkRate(BlinkRate rate) +void StatusLed::SetBlinkRate(BlinkRate rate) { switch (rate) { diff --git a/src/client_usb.cpp b/src/UsbConnector.cpp similarity index 91% rename from src/client_usb.cpp rename to src/UsbConnector.cpp index 0128408..e09d1fc 100644 --- a/src/client_usb.cpp +++ b/src/UsbConnector.cpp @@ -1,4 +1,4 @@ -#include "client_usb.h" +#include "UsbConnector.h" static byte* dataBuff; @@ -14,7 +14,7 @@ static void Receive() } } -ClientUsb::ClientUsb() +UsbConnector::UsbConnector() { memset(&data, 0, sizeof(UsbData)); Serial.setTimeout(100); diff --git a/src/user_data.cpp b/src/UserData.cpp similarity index 98% rename from src/user_data.cpp rename to src/UserData.cpp index f812bd6..63c36f7 100644 --- a/src/user_data.cpp +++ b/src/UserData.cpp @@ -1,4 +1,4 @@ -#include "user_data.h" +#include "UserData.h" #include #define MAX_USER_DATA_SIZE 0x200 diff --git a/src/config_manager.cpp b/src/WifiConfigManager.cpp similarity index 65% rename from src/config_manager.cpp rename to src/WifiConfigManager.cpp index b595d3f..6b560df 100644 --- a/src/config_manager.cpp +++ b/src/WifiConfigManager.cpp @@ -1,12 +1,12 @@ -#include "config_manager.h" -#include "status_blink.h" -#include "user_data.h" +#include "WifiConfigManager.h" +#include "StatusLed.h" +#include "UserData.h" #define SSID "Topuino" #define WIFI_PASSWORD "vvzero.com" -extern StatusBlink* statusLed; -extern ConfigManager* configManager; +extern StatusLed* statusLed; +extern WifiConfigManager* wifiConfigManager; extern UserData* userdataManager; static String configPage("\ @@ -41,31 +41,31 @@ static String configPage("\ static void handleOnConnect() { - configManager->httpServer.send(200, "text/html", configPage); + wifiConfigManager->httpServer.send(200, "text/html", configPage); } static void handleOnCommit() { - if (configManager->httpServer.hasArg("ssid") && configManager->httpServer.hasArg("psw")) { - userdataManager->SetWifiSsid(configManager->httpServer.arg("ssid")); - userdataManager->SetWifiPasswd(configManager->httpServer.arg("psw")); + if (wifiConfigManager->httpServer.hasArg("ssid") && wifiConfigManager->httpServer.hasArg("psw")) { + userdataManager->SetWifiSsid(wifiConfigManager->httpServer.arg("ssid")); + userdataManager->SetWifiPasswd(wifiConfigManager->httpServer.arg("psw")); userdataManager->ConfirmWifiData(); - configManager->httpServer.send(200, "text/html", "OK"); - statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); + wifiConfigManager->httpServer.send(200, "text/html", "OK"); + statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn); delay(200); ESP.restart(); } else { - configManager->httpServer.send(200, "text/html", "ERROR"); + wifiConfigManager->httpServer.send(200, "text/html", "ERROR"); } } -ConfigManager::ConfigManager() : +WifiConfigManager::WifiConfigManager() : localIp(192,168,1,1), gateway(192,168,1,1), subnet(255,255,255,0), httpServer(80) { - statusLed->SetBlinkRate(StatusBlink::BlinkRate::Rate0_5Hz); + statusLed->SetBlinkRate(StatusLed::BlinkRate::Rate0_5Hz); WiFi.softAPConfig(localIp, gateway, subnet); WiFi.softAP(SSID, WIFI_PASSWORD); delay(100); @@ -76,7 +76,7 @@ httpServer(80) httpServer.begin(); } -void ConfigManager::ProcessConfig() +void WifiConfigManager::ProcessConfig() { while (1) { httpServer.handleClient(); diff --git a/src/main.cpp b/src/main.cpp index 47869fa..ce22512 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,36 +1,36 @@ #include -#include "display.h" -#include "client_network.h" -#include "client_usb.h" -#include "monitor_items.h" -#include "status_blink.h" -#include "config_manager.h" -#include "user_data.h" -#include "func_button.h" +#include "DisplayPanel.h" +#include "OnlineConnector.h" +#include "UsbConnector.h" +#include "MonitorItems.h" +#include "StatusLed.h" +#include "WifiConfigManager.h" +#include "UserData.h" +#include "FuncButton.h" DisplayPanel* displayPanel; -ClientNetwork* netClient; -ClientUsb* usbClient; +OnlineConnector* onlineConnector; +UsbConnector* usbConnector; -StatusBlink* statusLed; +StatusLed* statusLed; UserData* userdataManager; -ConfigManager* configManager; +WifiConfigManager* wifiConfigManager; FuncButton* funcButton; RunMode runMode; void RunMode_Usb_Setup() { - usbClient = new ClientUsb(); + usbConnector = new UsbConnector(); } void RunMode_Online_Setup() { if (!userdataManager->WifiInfoValid()) { - configManager = new ConfigManager(); - configManager->ProcessConfig(); + wifiConfigManager = new WifiConfigManager(); + wifiConfigManager->ProcessConfig(); } else { - netClient = new ClientNetwork(); + onlineConnector = new OnlineConnector(); } } @@ -42,7 +42,7 @@ void setup() { Serial.begin(115200); - statusLed = new StatusBlink(); + statusLed = new StatusLed(); userdataManager = new UserData(); displayPanel = new DisplayPanel(); funcButton = new FuncButton(); @@ -73,23 +73,23 @@ void setup() void RunMode_Usb_Loop() { - displayPanel->DisplayCpuPercent(usbClient->data.cpuPercent); - displayPanel->DisplayMemPercent(usbClient->data.memPercent); - displayPanel->DisplayDisk0Percent(usbClient->data.disk0Percent); - displayPanel->DisplayDisk1Percent(usbClient->data.disk1Percent); - displayPanel->DisplayDiskRate(usbClient->data.diskReadRate, usbClient->data.diskWriteRate); - displayPanel->DisplayNetRate(usbClient->data.netSentRate, usbClient->data.netReceiveRate); + displayPanel->DisplayCpuPercent(usbConnector->data.cpuPercent); + displayPanel->DisplayMemPercent(usbConnector->data.memPercent); + displayPanel->DisplayDisk0Percent(usbConnector->data.disk0Percent); + displayPanel->DisplayDisk1Percent(usbConnector->data.disk1Percent); + displayPanel->DisplayDiskRate(usbConnector->data.diskReadRate, usbConnector->data.diskWriteRate); + displayPanel->DisplayNetRate(usbConnector->data.netSentRate, usbConnector->data.netReceiveRate); } void RunMode_Online_Loop() { - if (netClient->FetchNewData() == OK) { - displayPanel->DisplayCpuPercent(netClient->GetPercent(CPU_PERCENT)); - displayPanel->DisplayMemPercent(netClient->GetPercent(MEM_PERCENT)); - displayPanel->DisplayDisk0Percent(netClient->GetPercent(DISK0_PERCENT)); - displayPanel->DisplayDisk1Percent(netClient->GetPercent(DISK1_PERCENT)); - displayPanel->DisplayDiskRate(netClient->GetRate(DISK_READ_RATE), netClient->GetRate(DISK_WRITE_RATE)); - displayPanel->DisplayNetRate(netClient->GetRate(NET_SENT_RATE), netClient->GetRate(NET_RECV_RATE)); + if (onlineConnector->FetchNewData() == OK) { + displayPanel->DisplayCpuPercent(onlineConnector->GetPercent(CPU_PERCENT)); + displayPanel->DisplayMemPercent(onlineConnector->GetPercent(MEM_PERCENT)); + displayPanel->DisplayDisk0Percent(onlineConnector->GetPercent(DISK0_PERCENT)); + displayPanel->DisplayDisk1Percent(onlineConnector->GetPercent(DISK1_PERCENT)); + displayPanel->DisplayDiskRate(onlineConnector->GetRate(DISK_READ_RATE), onlineConnector->GetRate(DISK_WRITE_RATE)); + displayPanel->DisplayNetRate(onlineConnector->GetRate(NET_SENT_RATE), onlineConnector->GetRate(NET_RECV_RATE)); } else { displayPanel->DisplayCpuPercent(0); displayPanel->DisplayMemPercent(0);