Xose Pérez 3c21dc3e78 Merge branch 'dev' into light ...

Conflicts:
	code/espurna/config/general.h
	code/espurna/config/hardware.h
	code/espurna/hardware.ino
	code/html/custom.css
	code/html/custom.js

2017-08-18 14:17:20 +02:00

..

espurna

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00

html

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00

lib

Using my9291 external library reference

2017-02-25 11:29:52 +01:00

.gitignore

Processed web interfaces files

2017-02-22 19:08:32 +01:00

.travis.yml

Preliminary support for Sonoff POW

2016-11-12 14:51:49 +01:00

astyle.conf

Added testing astyle configuration file

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

build-all

Added Sonoff Touch to build-all script

2017-07-17 06:32:08 +02:00

build-fs

Changed fs build command to use local gulp instance

2017-01-23 11:50:52 +01:00

debug

Move all Arduino IDE configuration values to their own file

2017-01-11 23:23:02 +01:00

deploy

Complete update

2016-10-06 11:53:58 +02:00

esp8266.flash.1m0.ld

Cleanup gulp files

2017-07-21 13:32:20 +02:00

gulpfile.js

Small changes

2017-07-23 16:39:04 +02:00

package.json

Cleanup gulp dependencies

2017-07-14 23:00:04 +02:00

platformio.ini

Merge branch 'dev' into light

2017-08-18 14:17:20 +02:00