iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Working version

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-09-07 01:32:09 +03:00
parent d8dfe7f60c
commit dcbc928896
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Utils/statUtils.h
View File

@@ -6,6 +6,7 @@
extern void initSt(); extern void initSt();
extern void updateDevicePsn(String lat, String lon, String accur, String uptime, String firm); extern void updateDevicePsn(String lat, String lon, String accur, String uptime, String firm);
extern void updateDeviceStatus(String uptime, String firm); extern void updateDeviceStatus(String uptime, String firm);
extern void getPsn();
extern void addNewDevice(String model); extern void addNewDevice(String model);
extern void updateDeviceList(String model, String firmVer); extern void updateDeviceList(String model, String firmVer);
extern void createNewDevJson(String& json, String model); extern void createNewDevJson(String& json, String model);

36
src/Utils/statUtils.cpp
View File

@@ -5,35 +5,29 @@
#include "Global.h" #include "Global.h"
void initSt() { void initSt() {
addNewDevice(FIRMWARE_NAME);
getPsn();
if (TELEMETRY_UPDATE_INTERVAL_MIN) { if (TELEMETRY_UPDATE_INTERVAL_MIN) {
ts.add( ts.add(
STATISTICS, TELEMETRY_UPDATE_INTERVAL_MIN * 60000, [&](void*) { STATISTICS, TELEMETRY_UPDATE_INTERVAL_MIN * 60000, [&](void*) {
//WifiLocation location("AIzaSyDFX7Lf0vZHOnO7Tk6TlRKCkim3bvmEQ0M");
//location_t loc = location.getGeoFromWiFi();
//
//Serial.println(location.getSurroundingWiFiJson());
//
//String lat = String(loc.lat, 6);
//String lon = String(loc.lon, 6);
//String acc = String(loc.accuracy);
//
//Serial.println(lat);
//Serial.println(lon);
//
addNewDevice(FIRMWARE_NAME);
updateDeviceStatus(timeNow->getUptime(), FIRMWARE_VERSION); updateDeviceStatus(timeNow->getUptime(), FIRMWARE_VERSION);
//if (lat != "0.000000" && lon != "0.000000") {
// updateDevicePsn(lat, lon, acc, timeNow->getUptime(), FIRMWARE_VERSION);
//} else {
// updateDeviceStatus(timeNow->getUptime(), FIRMWARE_VERSION);
//}
}, },
nullptr, true); nullptr, true);
} }
} }
void getPsn() {
if ((WiFi.status() == WL_CONNECTED)) {
String res = getURL("http://ipinfo.io/?token=c60f88583ad1a4");
String line = jsonReadStr(res, "loc");
String lat = selectToMarker(line, ",");
String lon = deleteBeforeDelimiter(line, ",");
String city = jsonReadStr(res, "city");
String country = jsonReadStr(res, "country");
String region = jsonReadStr(res, "region");
updateDevicePsn(lat, lon, "1000", timeNow->getUptime(), FIRMWARE_VERSION);
}
}
void addNewDevice(String model) { void addNewDevice(String model) {
if ((WiFi.status() == WL_CONNECTED)) { if ((WiFi.status() == WL_CONNECTED)) {
WiFiClient client; WiFiClient client;
@@ -70,7 +64,7 @@ void updateDevicePsn(String lat, String lon, String accur, String uptime, String
http.setAuthorization("admin", "admin"); http.setAuthorization("admin", "admin");
http.addHeader("Content-Type", "application/json"); http.addHeader("Content-Type", "application/json");
String mac = WiFi.macAddress().c_str(); String mac = WiFi.macAddress().c_str();
int httpCode = http.POST("?id=" + mac + "&resetReason=" + ESP.getResetReason() + "&lat=" + lat + "&lon=" + lon + "&accuracy=" + accur + "&uptime=" + uptime + "&version=" + firm + ""); int httpCode = http.POST("?id=" + mac + "&resetReason=" + ESP.getResetReason() + "&lat=" + lat + "&lon=" + lon + "&accuracy=" + accur + "");
if (httpCode > 0) { if (httpCode > 0) {
Serial.printf("code: %d\n", httpCode); Serial.printf("code: %d\n", httpCode);