Dmitry Blinov ec39ac5c88 Fix conflicts: ...

1. Add thermostat to the espurna_modules in progmem.h
2. Add thermostat to webui, gulp, html, js.
3. in general.h MQTT_USE_JSON returned to 0 by default and 1 if thermostat enabled.

2019-03-08 01:02:11 +02:00

..

espurna

Fix conflicts:

2019-03-08 01:02:11 +02:00

html

Fix conflicts:

2019-03-08 01:02:11 +02:00

lib

Header-only RFM69Manager, fix dependiencies

2018-06-28 15:43:09 +02:00

.gitignore

Fix .gitignore for Visual Studio (#731)

2018-03-31 23:18:09 +02:00

astyle.conf

Added testing astyle configuration file

2017-03-12 11:08:21 +01:00

build.sh

Proper string test, strip any tag

2018-12-12 04:33:44 +03:00

debug.sh

Option to provide path to ELF file in debug utility

2018-11-22 21:32:31 +01:00

eagle.flash.1m0m1s.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

eagle.flash.1m0m2s.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

eagle.flash.2m1m4s.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

eagle.flash.4m1m4s.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

eagle.flash.4m3m4e.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

eagle.flash.512k0m1s.ld

Support for 2MB boards with 1MB SPIFFS and 4 sectors for EEPROM

2018-08-26 16:32:38 +02:00

extra_scripts.py

Fix codacy issues

2018-08-27 11:39:53 +02:00

gulpfile.js

Fix conflicts:

2019-03-08 01:02:11 +02:00

memanalyzer.py

Fix last % formatter. This was auto unpacking a tuple

2019-02-05 15:52:27 -08:00

ota.py

Make string formatting consistent

2019-02-05 15:45:39 -08:00

package-lock.json

web images

2018-12-09 21:11:12 +01:00

package.json

Update to gulp@4

2018-12-09 00:03:55 +03:00

platformio.ini

Add thermostat module

2019-03-03 12:17:34 +02:00

requirements.txt

Fix compatibility issues between python 2.7 and 3.X

2018-01-11 00:50:58 +01:00

symbols.sh

Symbols analyzer script

2018-06-14 11:32:54 +02:00