villivateur
/
Topuino_Hardware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename some important vars

This commit is contained in:
Vector Von 2022-07-02 13:04:34 +08:00
parent f8b3d83075
commit e55fb286c3
16 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
include/display.h → include/DisplayPanel.h
View File

0
include/func_button.h → include/FuncButton.h
View File

0
include/monitor_items.h → include/MonitorItems.h
View File

4
include/client_network.h → include/OnlineConnector.h
View File

@ -4,7 +4,7 @@
#include <WiFiClient.h> #include <WiFiClient.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
class ClientNetwork class OnlineConnector
{ {
private: private:
String url; String url;
@ -13,7 +13,7 @@ private:
STATUS status; STATUS status;
public: public:
ClientNetwork(); OnlineConnector();
STATUS FetchNewData(); STATUS FetchNewData();
uint8_t GetPercent(String name); uint8_t GetPercent(String name);
uint32_t GetRate(String name); uint32_t GetRate(String name);

4
include/status_blink.h → include/StatusLed.h
View File

@ -3,7 +3,7 @@
#define STATUS_LED_PIN 2 #define STATUS_LED_PIN 2
class StatusBlink class StatusLed
{ {
private: private:
Ticker flipper; Ticker flipper;
@ -16,6 +16,6 @@ public:
Rate0_5Hz, Rate0_5Hz,
RateAlwaysOff, RateAlwaysOff,
}; };
StatusBlink(); StatusLed();
void SetBlinkRate(BlinkRate rate); void SetBlinkRate(BlinkRate rate);
}; };

4
include/client_usb.h → include/UsbConnector.h
View File

@ -13,10 +13,10 @@ struct UsbData
uint32_t netReceiveRate; uint32_t netReceiveRate;
}; };
class ClientUsb class UsbConnector
{ {
public: public:
ClientUsb(); UsbConnector();
UsbData data; UsbData data;
private: private:

0
include/user_data.h → include/UserData.h
View File

4
include/config_manager.h → include/WifiConfigManager.h
View File

@ -2,7 +2,7 @@
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
class ConfigManager class WifiConfigManager
{ {
private: private:
IPAddress localIp; IPAddress localIp;
@ -10,6 +10,6 @@ private:
IPAddress subnet; IPAddress subnet;
public: public:
ESP8266WebServer httpServer; ESP8266WebServer httpServer;
ConfigManager(); WifiConfigManager();
void ProcessConfig(); void ProcessConfig();
}; };

2
src/display.cpp → src/DisplayPanel.cpp
View File

@ -1,4 +1,4 @@
#include "display.h" #include "DisplayPanel.h"
#define STROBE_TM1 13 #define STROBE_TM1 13
#define STROBE_TM2 12 // strobe = GPIO connected to strobe line of module #define STROBE_TM2 12 // strobe = GPIO connected to strobe line of module

12
src/func_button.cpp → src/FuncButton.cpp
View File

@ -1,12 +1,12 @@
#include "func_button.h" #include "FuncButton.h"
#include "user_data.h" #include "UserData.h"
#include "status_blink.h" #include "StatusLed.h"
#define FUNC_BTN 0 #define FUNC_BTN 0
#define PRESSED_STATUS LOW #define PRESSED_STATUS LOW
extern UserData* userdataManager; extern UserData* userdataManager;
extern StatusBlink* statusLed; extern StatusLed* statusLed;
static int pressedTime; static int pressedTime;
@ -23,7 +23,7 @@ static void Scan()
if (count >= 10) { if (count >= 10) {
// Factory reset // Factory reset
userdataManager->EraseAllData(); userdataManager->EraseAllData();
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn);
delay(1000); delay(1000);
ESP.restart(); ESP.restart();
return; return;
@ -45,7 +45,7 @@ static void Scan()
default: default:
break; break;
} }
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn);
delay(200); delay(200);
ESP.restart(); ESP.restart();
return; return;

22
src/client_network.cpp → src/OnlineConnector.cpp
View File

@ -1,29 +1,29 @@
#include "client_network.h" #include "OnlineConnector.h"
#include "status_blink.h" #include "StatusLed.h"
#include "user_data.h" #include "UserData.h"
#include "func_button.h" #include "FuncButton.h"
#include "factory_info.h" #include "factory_info.h"
extern StatusBlink* statusLed; extern StatusLed* statusLed;
extern UserData* userdataManager; extern UserData* userdataManager;
extern FuncButton* funcButton; extern FuncButton* funcButton;
ClientNetwork::ClientNetwork() OnlineConnector::OnlineConnector()
{ {
WiFi.begin(userdataManager->GetWifiSsid(), userdataManager->GetWifiPasswd()); WiFi.begin(userdataManager->GetWifiSsid(), userdataManager->GetWifiPasswd());
statusLed->SetBlinkRate(StatusBlink::BlinkRate::Rate2Hz); statusLed->SetBlinkRate(StatusLed::BlinkRate::Rate2Hz);
while (WiFi.status() != WL_CONNECTED) while (WiFi.status() != WL_CONNECTED)
{ {
delay(1000); delay(1000);
} }
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOff); statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOff);
url = "http://iot.vvzero.com/topuino/getdata?SN="; url = "http://iot.vvzero.com/topuino/getdata?SN=";
url += DEVICE_SN; url += DEVICE_SN;
status = FAIL; status = FAIL;
} }
STATUS ClientNetwork::FetchNewData() STATUS OnlineConnector::FetchNewData()
{ {
status = FAIL; status = FAIL;
if (WiFi.status() == WL_CONNECTED) { if (WiFi.status() == WL_CONNECTED) {
@ -42,12 +42,12 @@ STATUS ClientNetwork::FetchNewData()
return status; return status;
} }
uint8_t ClientNetwork::GetPercent(String name) uint8_t OnlineConnector::GetPercent(String name)
{ {
return status == OK ? receivedData[name] : 0; return status == OK ? receivedData[name] : 0;
} }
uint32_t ClientNetwork::GetRate(String name) uint32_t OnlineConnector::GetRate(String name)
{ {
return status == OK ? receivedData[name] : 0; return status == OK ? receivedData[name] : 0;
} }

6
src/status_blink.cpp → src/StatusLed.cpp
View File

@ -1,6 +1,6 @@
#include "status_blink.h" #include "StatusLed.h"
StatusBlink::StatusBlink() StatusLed::StatusLed()
{ {
pinMode(STATUS_LED_PIN, OUTPUT); pinMode(STATUS_LED_PIN, OUTPUT);
digitalWrite(STATUS_LED_PIN, HIGH); 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 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) switch (rate)
{ {

4
src/client_usb.cpp → src/UsbConnector.cpp
View File

@ -1,4 +1,4 @@
#include "client_usb.h" #include "UsbConnector.h"
static byte* dataBuff; static byte* dataBuff;
@ -14,7 +14,7 @@ static void Receive()
} }
} }
ClientUsb::ClientUsb() UsbConnector::UsbConnector()
{ {
memset(&data, 0, sizeof(UsbData)); memset(&data, 0, sizeof(UsbData));
Serial.setTimeout(100); Serial.setTimeout(100);

2
src/user_data.cpp → src/UserData.cpp
View File

@ -1,4 +1,4 @@
#include "user_data.h" #include "UserData.h"
#include <EEPROM.h> #include <EEPROM.h>
#define MAX_USER_DATA_SIZE 0x200 #define MAX_USER_DATA_SIZE 0x200

30
src/config_manager.cpp → src/WifiConfigManager.cpp
View File

@ -1,12 +1,12 @@
#include "config_manager.h" #include "WifiConfigManager.h"
#include "status_blink.h" #include "StatusLed.h"
#include "user_data.h" #include "UserData.h"
#define SSID "Topuino" #define SSID "Topuino"
#define WIFI_PASSWORD "vvzero.com" #define WIFI_PASSWORD "vvzero.com"
extern StatusBlink* statusLed; extern StatusLed* statusLed;
extern ConfigManager* configManager; extern WifiConfigManager* wifiConfigManager;
extern UserData* userdataManager; extern UserData* userdataManager;
static String configPage("\ static String configPage("\
@ -41,31 +41,31 @@ static String configPage("\
static void handleOnConnect() static void handleOnConnect()
{ {
configManager->httpServer.send(200, "text/html", configPage); wifiConfigManager->httpServer.send(200, "text/html", configPage);
} }
static void handleOnCommit() static void handleOnCommit()
{ {
if (configManager->httpServer.hasArg("ssid") && configManager->httpServer.hasArg("psw")) { if (wifiConfigManager->httpServer.hasArg("ssid") && wifiConfigManager->httpServer.hasArg("psw")) {
userdataManager->SetWifiSsid(configManager->httpServer.arg("ssid")); userdataManager->SetWifiSsid(wifiConfigManager->httpServer.arg("ssid"));
userdataManager->SetWifiPasswd(configManager->httpServer.arg("psw")); userdataManager->SetWifiPasswd(wifiConfigManager->httpServer.arg("psw"));
userdataManager->ConfirmWifiData(); userdataManager->ConfirmWifiData();
configManager->httpServer.send(200, "text/html", "OK"); wifiConfigManager->httpServer.send(200, "text/html", "OK");
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOn); statusLed->SetBlinkRate(StatusLed::BlinkRate::RateAlwaysOn);
delay(200); delay(200);
ESP.restart(); ESP.restart();
} else { } else {
configManager->httpServer.send(200, "text/html", "ERROR"); wifiConfigManager->httpServer.send(200, "text/html", "ERROR");
} }
} }
ConfigManager::ConfigManager() : WifiConfigManager::WifiConfigManager() :
localIp(192,168,1,1), localIp(192,168,1,1),
gateway(192,168,1,1), gateway(192,168,1,1),
subnet(255,255,255,0), subnet(255,255,255,0),
httpServer(80) httpServer(80)
{ {
statusLed->SetBlinkRate(StatusBlink::BlinkRate::Rate0_5Hz); statusLed->SetBlinkRate(StatusLed::BlinkRate::Rate0_5Hz);
WiFi.softAPConfig(localIp, gateway, subnet); WiFi.softAPConfig(localIp, gateway, subnet);
WiFi.softAP(SSID, WIFI_PASSWORD); WiFi.softAP(SSID, WIFI_PASSWORD);
delay(100); delay(100);
@ -76,7 +76,7 @@ httpServer(80)
httpServer.begin(); httpServer.begin();
} }
void ConfigManager::ProcessConfig() void WifiConfigManager::ProcessConfig()
{ {
while (1) { while (1) {
httpServer.handleClient(); httpServer.handleClient();

60
src/main.cpp
View File

@ -1,36 +1,36 @@
#include <Arduino.h> #include <Arduino.h>
#include "display.h" #include "DisplayPanel.h"
#include "client_network.h" #include "OnlineConnector.h"
#include "client_usb.h" #include "UsbConnector.h"
#include "monitor_items.h" #include "MonitorItems.h"
#include "status_blink.h" #include "StatusLed.h"
#include "config_manager.h" #include "WifiConfigManager.h"
#include "user_data.h" #include "UserData.h"
#include "func_button.h" #include "FuncButton.h"
DisplayPanel* displayPanel; DisplayPanel* displayPanel;
ClientNetwork* netClient; OnlineConnector* onlineConnector;
ClientUsb* usbClient; UsbConnector* usbConnector;
StatusBlink* statusLed; StatusLed* statusLed;
UserData* userdataManager; UserData* userdataManager;
ConfigManager* configManager; WifiConfigManager* wifiConfigManager;
FuncButton* funcButton; FuncButton* funcButton;
RunMode runMode; RunMode runMode;
void RunMode_Usb_Setup() void RunMode_Usb_Setup()
{ {
usbClient = new ClientUsb(); usbConnector = new UsbConnector();
} }
void RunMode_Online_Setup() void RunMode_Online_Setup()
{ {
if (!userdataManager->WifiInfoValid()) { if (!userdataManager->WifiInfoValid()) {
configManager = new ConfigManager(); wifiConfigManager = new WifiConfigManager();
configManager->ProcessConfig(); wifiConfigManager->ProcessConfig();
} else { } else {
netClient = new ClientNetwork(); onlineConnector = new OnlineConnector();
} }
} }
@ -42,7 +42,7 @@ void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
statusLed = new StatusBlink(); statusLed = new StatusLed();
userdataManager = new UserData(); userdataManager = new UserData();
displayPanel = new DisplayPanel(); displayPanel = new DisplayPanel();
funcButton = new FuncButton(); funcButton = new FuncButton();
@ -73,23 +73,23 @@ void setup()
void RunMode_Usb_Loop() void RunMode_Usb_Loop()
{ {
displayPanel->DisplayCpuPercent(usbClient->data.cpuPercent); displayPanel->DisplayCpuPercent(usbConnector->data.cpuPercent);
displayPanel->DisplayMemPercent(usbClient->data.memPercent); displayPanel->DisplayMemPercent(usbConnector->data.memPercent);
displayPanel->DisplayDisk0Percent(usbClient->data.disk0Percent); displayPanel->DisplayDisk0Percent(usbConnector->data.disk0Percent);
displayPanel->DisplayDisk1Percent(usbClient->data.disk1Percent); displayPanel->DisplayDisk1Percent(usbConnector->data.disk1Percent);
displayPanel->DisplayDiskRate(usbClient->data.diskReadRate, usbClient->data.diskWriteRate); displayPanel->DisplayDiskRate(usbConnector->data.diskReadRate, usbConnector->data.diskWriteRate);
displayPanel->DisplayNetRate(usbClient->data.netSentRate, usbClient->data.netReceiveRate); displayPanel->DisplayNetRate(usbConnector->data.netSentRate, usbConnector->data.netReceiveRate);
} }
void RunMode_Online_Loop() void RunMode_Online_Loop()
{ {
if (netClient->FetchNewData() == OK) { if (onlineConnector->FetchNewData() == OK) {
displayPanel->DisplayCpuPercent(netClient->GetPercent(CPU_PERCENT)); displayPanel->DisplayCpuPercent(onlineConnector->GetPercent(CPU_PERCENT));
displayPanel->DisplayMemPercent(netClient->GetPercent(MEM_PERCENT)); displayPanel->DisplayMemPercent(onlineConnector->GetPercent(MEM_PERCENT));
displayPanel->DisplayDisk0Percent(netClient->GetPercent(DISK0_PERCENT)); displayPanel->DisplayDisk0Percent(onlineConnector->GetPercent(DISK0_PERCENT));
displayPanel->DisplayDisk1Percent(netClient->GetPercent(DISK1_PERCENT)); displayPanel->DisplayDisk1Percent(onlineConnector->GetPercent(DISK1_PERCENT));
displayPanel->DisplayDiskRate(netClient->GetRate(DISK_READ_RATE), netClient->GetRate(DISK_WRITE_RATE)); displayPanel->DisplayDiskRate(onlineConnector->GetRate(DISK_READ_RATE), onlineConnector->GetRate(DISK_WRITE_RATE));
displayPanel->DisplayNetRate(netClient->GetRate(NET_SENT_RATE), netClient->GetRate(NET_RECV_RATE)); displayPanel->DisplayNetRate(onlineConnector->GetRate(NET_SENT_RATE), onlineConnector->GetRate(NET_RECV_RATE));
} else { } else {
displayPanel->DisplayCpuPercent(0); displayPanel->DisplayCpuPercent(0);
displayPanel->DisplayMemPercent(0); displayPanel->DisplayMemPercent(0);