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

некоторые изменения

Browse Source
This commit is contained in:
Dmitry Borisenko
2023-06-20 21:47:29 +02:00
parent 8260bef3d4
commit b9196f2241
7 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Main.cpp
View File

@@ -3,7 +3,7 @@
#include "classes/IoTDB.h"
#include "utils/Statistic.h"
#include <Wire.h>
#ifdef esp32s2_4mb
#ifdef esp32s2_4mb
#include <USB.h>
#endif
@@ -80,9 +80,9 @@ void stopErrorMarker(int id) {
}
void setup() {
#ifdef esp32s2_4mb
#ifdef esp32s2_4mb
USB.begin();
#endif
#endif
#ifdef esp32_4mb
My_timer = timerBegin(0, 80, true);
timerAttachInterrupt(My_timer, &onTimer, true);
@@ -107,7 +107,7 @@ void setup() {
Serial.println("FIRMWARE NAME " + String(FIRMWARE_NAME));
Serial.println("FIRMWARE VERSION " + String(FIRMWARE_VERSION));
Serial.println("WEB VERSION " + getWebVersion());
const String buildTime = String(BUILD_DAY) + "/" + String(BUILD_MONTH) + "/" + String(BUILD_YEAR) + " " + String(BUILD_HOUR) + ":" + String(BUILD_MIN) + ":" + String(BUILD_SEC);
const String buildTime = String(BUILD_DAY) + "." + String(BUILD_MONTH) + "." + String(BUILD_YEAR) + " " + String(BUILD_HOUR) + ":" + String(BUILD_MIN) + ":" + String(BUILD_SEC);
Serial.println("BUILD TIME " + buildTime);
jsonWriteStr_(errorsHeapJson, F("bt"), buildTime);
Serial.println(F("------------------------"));

4
src/utils/Statistic.cpp
View File

@@ -16,8 +16,8 @@ void stInit() {
void updateDeviceStatus() {
String ret;
String serverIP;
jsonRead(settingsFlashJson, F("serverip"), serverIP);
String serverIP = "http://iotmanager.org";
// jsonRead(settingsFlashJson, F("serverip"), serverIP);
String url = serverIP + F("/projects/esprebootstat.php");
// SerialPrint("i", "Stat", "url " + url);
if ((WiFi.status() == WL_CONNECTED)) {