diff --git a/include/.gitignore b/include/.gitignore
new file mode 100644
index 0000000..df951d3
--- /dev/null
+++ b/include/.gitignore
@@ -0,0 +1 @@
+factory_info.h
diff --git a/include/user_data.h b/include/user_data.h
index 84d7456..546134d 100644
--- a/include/user_data.h
+++ b/include/user_data.h
@@ -14,6 +14,4 @@ public:
void SetWifiSsid(String ssid);
String GetWifiPasswd();
void SetWifiPasswd(String password);
- String GetDeviceUuid();
- void SetDeviceUuid(String uuid);
};
diff --git a/resources/config_page.html b/resources/config_page.html
deleted file mode 100644
index 952baa2..0000000
--- a/resources/config_page.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- Topuino
-
-
-
-
-Topuino Config Page
-
-
-
diff --git a/src/client_network.cpp b/src/client_network.cpp
index 16f9079..de0cb40 100644
--- a/src/client_network.cpp
+++ b/src/client_network.cpp
@@ -2,6 +2,7 @@
#include "status_blink.h"
#include "user_data.h"
#include "func_button.h"
+#include "factory_info.h"
extern StatusBlink* statusLed;
extern UserData* userdataManager;
@@ -18,8 +19,8 @@ ClientNetwork::ClientNetwork()
funcButton->Scan();
}
statusLed->SetBlinkRate(StatusBlink::BlinkRate::RateAlwaysOff);
- url = "http://iot.vvzero.com/topuino/getdata?UUID=";
- url += userdataManager->GetDeviceUuid();
+ url = "http://iot.vvzero.com/topuino/getdata?SN=";
+ url += DEVICE_SN;
status = FAIL;
}
diff --git a/src/config_manager.cpp b/src/config_manager.cpp
index 039b486..978aa34 100644
--- a/src/config_manager.cpp
+++ b/src/config_manager.cpp
@@ -29,10 +29,6 @@ static String configPage("\
\
\
\
- \
- \
- \
-
\
\
\
\
@@ -50,10 +46,9 @@ static void handleOnConnect()
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->SetWifiPasswd(configManager->httpServer.arg("psw"));
- userdataManager->SetDeviceUuid(configManager->httpServer.arg("uuid"));
userdataManager->ConfirmData();
configManager->httpServer.send(200, "text/html", "OK");
delay(200);
diff --git a/src/main.cpp b/src/main.cpp
index f280970..742b6f8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,13 +34,19 @@ void loop()
delay(1000);
funcButton->Scan();
- if (netClient->FetchNewData() != OK) {
- return;
+ 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));
+ } 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));
}
diff --git a/src/user_data.cpp b/src/user_data.cpp
index b466565..c40bb1c 100644
--- a/src/user_data.cpp
+++ b/src/user_data.cpp
@@ -10,7 +10,6 @@
#define VALIDATION_OFFSET 0x00
#define SSID_OFFSET 0x20
#define PASSWORD_OFFSET 0x40
-#define UUID_OFFSET 0x60
UserData::UserData()
{
@@ -73,13 +72,3 @@ void UserData::SetWifiPasswd(String password)
{
return WriteEepromString(password, PASSWORD_OFFSET);
}
-
-String UserData::GetDeviceUuid()
-{
- return ReadEepromString(UUID_OFFSET);
-}
-
-void UserData::SetDeviceUuid(String uuid)
-{
- return WriteEepromString(uuid, UUID_OFFSET);
-}