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

release V0.1

This commit is contained in:
Villivateur Von 2021-09-25 21:30:01 +08:00
parent 97d17ada7c
commit a66d2ef2d6
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/province_bit_map.md
View File

@ -21,4 +21,4 @@
| 广东 | data0 | 28 | 福建 | data0 | 29 | | 广东 | data0 | 28 | 福建 | data0 | 29 |
| 海南 | data0 | 30 | 澳门 | data0 | 31 | | 海南 | data0 | 30 | 澳门 | data0 | 31 |
| 香港 | data1 | 0 | 台湾 | data1 | 1 | | 香港 | data1 | 0 | 台湾 | data1 | 1 |
| World | data1 | 2 | | World | data1 | 2 | - | - | - |

4
include/client_network.h
View File

@ -15,6 +15,6 @@ private:
public: public:
ClientNetwork(); ClientNetwork();
STATUS FetchNewData(); STATUS FetchNewData();
uint32_t GetData0(); uint32_t GetSeg0();
uint32_t GetData1(); uint32_t GetSeg1();
}; };

2
include/monitor_items.h
View File

@ -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 CPU_PERCENT "CPU_PERCENT"
#define MEM_PERCENT "MEM_PERCENT" #define MEM_PERCENT "MEM_PERCENT"

8
src/client_network.cpp
View File

@ -42,20 +42,20 @@ STATUS ClientNetwork::FetchNewData()
return status; return status;
} }
uint32_t ClientNetwork::GetData0() uint32_t ClientNetwork::GetSeg0()
{ {
if (status != OK) { if (status != OK) {
return 0; return 0;
} else { } else {
return (uint32_t)receivedData["DATA0"]; return (uint32_t)receivedData["SEG0"];
} }
} }
uint32_t ClientNetwork::GetData1() uint32_t ClientNetwork::GetSeg1()
{ {
if (status != OK) { if (status != OK) {
return 0; return 0;
} else { } else {
return (uint32_t)receivedData["DATA1"]; return (uint32_t)receivedData["SEG1"];
} }
} }

6
src/config_manager.cpp
View File

@ -2,7 +2,7 @@
#include "status_blink.h" #include "status_blink.h"
#include "user_data.h" #include "user_data.h"
#define SSID "Topuino" #define SSID "Mapuino"
#define PASSWORD "vvzero.com" #define PASSWORD "vvzero.com"
extern StatusBlink* statusLed; extern StatusBlink* statusLed;
@ -13,12 +13,12 @@ static String configPage("\
<!DOCTYPE html>\ <!DOCTYPE html>\
<html>\ <html>\
<head>\ <head>\
<title>Topuino</title>\ <title>Mapuino</title>\
<meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no' />\ <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no' />\
<link rel='shortcut icon' href='data:,'>\ <link rel='shortcut icon' href='data:,'>\
</head>\ </head>\
<body>\ <body>\
<h1 style='text-align: center; font-size: 40px'>Topuino Config Page</h1>\ <h1 style='text-align: center; font-size: 40px'>Mapuino Config Page</h1>\
<form action='/setup' method='POST'>\ <form action='/setup' method='POST'>\
<div style='text-align: center'>\ <div style='text-align: center'>\
<div style='font-size: 20px; margin-bottom: 15px'>\ <div style='font-size: 20px; margin-bottom: 15px'>\

2
src/main.cpp
View File

@ -36,5 +36,5 @@ void loop()
if (netClient->FetchNewData() != OK) { if (netClient->FetchNewData() != OK) {
return; return;
} }
displayPanel->DisplayLedMap(netClient->GetData0(), netClient->GetData1()); displayPanel->DisplayLedMap(netClient->GetSeg0(), netClient->GetSeg1());
} }