Commit Graph

1812 Commits

Author SHA1 Message Date
Xose Pérez
77b35e82e9 git stMerge branch 'dev' of github.com:xoseperez/espurna into dev 2018-06-26 11:54:53 +02:00
Xose Pérez
bce6774c17 Fix crash on loading malformed settings, option to load partial configuration 2018-06-26 11:54:27 +02:00
Xose Pérez
59d4afe6cb Merge pull request #987 from gn0st1c/patch-2
Update gulpfile.js
2018-06-25 21:32:52 +02:00
gn0st1c
913a24aef6 Update web.ino
tabs to spaces for consistency
2018-06-25 22:17:25 +03:00
gn0st1c
26e25650b2 Update gulpfile.js
tabs to spaces for consistency
2018-06-25 22:15:59 +03:00
Xose Pérez
c2e190614c Fix path 2018-06-25 13:42:53 +02:00
Xose Pérez
b4761323b0 Revert button font style 2018-06-25 13:40:30 +02:00
Xose Pérez
3c96668df9 Force adding data & static folders in pre-commit 2018-06-25 13:31:29 +02:00
Xose Pérez
f58f625303 Recover auth code 2018-06-25 13:28:53 +02:00
Xose Pérez
93b7f5b6b1 Move all platformio.ini common settings to common section 2018-06-25 12:53:17 +02:00
Xose Pérez
f6f60fd10d Remove module option from OTA Manager 2018-06-25 12:52:22 +02:00
Xose Pérez
0371a193d6 Check binary flash mode in web upgrade 2018-06-25 12:51:46 +02:00
Xose Pérez
cdac067d2f New reference to a Blitzwolf BW-SHP2 compatible device 2018-06-25 09:45:12 +02:00
Xose Pérez
9cb751079d Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-06-25 00:11:46 +02:00
Xose Pérez
1dc499e3ce Fix (again) webui image inclusion clauses (#981) 2018-06-25 00:11:02 +02:00
gn0st1c
e400cbb2be Update platformio.ini
*new platform 1.7.3
* changed remaining upload_port/upload_flags to get values from ENV ota.py
2018-06-24 14:47:45 +03:00
Xose Pérez
c791dd9b0f Merge pull request #969 from mcspr/travis-modules
Cover more modules with travis
2018-06-24 11:19:53 +02:00
Xose Pérez
c19cd166b2 Set version 1.13.1a 2018-06-23 20:06:15 +02:00
Xose Pérez
4dcbc0e329 Some devices still not using DOUT flash mode 2018-06-23 20:05:55 +02:00
Xose Pérez
61774e6b66 Comment back device, what a mess.... 2018-06-23 20:05:17 +02:00
Xose Pérez
5ed92570fa Fix stupid bug (#981) 2018-06-23 19:40:09 +02:00
Xose Pérez
cfbd071a71 Use full web UI image if device has more than one webui module (#981) 2018-06-23 19:35:20 +02:00
Xose Pérez
3edd8993c8 Fixing travis build now (#975) 2018-06-23 13:08:07 +02:00
Xose Pérez
c52df1d102 Fix webUI image include for RFBridge 2018-06-23 13:00:05 +02:00
Xose Pérez
432bcd0dd7 Revert "Fix build issues with Arduino IDE (#975)"
This reverts commit 1471a632bb.
2018-06-23 12:24:40 +02:00
Xose Pérez
1471a632bb Fix build issues with Arduino IDE (#975) 2018-06-23 12:01:39 +02:00
Xose Pérez
0c657a4a4a Version 1.13.0 2018-06-22 21:19:33 +02:00
Xose Pérez
aa4479aa64 Prebuild WebUI 2018-06-22 20:21:08 +02:00
Xose Pérez
e890af18e7 Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-06-22 20:20:21 +02:00
Xose Pérez
1c755cfb89 Pre-build the different available WebUI images 2018-06-22 20:19:39 +02:00
Xose Pérez
add909ee17 Rename Neo Coolcam device 2018-06-22 18:16:55 +02:00
Maxim Prokhorov
ddd9af2bf7 Cover more modules with travis 2018-06-22 06:22:43 +03:00
Maxim Prokhorov
857969b8ff Use relative protocol for deviceip href 2018-06-22 06:06:14 +03:00
Xose Pérez
5da801bffc Dump settings line by line to prevent memory issues (#896) 2018-06-21 18:54:12 +02:00
Xose Pérez
7b63521c80 Added map-stream to dependencies 2018-06-21 18:18:31 +02:00
Xose Pérez
2dd60912cc Silent webui build on commit 2018-06-21 18:09:34 +02:00
Xose Pérez
05a0ce953e Checking if node exists before building the web UI from PlatformIO 2018-06-21 17:35:51 +02:00
Xose Pérez
eabc45061a Remove merge marks 2018-06-21 10:13:17 +02:00
Xose Pérez
cbeb306891 Added BlitzWolf BW-SHP2 configuration to migrate module 2018-06-21 10:12:25 +02:00
Xose Pérez
ed42df275f Merge branch 'dev' into sensors 2018-06-21 10:07:54 +02:00
Xose Pérez
6fe3ef15eb Support for Bruno Horta's OnOfre board 2018-06-21 09:33:50 +02:00
Xose Pérez
303b54ee12 Fixed link between BUTTON3 and RELAY3 in IKE_ESPIKE 2018-06-21 09:18:06 +02:00
Maxim Prokhorov
bad39b22ac Show true binary size 2018-06-21 05:16:17 +00:00
Xose Pérez
a2196219f0 Update platformio 1.7.X branch 2018-06-21 00:50:43 +02:00
Xose Pérez
722b79cbe9 Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-06-21 00:40:32 +02:00
Xose Pérez
a96160f45c Merge pull request #958 from gn0st1c/patch-1
fixed some extra_script typos
2018-06-21 00:40:17 +02:00
Xose Pérez
52ca64eded Clean up builder files 2018-06-21 00:38:13 +02:00
Xose Pérez
6237847a8b Third test 2018-06-21 00:05:07 +02:00
Xose Pérez
f5a7a37940 Second test 2018-06-20 23:57:38 +02:00
Xose Pérez
9651fa5ce1 Detach gulp build from within extra_script 2018-06-20 23:46:44 +02:00