Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 23:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,522 Commits 23 Branches 75 Tags
8f0af3eb20c873dd620cff2a50c94de7c71ef47e
Commit Graph

1522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xose Pérez
8f0af3eb20 Merge pull request #706 from mcspr/mqtt-heartbeat-board 
Add 'board' to the MQTT heartbeat
 2018-03-22 10:44:45 +01:00
Xose Pérez
727c275525 Merge pull request #701 from wysiwyng/origin/dev 
Make switch schedules work again
 2018-03-22 10:44:10 +01:00
Maxim Prokhorov
d99a58676a Add 'board' to the MQTT heartbeat 2018-03-22 01:25:18 +03:00
wysiwyng
1bab8e0142 schedules properly fixed 2018-03-21 18:35:38 +01:00
wysiwyng
2348bc684e switch schedules work again 2018-03-20 22:34:49 +01:00
Xose Pérez
a2b175ac4b Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-03-19 07:40:53 +01:00
Xose Pérez
3350e2c822 Added gitter link 2018-03-19 07:39:31 +01:00
Xose Pérez
b75e1ea7d6 Do not show empty time strings (#691) 2018-03-19 07:14:19 +01:00
Xose Pérez
623cae65be Updated logo 2018-03-19 07:13:21 +01:00
Xose Pérez
f05ffe661c Merge pull request #693 from gn0st1c/patch-2 
set KMC HLW8012 upstream voltage resistor
 2018-03-19 05:52:44 +01:00
Xose Pérez
acf9217b94 Merge pull request #689 from Cabalist/dev 
Fix some typos in the Hass info
 2018-03-19 05:51:49 +01:00
gn0st1c
2ea551d417 set KMC HLW8012 upstream voltage resistor 
set KMC HLW8012 upstream voltage resistor to 2 * 1M
 2018-03-18 16:36:18 +03:00
Ryan Jarvis
e4e19426ed Fix some typos in the Hass info 2018-03-17 10:56:27 -07:00
Xose Pérez
fbc41ab44b Merge pull request #685 from gn0st1c/patch-1 
Update platformio.ini typo
 2018-03-16 07:48:01 +01:00
gn0st1c
370f6966e8 Update platformio.ini 
typo tonbux
 2018-03-16 05:48:21 +03:00
Xose Pérez
c886d9f1b7 Support for USA DST calculations (#664) 2018-03-15 23:10:27 +01:00
Xose Pérez
6150544dc8 Small changes 2018-03-15 22:17:30 +01:00
Xose Pérez
caf2ec7037 Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-03-15 22:14:43 +01:00
Xose Pérez
5155c3e203 Merge pull request #683 from gn0st1c/dev 
support for tunbox powerstrip02
 2018-03-15 22:14:23 +01:00
Xose Pérez
9892765b61 Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-03-15 22:06:48 +01:00
gn0st1c
7506f0542b support for Lingan SWA1 
support for Lingan SWA1
 2018-03-15 19:34:46 +03:00
gn0st1c
251f92a880 support for tunbox powerstrip02 
support for tunbox powerstrip02
 2018-03-15 18:36:43 +03:00
Xose Pérez
cec62fe3c4 Merge pull request #665 from lobradov/button-no-retain 
Buttons should not retain in MQTT
 2018-03-15 13:11:18 +01:00
Xose Pérez
9776672f0e Merge pull request #679 from phuonglm/improves/export-system-check-max 
Export max system check for build configuration
 2018-03-15 13:10:34 +01:00
Xose Pérez
8b97147735 Merge pull request #677 from mcspr/late-checkbox 
WebUI checkboxes improvements
 2018-03-15 13:09:35 +01:00
Xose Pérez
ce342a2c73 Merge pull request #673 from gn0st1c/dev 
update supported devices
 2018-03-15 13:09:16 +01:00
Ly Minh Phuong
4ebdae6131 Export max system check for build configuration 2018-03-15 19:05:32 +07:00
Maxim Prokhorov
e7f7df54b3 using faster "prop" method to find checked element 2018-03-15 11:52:56 +03:00
Maxim Prokhorov
04fa014bde use native selectors for checkboxes 2018-03-15 11:52:47 +03:00
Maxim Prokhorov
5dafb02cbf Resize checkboxes only when they are visible 2018-03-15 11:39:48 +03:00
gn0st1c
bf3f73f6cd supported devices update 
supported devices update
 2018-03-14 16:56:34 +03:00
Xose Pérez
eb697c8c86 Merge pull request #672 from gn0st1c/patch-1 
typo
 2018-03-14 12:56:33 +01:00
gn0st1c
869a4c91a0 typo 
png to jpg
 2018-03-14 10:09:06 +03:00
Xose Pérez
d4eb64ca7e Update NtpClientLib and use NTP_TIMEOUT (#452) 2018-03-13 08:52:08 +01:00
Xose Pérez
c69d47acd3 Fix codacy issues 2018-03-13 08:40:46 +01:00
Lazar Obradovic
3c2b2017c0 Buttons should not retain in MQTT 2018-03-12 14:23:28 +01:00
Xose Pérez
e46a904ff4 Fix codacy issues 2018-03-12 13:44:36 +01:00
Xose Pérez
65ead578ab Add inline info about the OBI device (#622) 2018-03-12 13:11:22 +01:00
Xose Pérez
f67a6e7aae Device images 2018-03-12 13:02:25 +01:00
Xose Pérez
77a90afa62 Update README 2018-03-12 12:55:18 +01:00
Xose Pérez
f048415463 Change web menu 2018-03-12 12:02:55 +01:00
Xose Pérez
2e872525f3 Added button to clear weblog 2018-03-12 11:49:31 +01:00
Xose Pérez
8777d29f7c Merge branch 'pwm-dimmer' of https://github.com/wysiwyng/espurna into wysiwyng-pwm-dimmer 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/html/custom.js
 2018-03-12 11:07:53 +01:00
Xose Pérez
b0e6183122 Merge branch 'a-tom-s-ResetRelay' into dev 2018-03-11 23:40:06 +01:00
Xose Pérez
94c57698e0 Merge branch 'ResetRelay' of https://github.com/a-tom-s/espurna into a-tom-s-ResetRelay 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/html/custom.js
 2018-03-11 23:39:52 +01:00
Xose Pérez
847e1e6390 Remove hostname limit size (#576, #659) 2018-03-11 22:56:20 +01:00
Xose Pérez
5f2b22d063 Fix web debug layout. Added command execution from web UI 2018-03-11 22:09:20 +01:00
Xose Pérez
9e99cab572 Merge pull request #658 from lobradov/web-console 
Debug console on web
 2018-03-11 18:27:44 +01:00
Xose Pérez
9b05d54f0c Merge pull request #647 from lobradov/travis-build-2 
Additional Travis build coverage
 2018-03-11 15:38:38 +01:00
Xose Pérez
5d4f66e7d2 Merge pull request #655 from gn0st1c/dev 
general update
 2018-03-11 15:35:58 +01:00