Message
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
#define WIFI_PASSWORD "0ndthnrf"
|
#define WIFI_PASSWORD "0ndthnrf"
|
||||||
//#define WIFI_SSID2 "BR"
|
//#define WIFI_SSID2 "BR"
|
||||||
//#define WIFI_PASSWORD2 "499727479o"
|
//#define WIFI_PASSWORD2 "499727479o"
|
||||||
#define MQTT_SERV "192.168.1.111"
|
#define MQTT_SERV "192.168.1.10"
|
||||||
#define TOPIC "home/kor/"
|
#define TOPIC "home/kor/"
|
||||||
|
|
||||||
#define HOSTNAME "ESP_Kor"
|
#define HOSTNAME "ESP_Kor"
|
||||||
@@ -213,13 +213,6 @@ void loop()
|
|||||||
}
|
}
|
||||||
if(cRun + 999 < millis()){
|
if(cRun + 999 < millis()){
|
||||||
cRun = millis();
|
cRun = millis();
|
||||||
//if(!rsOk){
|
|
||||||
// WebSerial.println("RadSens not Ok");
|
|
||||||
// rsOk = radSens.init();
|
|
||||||
//}
|
|
||||||
//dynval = radSens.getRadIntensyDynamic();
|
|
||||||
//statval = radSens.getRadIntensyStatic();
|
|
||||||
//impval = radSens.getNumberOfPulses();
|
|
||||||
|
|
||||||
cSec++;
|
cSec++;
|
||||||
mins += 1 / 60.0;
|
mins += 1 / 60.0;
|
||||||
@@ -228,8 +221,6 @@ void loop()
|
|||||||
mqttClient.publish(TOPIC"minsmain", 1, false, v);
|
mqttClient.publish(TOPIC"minsmain", 1, false, v);
|
||||||
itoa(int(samples.getMedian()), v, 10);
|
itoa(int(samples.getMedian()), v, 10);
|
||||||
mqttClient.publish(TOPIC"adc", 1, false, v);
|
mqttClient.publish(TOPIC"adc", 1, false, v);
|
||||||
//sprintf(v, "%.1f", statval);
|
|
||||||
//mqttClient.publish(TOPIC"mkr", 1, false, v);
|
|
||||||
cSec = 0;
|
cSec = 0;
|
||||||
}
|
}
|
||||||
if(curDelay == 0) {
|
if(curDelay == 0) {
|
||||||
|
|||||||
@@ -25,3 +25,4 @@ lib_deps =
|
|||||||
;https://github.com/RobTillaart/SHT31.git
|
;https://github.com/RobTillaart/SHT31.git
|
||||||
;ayushsharma82/ElegantOTA@^3.1.2
|
;ayushsharma82/ElegantOTA@^3.1.2
|
||||||
https://github.com/adafruit/Adafruit_SHT31.git
|
https://github.com/adafruit/Adafruit_SHT31.git
|
||||||
|
jandelgado/JLed @ ^4.15.0
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
#define WIFI_SSID "wf-home"
|
#define WIFI_SSID "wf-home"
|
||||||
#define WIFI_PASSWORD "0ndthnrf"
|
#define WIFI_PASSWORD "0ndthnrf"
|
||||||
#define MQTT_SERV "192.168.1.111"
|
#define MQTT_SERV "192.168.1.10"
|
||||||
#define TOPIC "home/midroom/bed/"
|
#define TOPIC "home/midroom/bed/"
|
||||||
#define HOSTNAME "ESP_Midroom2"
|
#define HOSTNAME "ESP_Midroom2"
|
||||||
|
|
||||||
|
|||||||
@@ -1,99 +1,102 @@
|
|||||||
{
|
{
|
||||||
"folders": [
|
"folders": [
|
||||||
{
|
{
|
||||||
"name": "I2C Scan",
|
"name": "I2C Scan",
|
||||||
"path": "I2C Scan"
|
"path": "I2C Scan"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "VT_ESP8266",
|
"name": "VT_ESP8266",
|
||||||
"path": "VT_ESP8266"
|
"path": "VT_ESP8266"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "Sw_MidlRoom"
|
"path": "Sw_MidlRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "Sw_BigRoom"
|
"path": "Sw_BigRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ESP12SmallRoom",
|
"name": "ESP12SmallRoom",
|
||||||
"path": "ESP12SmallRoom"
|
"path": "ESP12SmallRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "Sw_Koridor"
|
"path": "Sw_Koridor"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "Sw_SmallRoom"
|
"path": "Sw_SmallRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "ESP_BigRoom"
|
"path": "ESP_BigRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "ESP_MidRoom"
|
"path": "ESP_MidRoom"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "KuhLight_ESP",
|
"name": "KuhLight_ESP",
|
||||||
"path": "KuhLight_ESP"
|
"path": "KuhLight_ESP"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "ESP_Kor"
|
"path": "ESP_Kor"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "ESP_Electro"
|
"path": "ESP_Electro"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "SerialGateWayMyS",
|
"name": "SerialGateWayMyS",
|
||||||
"path": "SerialGateWayMyS"
|
"path": "SerialGateWayMyS"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "MidRoomNLight",
|
"name": "MidRoomNLight",
|
||||||
"path": "MidRoomNLight"
|
"path": "MidRoomNLight"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "KorMYS",
|
"name": "KorMYS",
|
||||||
"path": "KorMYS"
|
"path": "KorMYS"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "Kuhnya"
|
"path": "Kuhnya"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ExtSens",
|
"name": "ExtSens",
|
||||||
"path": "ExtSens"
|
"path": "ExtSens"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "MainDoorMyS",
|
"name": "MainDoorMyS",
|
||||||
"path": "MainDoorMyS"
|
"path": "MainDoorMyS"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Rozetka",
|
"name": "Rozetka",
|
||||||
"path": "Rozetka"
|
"path": "Rozetka"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "RozetkaESP",
|
"name": "RozetkaESP",
|
||||||
"path": "RozetkaESP"
|
"path": "RozetkaESP"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "LightCtrlMyS",
|
"name": "LightCtrlMyS",
|
||||||
"path": "LightCtrlMyS"
|
"path": "LightCtrlMyS"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "BigRoomMyS",
|
"name": "BigRoomMyS",
|
||||||
"path": "BigRoomMyS"
|
"path": "BigRoomMyS"
|
||||||
}
|
},
|
||||||
],
|
{
|
||||||
"settings": {
|
"path": "ESP_Midroom2"
|
||||||
"terminal.integrated.env.windows": {
|
}
|
||||||
"PATH": "C:\\Users\\Lexa\\.platformio\\penv\\Scripts;C:\\Users\\Lexa\\.platformio\\penv;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;",
|
],
|
||||||
"PLATFORMIO_CALLER": "vscode"
|
"settings": {
|
||||||
},
|
"terminal.integrated.env.windows": {
|
||||||
"files.associations": {
|
"PATH": "C:\\Users\\Lexa\\.platformio\\penv\\Scripts;C:\\Users\\Lexa\\.platformio\\penv;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;;C:\\Python37\\Scripts\\;C:\\Python37\\;C:\\Python27\\;C:\\Python27\\Scripts;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\AMD\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;C:\\Program Files\\Microsoft SQL Server\\130\\Tools\\Binn\\;C:\\Program Files\\Microsoft VS Code\\bin;C:\\Program Files\\Microsoft\\Web Platform Installer\\;C:\\Program Files\\dotnet\\;C:\\Program Files\\PuTTY\\;C:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseSVN\\bin;C:\\Users\\Lexa\\AppData\\Local\\Microsoft\\WindowsApps;",
|
||||||
"*.tcc": "cpp",
|
"PLATFORMIO_CALLER": "vscode"
|
||||||
"list": "cpp",
|
},
|
||||||
"string": "cpp",
|
"files.associations": {
|
||||||
"vector": "cpp",
|
"*.tcc": "cpp",
|
||||||
"memory": "cpp",
|
"list": "cpp",
|
||||||
"random": "cpp",
|
"string": "cpp",
|
||||||
"initializer_list": "cpp"
|
"vector": "cpp",
|
||||||
},
|
"memory": "cpp",
|
||||||
"telemetry.enableTelemetry": false
|
"random": "cpp",
|
||||||
}
|
"initializer_list": "cpp"
|
||||||
|
},
|
||||||
|
"telemetry.enableTelemetry": false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -26,3 +26,4 @@ lib_deps =
|
|||||||
mathertel/LiquidCrystal_PCF8574 @ ^2.2.0
|
mathertel/LiquidCrystal_PCF8574 @ ^2.2.0
|
||||||
milesburton/DallasTemperature @ ^4.0.4
|
milesburton/DallasTemperature @ ^4.0.4
|
||||||
marvinroger/AsyncMqttClient @ ^0.9.0
|
marvinroger/AsyncMqttClient @ ^0.9.0
|
||||||
|
jandelgado/JLed @ ^4.15.0
|
||||||
|
|||||||
Reference in New Issue
Block a user