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

some changes

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-04-02 22:56:01 +02:00
parent c7ba7fecbc
commit 5250049e08
6 changed files with 38 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/config-all.json
View File

@@ -1,18 +0,0 @@
{
"SSDP": "MODULES",
"chipID": "",
"ssidAP": "WiFi",
"passwordAP": "",
"ssid": "your_ssid",
"password": "your_password",
"timezone": 3,
"mqttServer": "",
"mqttPort": 0,
"mqttPrefix": "/IoTmanager",
"mqttUser": "",
"mqttPass": "",
"scenario": "1",
"pushingbox_id": "",
"web_login": "admin",
"web_pass": "admin"
}

18
data/config-my.json Normal file
View File

@@ -0,0 +1,18 @@
{
"SSDP": "IoTmanager",
"chipID": "",
"ssidAP": "WiFi",
"passwordAP": "",
"ssid": "rise",
"password": "hostel3333",
"timezone": 2,
"mqttServer": "mqtt.ioty.ru",
"mqttPort": 1883,
"mqttPrefix": "/rise",
"mqttUser": "test",
"mqttPass": "test",
"scenario": "1",
"pushingbox_id": "",
"web_login": "admin",
"web_pass": "admin"
}

18
data/config.json
View File

@@ -1,16 +1,16 @@
{ {
"SSDP": "IoTmanager", "SSDP": "MODULES",
"chipID": "", "chipID": "",
"ssidAP": "WiFi", "ssidAP": "WiFi",
"passwordAP": "", "passwordAP": "",
"ssid": "rise", "ssid": "your_ssid",
"password": "hostel3333", "password": "your_password",
"timezone": 2, "timezone": 3,
"mqttServer": "mqtt.ioty.ru", "mqttServer": "",
"mqttPort": 1883, "mqttPort": 0,
"mqttPrefix": "/rise", "mqttPrefix": "/IoTmanager",
"mqttUser": "test", "mqttUser": "",
"mqttPass": "test", "mqttPass": "",
"scenario": "1", "scenario": "1",
"pushingbox_id": "", "pushingbox_id": "",
"web_login": "admin", "web_login": "admin",

2
data/index.json
View File

@@ -29,7 +29,7 @@
}, },
{ {
"type": "h4", "type": "h4",
"title": "SPIFFS version: 2.3.1" "title": "SPIFFS version: 2.3.2"
}, },
{ {
"type": "hr" "type": "hr"

15
set.h
View File

@@ -1,4 +1,4 @@
String firmware_version = "2.3.1"; String firmware_version = "2.3.2";
//----------------------------------------------------------------- //-----------------------------------------------------------------
String last_version; String last_version;
boolean start_check_version = false; boolean start_check_version = false;
@@ -75,7 +75,7 @@ AsyncWebSocket ws("/ws");
#endif #endif
AsyncEventSource events("/events"); AsyncEventSource events("/events");
//--------------------------------------------------------------- //---------------------------------------------------------------
#include "time.h" #include <time.h>
//--------------------------------------------------------------- //---------------------------------------------------------------
#include <TickerScheduler.h> #include <TickerScheduler.h>
TickerScheduler ts(30); TickerScheduler ts(30);
@@ -105,11 +105,16 @@ GMedian medianFilter;
OneWire *oneWire; OneWire *oneWire;
DallasTemperature sensors; DallasTemperature sensors;
//---------------------------------------------------------------- //----------------------------------------------------------------
#include "DHTesp.h" #include <DHTesp.h>
DHTesp dht; DHTesp dht;
//---------------------------------------------------------------- //----------------------------------------------------------------
//#include "Adafruit_Si7021.h" //https://github.com/adafruit/Adafruit_Si7021 //#include <ModbusMaster.h>
//Adafruit_Si7021 sensor_Si7021 = Adafruit_Si7021(); //#include "SoftwareSerial.h"
//SoftwareSerial SoftSerial(12, 13, false, 128);
//ModbusMaster modbus;
//swSer.begin(9600);
//modbus.begin(1, SoftSerial);
//----------------------------------------------------------------- //-----------------------------------------------------------------
boolean just_load = true; boolean just_load = true;

55
test.ino
View File

@@ -1,55 +0,0 @@
/*
UPD
String br = "\n\n";
void info_init(){
server.on("/info", HTTP_GET, [](AsyncWebServerRequest * request) {
String r = ESP_info_html();
request->send(200, "text/html", "<html><head><meta charset=""utf-8""></head><body>"+r+"</body></html>"); // отправляем ответ о выполнении
});
sCmd.addCommand("pwr", pwr);
}
String ESP_info_str(){
br = "\n\n";
return ESP_info();
}
String ESP_info_html(){
br = "<br>";
return ESP_info();
}
String ESP_info(){
FlashMode_t ideMode = ESP.getFlashChipMode();
String message = "hello from esp8266!"+br;
int sec = millis() / 1000;
int min = sec / 60;
int hr = min / 60;
message += "Uptime: "+String(hr)+":"+String(min % 60)+":"+String(sec % 60)+br;
message += "Vcc: " + String(ESP.getVcc() / 1024.0)+br;
message += "ESP Core Version: \t"+ ESP.getCoreVersion()+br;
message += "ESP Sdk Version: \t"+ String(ESP.getSdkVersion())+br;
message += "ESP Boot Mode: \t"+ String(ESP.getBootMode())+br;
message += "ESP Sketch Size: \t"+ String(ESP.getSketchSize())+br;
message += "ESP Free Sketch Space: \t"+ String(ESP.getFreeSketchSpace())+br;
#ifdef ESP32
message += "wifi station get hostname: \t"+ String(wifi_station_get_hostname())+br;
message += "ESP min Sketch Space: \t"+ String(esp_get_minimum_free_heap_size())+br;
#endif
message += "размер свободной памяти:\t"+String(ESP.getFreeHeap())+br;
message += "chip ID:\t"+String(ESP.getChipId(),HEX)+br;
message += "flash chip ID:\t"+String(ESP.getFlashChipId(),HEX)+br;
message += "размер флеш памяти IDE:\t"+String(ESP.getFlashChipSize())+br;
message += "размер флеш памяти SDK:\t"+String(ESP.getFlashChipRealSize())+br;
message += "частота флеш памяти, в Гц.:\t"+String(ESP.getFlashChipSpeed())+br;
message += "Flash ide mode:\t"+ String(ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT" : ideMode == FM_DIO ? "DIO" : ideMode == FM_DOUT ? "DOUT" : "UNKNOWN")+br;
// message += "IP address: \t"+ WiFi.localIP()+br;
return message;
}
*/