Skip to content

Commit d758d9d

Browse files
committed
updat
1 parent 3785d45 commit d758d9d

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"terminal.integrated.env.windows": {
3-
"PATH": "C:\\Users\\Farry\\.platformio\\penv\\Scripts;C:\\Users\\Farry\\.platformio\\penv;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\ProgramData\\DockerDesktop\\version-bin;C:\\Program Files\\Docker\\Docker\\Resources\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Go\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Microsoft VS Code\\bin;C:\\git\\flutter\\bin;C:\\Users\\Farry\\AppData\\Local\\Android\\Sdk\\platform-tools;C:\\Python27;C:\\Python27\\Scripts;C:\\Program Files\\nodejs\\;C:\\Program Files\\dotnet\\;C:\\git\\flutter\\bin\\cache\\dart-sdk\\bin;C:\\git\\protoc\\bin;C:\\Program Files\\Java\\jdk1.8.0_131\\bin;C:\\Users\\Farry\\AppData\\Roaming\\Pub\\Cache\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\Program Files\\PowerShell\\7-preview\\preview;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C:\\Users\\Farry\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\Farry\\go\\bin;C:\\Users\\Farry\\AppData\\Roaming\\npm;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\ProgramData\\DockerDesktop\\version-bin;C:\\Program Files\\Docker\\Docker\\Resources\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Go\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Microsoft VS Code\\bin;C:\\git\\flutter\\bin;C:\\Users\\Farry\\AppData\\Local\\Android\\Sdk\\platform-tools;C:\\Python27;C:\\Python27\\Scripts;C:\\Program Files\\nodejs\\;C:\\Program Files\\dotnet\\;C:\\git\\flutter\\bin\\cache\\dart-sdk\\bin;C:\\git\\protoc\\bin;C:\\Program Files\\Java\\jdk1.8.0_131\\bin;C:\\Users\\Farry\\AppData\\Roaming\\Pub\\Cache\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\Program Files\\PowerShell\\7-preview\\preview;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C:\\Users\\Farry\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\Farry\\go\\bin;C:\\Users\\Farry\\AppData\\Roaming\\npm",
3+
"PATH": "C:\\Users\\Farry\\.platformio\\penv\\Scripts;C:\\Users\\Farry\\.platformio\\penv;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\ProgramData\\DockerDesktop\\version-bin;C:\\Program Files\\Docker\\Docker\\Resources\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Go\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Microsoft VS Code\\bin;C:\\git\\flutter\\bin;C:\\Users\\Farry\\AppData\\Local\\Android\\Sdk\\platform-tools;C:\\Python27;C:\\Python27\\Scripts;C:\\Program Files\\nodejs\\;C:\\Program Files\\dotnet\\;C:\\git\\flutter\\bin\\cache\\dart-sdk\\bin;C:\\git\\protoc\\bin;C:\\Program Files\\Java\\jdk1.8.0_131\\bin;C:\\Users\\Farry\\AppData\\Roaming\\Pub\\Cache\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\Program Files\\PowerShell\\7-preview\\preview;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C:\\MinGW\\bin;C:\\Users\\Farry\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\Farry\\go\\bin;C:\\Users\\Farry\\AppData\\Roaming\\npm;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\ProgramData\\DockerDesktop\\version-bin;C:\\Program Files\\Docker\\Docker\\Resources\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Go\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Microsoft VS Code\\bin;C:\\git\\flutter\\bin;C:\\Users\\Farry\\AppData\\Local\\Android\\Sdk\\platform-tools;C:\\Python27;C:\\Python27\\Scripts;C:\\Program Files\\nodejs\\;C:\\Program Files\\dotnet\\;C:\\git\\flutter\\bin\\cache\\dart-sdk\\bin;C:\\git\\protoc\\bin;C:\\Program Files\\Java\\jdk1.8.0_131\\bin;C:\\Users\\Farry\\AppData\\Roaming\\Pub\\Cache\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\Program Files\\PowerShell\\7-preview\\preview;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C:\\MinGW\\bin;C:\\Users\\Farry\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\Farry\\go\\bin;C:\\Users\\Farry\\AppData\\Roaming\\npm",
44
"PLATFORMIO_CALLER": "vscode"
55
}
66
}

platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
platform = espressif8266
1313
board = d1
1414
framework = arduino
15+
upload_speed = 921600
1516

1617
lib_deps =
17-
1647
18+

src/main.cpp

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,6 @@ void handleDeviceRename(){
136136
server.send(200, "application/json", message);
137137
}
138138

139-
// 设备信息
140-
void handleDeviceInfo(){
141-
String message;
142-
message = "{\n";
143-
message += "\"name\":\""+deviceName +"\",\n";
144-
message += "\"model\":\"com.iotserv.devices.rgbaLed\",\n";
145-
message += "\"mac\":\""+WiFi.macAddress()+"\",\n";
146-
message += "\"id\":\""+String(ESP.getFlashChipId())+"\",\n";
147-
message += "\"ui-support\":[\"web\",\"native\"],\n";
148-
message += "\"ui-first\":\"native\",\n";
149-
message += "\"author\":\"Farry\",\n";
150-
message += "\"email\":\"[email protected]\",\n";
151-
message += "\"home-page\":\"https://github.com/iotdevice\",\n";
152-
message += "\"firmware-respository\":\"https://github.com/iotdevice/esp8266-RGB-WS2812\",\n";
153-
message += "\"firmware-version\":\""+version+"\"\n";
154-
message +="}";
155-
server.send(200, "application/json", message);
156-
}
157-
158139
void setup(){
159140
modes.reserve(5000);
160141
modes_setup();
@@ -174,15 +155,24 @@ void setup(){
174155
}
175156

176157
MDNS.addService("iotdevice", "tcp", HTTP_PORT);
158+
MDNS.addServiceTxt("iotdevice", "tcp", "name", deviceName);
159+
MDNS.addServiceTxt("iotdevice", "tcp", "model", "com.iotserv.devices.rgbaLed");
160+
MDNS.addServiceTxt("iotdevice", "tcp", "mac", WiFi.macAddress());
161+
MDNS.addServiceTxt("iotdevice", "tcp", "id", ESP.getSketchMD5());
162+
MDNS.addServiceTxt("iotdevice", "tcp", "ui-support", "web,native");
163+
MDNS.addServiceTxt("iotdevice", "tcp", "ui-first", "native");
164+
MDNS.addServiceTxt("iotdevice", "tcp", "author", "Farry");
165+
MDNS.addServiceTxt("iotdevice", "tcp", "email", "[email protected]");
166+
MDNS.addServiceTxt("iotdevice", "tcp", "home-page", "https://github.com/iotdevice");
167+
MDNS.addServiceTxt("iotdevice", "tcp", "firmware-respository", "https://github.com/iotdevice/esp8266-RGB-WS2812");
168+
MDNS.addServiceTxt("iotdevice", "tcp", "firmware-version", version);
177169

178170
server.on("/", srv_handle_index_html);
179171
server.on("/main.js", srv_handle_main_js);
180172
server.on("/modes", srv_handle_modes);
181173
server.on("/modes_json", srv_handle_modes_json);
182174
server.on("/set", srv_handle_set);
183175
server.on("/rename", handleDeviceRename);
184-
// about this device
185-
server.on("/info", handleDeviceInfo);
186176

187177
server.on("/update", HTTP_POST, []() {
188178
server.sendHeader("Connection", "close");

0 commit comments

Comments
 (0)