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

update to SN mode

This commit is contained in:
Villivateur Von 2022-03-27 12:40:12 +08:00
parent a3dc135d70
commit 80a0ce5852
7 changed files with 19 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
factory_info.h

2
include/user_data.h
View File

@ -14,6 +14,4 @@ public:
void SetWifiSsid(String ssid); void SetWifiSsid(String ssid);
String GetWifiPasswd(); String GetWifiPasswd();
void SetWifiPasswd(String password); void SetWifiPasswd(String password);
String GetDeviceUuid();
void SetDeviceUuid(String uuid);
}; };

31
resources/config_page.html
View File

@ -1,31 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Topuino</title>
<meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no' />
<link rel='shortcut icon' href='data:,'>
</head>
<body>
<h1 style='text-align: center; font-size: 40px'>Topuino Config Page</h1>
<form action='/setup' method='POST'>
<div style='text-align: center'>
<div style='font-size: 20px; margin-bottom: 15px'>
<label for='ssid'><b>Wi-Fi SSID</b></label>
<input type='text' name='ssid' required>
</div>
<div style='font-size: 20px; margin-bottom: 15px'>
<label for='psw'><b>Wi-Fi Password</b></label>
<input type='password' name='psw' required>
</div>
<div style='font-size: 20px; margin-bottom: 15px'>
<label for='uuid'><b>Device ID</b></label>
<input type='text' name='uuid' required>
</div>
<div style='font-size: 20px'>
<button type='submit'>Commit</button>
</div>
</div>
</form>
</body>
</html>

5
src/client_network.cpp
View File

@ -2,6 +2,7 @@
#include "status_blink.h" #include "status_blink.h"
#include "user_data.h" #include "user_data.h"
#include "func_button.h" #include "func_button.h"
#include "factory_info.h"
extern StatusBlink* statusLed; extern StatusBlink* statusLed;
extern UserData* userdataManager; extern UserData* userdataManager;
@ -18,8 +19,8 @@ ClientNetwork::ClientNetwork()
funcButton->Scan(); funcButton->Scan();
} }
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOff); statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOff);
url = "http://iot.vvzero.com/topuino/getdata?UUID="; url = "http://iot.vvzero.com/topuino/getdata?SN=";
url += userdataManager->GetDeviceUuid(); url += DEVICE_SN;
status = FAIL; status = FAIL;
} }

7
src/config_manager.cpp
View File

@ -29,10 +29,6 @@ static String configPage("\
<label for='psw'><b>Wi-Fi Password</b></label>\ <label for='psw'><b>Wi-Fi Password</b></label>\
<input type='password' name='psw' required>\ <input type='password' name='psw' required>\
</div>\ </div>\
<div style='font-size: 20px; margin-bottom: 15px'>\
<label for='uuid'><b>Device ID</b></label>\
<input type='text' name='uuid' required>\
</div>\
<div style='font-size: 20px'>\ <div style='font-size: 20px'>\
<button type='submit'>Commit</button>\ <button type='submit'>Commit</button>\
</div>\ </div>\
@ -50,10 +46,9 @@ static void handleOnConnect()
static void handleOnCommit() static void handleOnCommit()
{ {
if (configManager->httpServer.hasArg("ssid") && configManager->httpServer.hasArg("psw") && configManager->httpServer.hasArg("uuid")) { if (configManager->httpServer.hasArg("ssid") && configManager->httpServer.hasArg("psw")) {
userdataManager->SetWifiSsid(configManager->httpServer.arg("ssid")); userdataManager->SetWifiSsid(configManager->httpServer.arg("ssid"));
userdataManager->SetWifiPasswd(configManager->httpServer.arg("psw")); userdataManager->SetWifiPasswd(configManager->httpServer.arg("psw"));
userdataManager->SetDeviceUuid(configManager->httpServer.arg("uuid"));
userdataManager->ConfirmData(); userdataManager->ConfirmData();
configManager->httpServer.send(200, "text/html", "OK"); configManager->httpServer.send(200, "text/html", "OK");
delay(200); delay(200);

22
src/main.cpp
View File

@ -34,13 +34,19 @@ void loop()
delay(1000); delay(1000);
funcButton->Scan(); funcButton->Scan();
if (netClient->FetchNewData() != OK) { if (netClient->FetchNewData() == OK) {
return; 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));
} else {
displayPanel->DisplayCpuPercent(0);
displayPanel->DisplayMemPercent(0);
displayPanel->DisplayDisk0Percent(0);
displayPanel->DisplayDisk1Percent(0);
displayPanel->DisplayDiskRate(0, 0);
displayPanel->DisplayNetRate(0, 0);
} }
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));
} }

11
src/user_data.cpp
View File

@ -10,7 +10,6 @@
#define VALIDATION_OFFSET 0x00 #define VALIDATION_OFFSET 0x00
#define SSID_OFFSET 0x20 #define SSID_OFFSET 0x20
#define PASSWORD_OFFSET 0x40 #define PASSWORD_OFFSET 0x40
#define UUID_OFFSET 0x60
UserData::UserData() UserData::UserData()
{ {
@ -73,13 +72,3 @@ void UserData::SetWifiPasswd(String password)
{ {
return WriteEepromString(password, PASSWORD_OFFSET); return WriteEepromString(password, PASSWORD_OFFSET);
} }
String UserData::GetDeviceUuid()
{
return ReadEepromString(UUID_OFFSET);
}
void UserData::SetDeviceUuid(String uuid)
{
return WriteEepromString(uuid, UUID_OFFSET);
}