diff --git a/data/config.json b/data/config.json index 827b49ed..710b94ac 100644 --- a/data/config.json +++ b/data/config.json @@ -10,8 +10,8 @@ "mqttServer": "wqtt.ru", "mqttPort": 8021, "mqttPrefix": "/iotTest", - "mqttUser": "u_K1CK9Q", - "mqttPass": "YjyCloWS", + "mqttUser": "rise", + "mqttPass": "hostel3333", "scen": "1", "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo", "telegonof": "0", diff --git a/data/edit.htm.gz b/data/edit.htm.gz deleted file mode 100644 index 5786121f..00000000 Binary files a/data/edit.htm.gz and /dev/null differ diff --git a/data/icon.jpeg b/data/icon.jpeg deleted file mode 100644 index abdd18c0..00000000 Binary files a/data/icon.jpeg and /dev/null differ diff --git a/data/items/analog-adc.txt b/data/items/analog-adc.txt deleted file mode 100644 index 8bc0e914..00000000 --- a/data/items/analog-adc.txt +++ /dev/null @@ -1 +0,0 @@ -0;analog-adc;id;fillgauge;Сенсоры;Аналоговый;order;gol;map[0,1024,0,100];c[1] \ No newline at end of file diff --git a/data/items/bme280-hum.txt b/data/items/bme280-hum.txt deleted file mode 100644 index c8afd255..00000000 --- a/data/items/bme280-hum.txt +++ /dev/null @@ -1 +0,0 @@ -0;bme280-hum;id;anydataHum;Сенсоры;Влажность;order;addr[0x76];c[1] \ No newline at end of file diff --git a/data/items/bme280-press.txt b/data/items/bme280-press.txt deleted file mode 100644 index f79973e2..00000000 --- a/data/items/bme280-press.txt +++ /dev/null @@ -1 +0,0 @@ -0;bme280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] \ No newline at end of file diff --git a/data/items/bme280-temp.txt b/data/items/bme280-temp.txt deleted file mode 100644 index 6e5e9003..00000000 --- a/data/items/bme280-temp.txt +++ /dev/null @@ -1 +0,0 @@ -0;bme280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] \ No newline at end of file diff --git a/data/items/bmp280-press.txt b/data/items/bmp280-press.txt deleted file mode 100644 index 44b9e8c9..00000000 --- a/data/items/bmp280-press.txt +++ /dev/null @@ -1 +0,0 @@ -0;bmp280-press;id;anydataPress;Сенсоры;Давление;order;addr[0x76];c[1] \ No newline at end of file diff --git a/data/items/bmp280-temp.txt b/data/items/bmp280-temp.txt deleted file mode 100644 index c3cb42eb..00000000 --- a/data/items/bmp280-temp.txt +++ /dev/null @@ -1 +0,0 @@ -0;bmp280-temp;id;anydataTemp;Сенсоры;Температура;order;addr[0x76];c[1] \ No newline at end of file diff --git a/data/items/button-in.txt b/data/items/button-in.txt deleted file mode 100644 index 79d79ec9..00000000 --- a/data/items/button-in.txt +++ /dev/null @@ -1 +0,0 @@ -0;button-in;id;toggle;Кнопки;Освещение;order;pin;db[20] \ No newline at end of file diff --git a/data/items/button-out.inv.txt b/data/items/button-out.inv.txt deleted file mode 100644 index 5499a108..00000000 --- a/data/items/button-out.inv.txt +++ /dev/null @@ -1 +0,0 @@ -0;button-out;id;toggle;Кнопки;Освещение;order;pin;inv[1] \ No newline at end of file diff --git a/data/items/button-out.npin.txt b/data/items/button-out.npin.txt deleted file mode 100644 index ecffd881..00000000 --- a/data/items/button-out.npin.txt +++ /dev/null @@ -1 +0,0 @@ -0;button-out;id;toggle;Кнопки;Освещение;order \ No newline at end of file diff --git a/data/items/button-out.pin.txt b/data/items/button-out.pin.txt deleted file mode 100644 index b0645025..00000000 --- a/data/items/button-out.pin.txt +++ /dev/null @@ -1 +0,0 @@ -0;button-out;id;toggle;Кнопки;Освещение;order;pin \ No newline at end of file diff --git a/data/items/count-down.txt b/data/items/count-down.txt deleted file mode 100644 index 3300573c..00000000 --- a/data/items/count-down.txt +++ /dev/null @@ -1 +0,0 @@ -0;count-down;id;anydata;Таймер;Обратный#отчет;order \ No newline at end of file diff --git a/data/items/dallas-temp.txt b/data/items/dallas-temp.txt deleted file mode 100644 index 0da8bdca..00000000 --- a/data/items/dallas-temp.txt +++ /dev/null @@ -1 +0,0 @@ -0;dallas-temp;id;anydataTemp;Сенсоры;Температура;order;sal;index[0];int[10] \ No newline at end of file diff --git a/data/items/dht11-hum.txt b/data/items/dht11-hum.txt deleted file mode 100644 index b7d9a820..00000000 --- a/data/items/dht11-hum.txt +++ /dev/null @@ -1 +0,0 @@ -0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;thd;type[dht11];c[1] \ No newline at end of file diff --git a/data/items/dht11-temp.txt b/data/items/dht11-temp.txt deleted file mode 100644 index 39c5e949..00000000 --- a/data/items/dht11-temp.txt +++ /dev/null @@ -1 +0,0 @@ -0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;thd;type[dht11];c[1] \ No newline at end of file diff --git a/data/items/dht22-hum.txt b/data/items/dht22-hum.txt deleted file mode 100644 index ab69cf97..00000000 --- a/data/items/dht22-hum.txt +++ /dev/null @@ -1 +0,0 @@ -0;dht-hum;id;anydataHum;Сенсоры;Влажность;order;thd;type[dht22];c[1] \ No newline at end of file diff --git a/data/items/dht22-temp.txt b/data/items/dht22-temp.txt deleted file mode 100644 index d14a434d..00000000 --- a/data/items/dht22-temp.txt +++ /dev/null @@ -1 +0,0 @@ -0;dht-temp;id;anydataTemp;Сенсоры;Температура;order;thd;type[dht22];c[1] \ No newline at end of file diff --git a/data/items/impuls-out.txt b/data/items/impuls-out.txt deleted file mode 100644 index 99994ae5..00000000 --- a/data/items/impuls-out.txt +++ /dev/null @@ -1 +0,0 @@ -0;impuls-out;id;na;na;na;order;pin \ No newline at end of file diff --git a/data/items/input-digit.txt b/data/items/input-digit.txt deleted file mode 100644 index 7df7260e..00000000 --- a/data/items/input-digit.txt +++ /dev/null @@ -1 +0,0 @@ -0;inoutput;id;inputDigit;Ввод;Введите#цифру;order \ No newline at end of file diff --git a/data/items/input-time.txt b/data/items/input-time.txt deleted file mode 100644 index 3fc078b0..00000000 --- a/data/items/input-time.txt +++ /dev/null @@ -1 +0,0 @@ -0;inoutput;id;inputTime;Ввод;Введите#время;order \ No newline at end of file diff --git a/data/items/logging.txt b/data/items/logging.txt deleted file mode 100644 index 8253774f..00000000 --- a/data/items/logging.txt +++ /dev/null @@ -1 +0,0 @@ -0;logging;id;chart;Графики;История;order;val[any];int[60];cnt[100] \ No newline at end of file diff --git a/data/items/modbus.txt b/data/items/modbus.txt deleted file mode 100644 index a782395a..00000000 --- a/data/items/modbus.txt +++ /dev/null @@ -1 +0,0 @@ -0;modbus;id;anydata;Modbus;Регистр;order;addr[1];reg[0];c[1] \ No newline at end of file diff --git a/data/items/output-text.txt b/data/items/output-text.txt deleted file mode 100644 index 65d45284..00000000 --- a/data/items/output-text.txt +++ /dev/null @@ -1 +0,0 @@ -0;inoutput;id;anydata;Вывод;Сигнализация;order \ No newline at end of file diff --git a/data/items/pwm-out.txt b/data/items/pwm-out.txt deleted file mode 100644 index 2acbb459..00000000 --- a/data/items/pwm-out.txt +++ /dev/null @@ -1 +0,0 @@ -0;pwm-out;id;range;Ползунки;Яркость;order;pin \ No newline at end of file diff --git a/data/items/uart-button.txt b/data/items/uart-button.txt deleted file mode 100644 index ee2a6b22..00000000 --- a/data/items/uart-button.txt +++ /dev/null @@ -1 +0,0 @@ -0;button-out;id;toggle;Кнопки;Освещение;order;type[UART] \ No newline at end of file diff --git a/data/items/uart-widget.txt b/data/items/uart-widget.txt deleted file mode 100644 index 469ab016..00000000 --- a/data/items/uart-widget.txt +++ /dev/null @@ -1 +0,0 @@ -0;inoutput;id;anydata;Вывод;Вывод#uart;order \ No newline at end of file diff --git a/data/items/ultrasonic-cm.txt b/data/items/ultrasonic-cm.txt deleted file mode 100644 index c5d518c3..00000000 --- a/data/items/ultrasonic-cm.txt +++ /dev/null @@ -1 +0,0 @@ -0;ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;cin;map[0,500,0,100];c[1];int[10] \ No newline at end of file diff --git a/data/items/uptime.txt b/data/items/uptime.txt deleted file mode 100644 index 972241b4..00000000 --- a/data/items/uptime.txt +++ /dev/null @@ -1 +0,0 @@ -0;uptime;id;anydataTime;Системные;%name%#uptime;order \ No newline at end of file diff --git a/data/presets/1.c.txt b/data/presets/1.c.txt deleted file mode 100644 index abcd06dc..00000000 --- a/data/presets/1.c.txt +++ /dev/null @@ -1,5 +0,0 @@ -0;dallas-temp;temp;anydataTemp;Термостат;Температура;1;pin[2];index[0];int[10] -0;logging;log;chart;Термостат;История;2;val[temp];int[60];cnt[100] -0;inoutput;inputU;inputDigit;Термостат;Верхний#порог;3 -0;inoutput;inputL;inputDigit;Термостат;Нижний#порог;4 -0;button-out;button;toggle;Термостат;Нагрев;5;pin[12] \ No newline at end of file diff --git a/data/presets/1.s.txt b/data/presets/1.s.txt deleted file mode 100644 index dc4c8c07..00000000 --- a/data/presets/1.s.txt +++ /dev/null @@ -1,8 +0,0 @@ -temp > inputU -button 0 -telegram нагрев#выключен 1 -end -temp < inputL -button 1 -telegram нагрев#включен 1 -end \ No newline at end of file diff --git a/data/presets/2.c.txt b/data/presets/2.c.txt deleted file mode 100644 index d91fa5c7..00000000 --- a/data/presets/2.c.txt +++ /dev/null @@ -1,12 +0,0 @@ -0;dallas-temp;temp;anydataTemp;Термостат;Температура;1;pin[2];index[0];int[60] -0;logging;log;chart;Термостат;История;2;val[temp];int[10];cnt[100] -0;inoutput;threshold;inputDigitTemp;Термостат;Заданная#температура;3 -0;button-out;heater;toggle;Термостат;Нагреватель;7;pin[12] -0;inoutput;time1;inputTimeClock;Расписание;Утренний#период;8 -0;inoutput;threshold1;inputDigitTemp;Расписание;Температура;9 -0;inoutput;time2;inputTimeClock;Расписание;Дневной#период;10 -0;inoutput;threshold2;inputDigitTemp;Расписание;Температура;11 -0;inoutput;time3;inputTimeClock;Расписание;Вечерний#период;12 -0;inoutput;threshold3;inputDigitTemp;Расписание;Температура;13 -0;inoutput;time4;inputTimeClock;Расписание;Ночной#период;14 -0;inoutput;threshold4;inputDigitTemp;Расписание;Температура;15 \ No newline at end of file diff --git a/data/presets/2.s.txt b/data/presets/2.s.txt deleted file mode 100644 index 5a6f36f1..00000000 --- a/data/presets/2.s.txt +++ /dev/null @@ -1,18 +0,0 @@ -temp > threshold+-2 -heater 0 -end -temp < threshold+-2 -heater 1 -end -timenow = time1 -threshold threshold1 -end -timenow = time2 -threshold threshold2 -end -timenow = time3 -threshold threshold3 -end -timenow = time4 -threshold threshold4 -end \ No newline at end of file diff --git a/data/presets/3.c.txt b/data/presets/3.c.txt deleted file mode 100644 index fb2c602b..00000000 --- a/data/presets/3.c.txt +++ /dev/null @@ -1,5 +0,0 @@ -0;dht-hum;hum;anydataHum;Теплица;Влажность;1;pin[2];type[dht11];c[1] -0;logging;log;chart;Теплица;История;2;val[hum];int[60];cnt[100] -0;inoutput;inputU;inputDigit;Теплица;Верхний#порог;3 -0;inoutput;inputL;inputDigit;Теплица;Нижний#порог;4 -0;button-out;button;toggle;Теплица;Полив;5;pin[12] \ No newline at end of file diff --git a/data/presets/3.s.txt b/data/presets/3.s.txt deleted file mode 100644 index f69cdc54..00000000 --- a/data/presets/3.s.txt +++ /dev/null @@ -1,8 +0,0 @@ -hum > inputU -button 0 -telegram полив#выключен 1 -end -hum < inputL -button 1 -telegram полив#включен 1 -end \ No newline at end of file diff --git a/data/presets/4.c.txt b/data/presets/4.c.txt deleted file mode 100644 index 3f1ccaa1..00000000 --- a/data/presets/4.c.txt +++ /dev/null @@ -1,4 +0,0 @@ -0;button-out;button1;toggle;Реле;Освещение;1;pin[12] -0;button-out;button2;toggle;Реле;Освещение;2;pin[13] -0;inoutput;T1;inputTime;Реле;Введите#время#включения;3 -0;inoutput;T2;inputTime;Реле;Введите#время#выключения;4 \ No newline at end of file diff --git a/data/presets/4.s.txt b/data/presets/4.s.txt deleted file mode 100644 index 844d1c5b..00000000 --- a/data/presets/4.s.txt +++ /dev/null @@ -1,8 +0,0 @@ -timenow = T1 -button1 1 -button2 0 -end -timenow = T2 -button1 0 -button2 1 -end \ No newline at end of file diff --git a/data/presets/5.c.txt b/data/presets/5.c.txt deleted file mode 100644 index 359a7a52..00000000 --- a/data/presets/5.c.txt +++ /dev/null @@ -1,7 +0,0 @@ -0;button-out;button-out-1;toggle;Кнопки;Выключить#все;1 -0;button-out;button-out-2;toggle;Кнопки;Гостинная;2;pin[12] -0;button-out;button-out-3;toggle;Кнопки;Спальня;3;pin[13] -0;button-out;button-out-4;toggle;Кнопки;Прихожая;4;pin[14] -0;pwm-out;pwm-out-5;range;Кнопки;Яркость;5;pin[15] -0;pwm-out;pwm-out-6;range;Кнопки;Яркость;6;pin[16] -0;inoutput;output-text-7;anydata;Кнопки;Статус;7 \ No newline at end of file diff --git a/data/presets/5.s.txt b/data/presets/5.s.txt deleted file mode 100644 index 0424728a..00000000 --- a/data/presets/5.s.txt +++ /dev/null @@ -1,16 +0,0 @@ -button-out-1 = 1 -button-out-2 1 -button-out-3 1 -button-out-4 1 -pwm-out-5 200 -pwm-out-6 800 -output-text-7 включено -end -button-out-1 = 0 -button-out-2 0 -button-out-3 0 -button-out-4 0 -pwm-out-5 800 -pwm-out-6 200 -output-text-7 выключено -end \ No newline at end of file diff --git a/data/presets/6.c.txt b/data/presets/6.c.txt deleted file mode 100644 index c7fd096a..00000000 --- a/data/presets/6.c.txt +++ /dev/null @@ -1,3 +0,0 @@ -0;button-out;button;toggle;Таймер;Освещение;1;pin[12] -0;count-down;count;anydata;Таймер;Обратный#отчет;2 -0;inoutput;input;inputDigit;Таймер;Введите#цифру;3 \ No newline at end of file diff --git a/data/presets/6.s.txt b/data/presets/6.s.txt deleted file mode 100644 index 06b70a4a..00000000 --- a/data/presets/6.s.txt +++ /dev/null @@ -1,6 +0,0 @@ -button = 1 -count input -end -count = 0 -button 0 -end \ No newline at end of file diff --git a/data/presets/7.c.txt b/data/presets/7.c.txt deleted file mode 100644 index 984c6b8d..00000000 --- a/data/presets/7.c.txt +++ /dev/null @@ -1,4 +0,0 @@ -0;inoutput;text;anydataAlarm;Сигнализация;Движение:;1 -0;inoutput;time;anydataTime;Сигнализация;Время:;2 -0;button-in;sensor;na;na;na;3;pin[0];db[20] -0;button-out;reset;toggle;Сигнализация;Сбросить;4 \ No newline at end of file diff --git a/data/presets/7.s.txt b/data/presets/7.s.txt deleted file mode 100644 index 32d28e78..00000000 --- a/data/presets/7.s.txt +++ /dev/null @@ -1,10 +0,0 @@ -sensor = 1 -text обнаружено -time %date% -telegram text обнаружено#движение 1 -end -reset = 1 -text не#обнаружено -time %date% -reset 0 -end \ No newline at end of file diff --git a/data/presets/8.c.txt b/data/presets/8.c.txt deleted file mode 100644 index d18bdd0b..00000000 --- a/data/presets/8.c.txt +++ /dev/null @@ -1,4 +0,0 @@ -0;button-in;sensor;na;na;na;1;pin[0];db[20] -0;button-out;light;toggle;Освещение;Освещение;2;pin[13] -0;count-down;count;anydata;Освещение;Обратный#отчет;3 -0;inoutput;period;inputDigit;Освещение;Период#включения;4 \ No newline at end of file diff --git a/data/presets/8.s.txt b/data/presets/8.s.txt deleted file mode 100644 index 10d55654..00000000 --- a/data/presets/8.s.txt +++ /dev/null @@ -1,7 +0,0 @@ -sensor = 1 -light 1 -count period -end -count = 0 -light 0 -end \ No newline at end of file diff --git a/data/presets/9.c.txt b/data/presets/9.c.txt deleted file mode 100644 index 502f3ae4..00000000 --- a/data/presets/9.c.txt +++ /dev/null @@ -1,2 +0,0 @@ -0;button-out;light;toggle;Кнопки;Освещение;1;pin[13] -0;button-in;switch;na;na;na;2;pin[0];db[20] \ No newline at end of file diff --git a/data/presets/9.s.txt b/data/presets/9.s.txt deleted file mode 100644 index 6f6d7dcc..00000000 --- a/data/presets/9.s.txt +++ /dev/null @@ -1,3 +0,0 @@ -switch = 1 -light change -end \ No newline at end of file diff --git a/include/Consts.h b/include/Consts.h index 941df935..ceeb1dd2 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -2,7 +2,7 @@ //===========Firmware============================================================================================================================================= #define FIRMWARE_VERSION 272 -//#define FLASH_SIZE_1MB true +#define FLASH_SIZE_1MB true #ifdef ESP8266 #ifdef FLASH_SIZE_1MB #define FIRMWARE_NAME "esp8266-1mb" diff --git a/platformio.ini b/platformio.ini index 7b6ac912..5040336a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266 +default_envs = esp8266_01_1m ;============================================================================================================================================= [common_env_data] lib_deps_external = @@ -36,6 +36,7 @@ extra_scripts = ./tools/littlefsbuilder.py [env:esp8266_01_1m] framework = arduino ;board = esp01_1m +;board = esp12e board = nodemcuv2 board_build.ldscript = eagle.flash.1m256.ld platform = https://github.com/platformio/platform-espressif8266.git