From 5250049e08d22a39833e4486cf336cfedc518588 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 2 Apr 2020 22:56:01 +0200 Subject: [PATCH] some changes --- data/config-all.json | 18 --------------- data/config-my.json | 18 +++++++++++++++ data/config.json | 18 +++++++-------- data/index.json | 2 +- set.h | 15 ++++++++---- test.ino | 55 -------------------------------------------- 6 files changed, 38 insertions(+), 88 deletions(-) delete mode 100644 data/config-all.json create mode 100644 data/config-my.json delete mode 100644 test.ino diff --git a/data/config-all.json b/data/config-all.json deleted file mode 100644 index 6d81dee4..00000000 --- a/data/config-all.json +++ /dev/null @@ -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" -} \ No newline at end of file diff --git a/data/config-my.json b/data/config-my.json new file mode 100644 index 00000000..345fd0cc --- /dev/null +++ b/data/config-my.json @@ -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" +} \ No newline at end of file diff --git a/data/config.json b/data/config.json index 345fd0cc..6d81dee4 100644 --- a/data/config.json +++ b/data/config.json @@ -1,16 +1,16 @@ { - "SSDP": "IoTmanager", + "SSDP": "MODULES", "chipID": "", "ssidAP": "WiFi", "passwordAP": "", - "ssid": "rise", - "password": "hostel3333", - "timezone": 2, - "mqttServer": "mqtt.ioty.ru", - "mqttPort": 1883, - "mqttPrefix": "/rise", - "mqttUser": "test", - "mqttPass": "test", + "ssid": "your_ssid", + "password": "your_password", + "timezone": 3, + "mqttServer": "", + "mqttPort": 0, + "mqttPrefix": "/IoTmanager", + "mqttUser": "", + "mqttPass": "", "scenario": "1", "pushingbox_id": "", "web_login": "admin", diff --git a/data/index.json b/data/index.json index e5f5eabe..05e0aba7 100644 --- a/data/index.json +++ b/data/index.json @@ -29,7 +29,7 @@ }, { "type": "h4", - "title": "SPIFFS version: 2.3.1" + "title": "SPIFFS version: 2.3.2" }, { "type": "hr" diff --git a/set.h b/set.h index 5c83bbba..bf10a2b1 100644 --- a/set.h +++ b/set.h @@ -1,4 +1,4 @@ -String firmware_version = "2.3.1"; +String firmware_version = "2.3.2"; //----------------------------------------------------------------- String last_version; boolean start_check_version = false; @@ -75,7 +75,7 @@ AsyncWebSocket ws("/ws"); #endif AsyncEventSource events("/events"); //--------------------------------------------------------------- -#include "time.h" +#include //--------------------------------------------------------------- #include TickerScheduler ts(30); @@ -105,11 +105,16 @@ GMedian medianFilter; OneWire *oneWire; DallasTemperature sensors; //---------------------------------------------------------------- -#include "DHTesp.h" +#include DHTesp dht; //---------------------------------------------------------------- -//#include "Adafruit_Si7021.h" //https://github.com/adafruit/Adafruit_Si7021 -//Adafruit_Si7021 sensor_Si7021 = Adafruit_Si7021(); +//#include +//#include "SoftwareSerial.h" +//SoftwareSerial SoftSerial(12, 13, false, 128); +//ModbusMaster modbus; + +//swSer.begin(9600); +//modbus.begin(1, SoftSerial); //----------------------------------------------------------------- boolean just_load = true; diff --git a/test.ino b/test.ino deleted file mode 100644 index c8bad15d..00000000 --- a/test.ino +++ /dev/null @@ -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", ""+r+""); // отправляем ответ о выполнении - }); - sCmd.addCommand("pwr", pwr); -} - -String ESP_info_str(){ - br = "\n\n"; - return ESP_info(); -} -String ESP_info_html(){ - 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; -} -*/