From a66d2ef2d6787eb9f52fbed1dc50962582279692 Mon Sep 17 00:00:00 2001 From: Villivateur Von Date: Sat, 25 Sep 2021 21:30:01 +0800 Subject: [PATCH] release V0.1 --- doc/province_bit_map.md | 2 +- include/client_network.h | 4 ++-- include/monitor_items.h | 2 +- src/client_network.cpp | 8 ++++---- src/config_manager.cpp | 6 +++--- src/main.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/province_bit_map.md b/doc/province_bit_map.md index 33a96cc..4edd3d4 100644 --- a/doc/province_bit_map.md +++ b/doc/province_bit_map.md @@ -21,4 +21,4 @@ | 广东 | data0 | 28 | 福建 | data0 | 29 | | 海南 | data0 | 30 | 澳门 | data0 | 31 | | 香港 | data1 | 0 | 台湾 | data1 | 1 | -| World | data1 | 2 | \ No newline at end of file +| World | data1 | 2 | - | - | - | diff --git a/include/client_network.h b/include/client_network.h index ddee7d7..b30cf10 100644 --- a/include/client_network.h +++ b/include/client_network.h @@ -15,6 +15,6 @@ private: public: ClientNetwork(); STATUS FetchNewData(); - uint32_t GetData0(); - uint32_t GetData1(); + uint32_t GetSeg0(); + uint32_t GetSeg1(); }; \ No newline at end of file diff --git a/include/monitor_items.h b/include/monitor_items.h index 2cdfe47..eef9c22 100644 --- a/include/monitor_items.h +++ b/include/monitor_items.h @@ -1,4 +1,4 @@ -// Topuino and Topuino_Server must share this header file +// Mapuino and Mapuino_Server must share this header file #define CPU_PERCENT "CPU_PERCENT" #define MEM_PERCENT "MEM_PERCENT" diff --git a/src/client_network.cpp b/src/client_network.cpp index 34a4912..76b46ec 100644 --- a/src/client_network.cpp +++ b/src/client_network.cpp @@ -42,20 +42,20 @@ STATUS ClientNetwork::FetchNewData() return status; } -uint32_t ClientNetwork::GetData0() +uint32_t ClientNetwork::GetSeg0() { if (status != OK) { return 0; } else { - return (uint32_t)receivedData["DATA0"]; + return (uint32_t)receivedData["SEG0"]; } } -uint32_t ClientNetwork::GetData1() +uint32_t ClientNetwork::GetSeg1() { if (status != OK) { return 0; } else { - return (uint32_t)receivedData["DATA1"]; + return (uint32_t)receivedData["SEG1"]; } } diff --git a/src/config_manager.cpp b/src/config_manager.cpp index 039b486..b8979f6 100644 --- a/src/config_manager.cpp +++ b/src/config_manager.cpp @@ -2,7 +2,7 @@ #include "status_blink.h" #include "user_data.h" -#define SSID "Topuino" +#define SSID "Mapuino" #define PASSWORD "vvzero.com" extern StatusBlink* statusLed; @@ -13,12 +13,12 @@ static String configPage("\ \ \ \ - Topuino\ + Mapuino\ \ \ \ \ -

Topuino Config Page

\ +

Mapuino Config Page

\
\
\
\ diff --git a/src/main.cpp b/src/main.cpp index 820c769..7a38285 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,5 +36,5 @@ void loop() if (netClient->FetchNewData() != OK) { return; } - displayPanel->DisplayLedMap(netClient->GetData0(), netClient->GetData1()); + displayPanel->DisplayLedMap(netClient->GetSeg0(), netClient->GetSeg1()); }