Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 15:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
547 Commits 23 Branches 75 Tags
55f529e65f5bcffdfd11c3fd398617c1d7b0c659
Commit Graph

105 Commits

Author SHA1 Message Date
Xose Pérez
36af250e10 Option to globally disable domoticz from web interface 2017-08-19 17:17:52 +02:00
Xose Pérez
a1d5082885 Fix typo in custom.js 2017-08-18 14:22:32 +02:00
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
Xose Pérez
c6b26efbb7 Merge 2017-08-18 14:06:58 +02:00
Xose Pérez
8a86c66e63 Hiding channel4 when useWhite 2017-08-18 13:41:29 +02:00
Xose Pérez
6a48374fe9 Add tooltips to sliders 2017-08-18 13:00:36 +02:00
Xose Pérez
8abb8ffaff Allow to define useColor, useWhite and useGamma from web interface 2017-08-18 12:35:35 +02:00
Xose Pérez
58a8feb90b Allow to disable color picker 2017-08-18 11:39:45 +02:00
Xose Pérez
e8ee08a1a6 Prevent form autocomplete 2017-08-14 17:27:03 +02:00
Xose Pérez
41189a65b4 API returns processed values for HLW and EMON. 404 means no data yet. Some clean up 2017-08-11 16:18:51 +02:00
Xose Pérez
79a5a47d87 Added help to the RFBridge panel 2017-08-10 17:44:50 +02:00
Xose Pérez
cf714106fb RFBridge web intrface 2017-08-10 15:31:15 +02:00
Xose Pérez
e6e9f9d6d4 Change the double click delay from the web interface 2017-07-24 00:22:38 +02:00
Xose Pérez
eb4855d5e6 Add option to merge messages into a JSON payload to web interface 2017-07-23 19:54:00 +02:00
Xose Pérez
a67c80de69 Small changes 2017-07-23 16:39:04 +02:00
Xose Pérez
65f30c668f Merge branch 'influxdb' into dev 
Conflicts:
	code/espurna/static/index.html.gz.h
 2017-07-16 17:09:32 +02:00
Xose Pérez
79a0816053 Accept decimals in pulse time, limit it to 60s 2017-07-16 09:10:57 +02:00
Xose Pérez
55bec8f033 Direct InfluxDB HTTP support 2017-07-15 11:30:32 +02:00
Lauris
5b28c51d2d Changed Powef Factor to be dimensionless number instead of % (used more often that way) 2017-06-18 22:52:01 +03:00
Lauris
39c09a3615 Using correct units for Apparent Power and Reactive Power 
Change resolution of current to 1ma (3 decimal places)
 2017-06-18 13:33:01 +03:00
Xose Pérez
c8eba6a979 NTP configuration in web interface 2017-05-20 23:50:26 +02:00
Xose Pérez
ec963a7568 Fix typo 2017-05-20 22:08:00 +02:00
Xose Pérez
fe26513473 Changes in status tab in the web interface 2017-05-20 08:52:57 +02:00
Xose Pérez
3a872979fe Show NTP status on web interface (#126) 2017-04-24 10:45:07 +02:00
Xose Pérez
3683011239 Merge branch 'dev' into webupgrade 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2017-03-26 21:15:31 +02:00
Xose Pérez
9c6ae488ca Force MQTT root topic to have a trailing slash, removing it from the subtopics 2017-03-24 08:35:11 +01:00
Xose Pérez
517d1fd3f6 Small changes in reset delays after web upgrade 2017-03-24 08:09:24 +01:00
Xose Pérez
a5f2cb6527 Upgrade form and handle code 2017-03-19 23:52:10 +01:00
Xose Pérez
18ec85da55 Send analog value to domoticz 2017-03-15 11:50:05 +01:00
Francesco Boscarino
7e066239b5 Merged in webfrank2/espurna/master (pull request #15) 
New analog module to read raw value from A0 pin

Approved-by: Xose Pérez
 2017-03-15 10:29:05 +00:00
Francesco Boscarino
8ba9ab4c08 New analog module to read raw value from A0 pin 2017-03-14 14:02:17 +01:00
Xose Pérez
9bf4a2b725 Enable embedded web by default 2017-03-12 22:17:33 +01:00
Xose Pérez
eb432ffe95 Normalize actions passed via websockets 2017-03-01 09:06:47 +01:00
Xose Pérez
9e75bdb45a Moving light code to its own module 2017-02-28 22:57:25 +01:00
Xose Pérez
77d7a48d5f Discard empty MQTT topics when subscribing 2017-02-28 22:48:24 +01:00
Xose Pérez
7254cacb1d Disabling colorpicker widget by default 2017-02-25 17:01:55 +01:00
Xose Pérez
8924d1b173 MY9291 and color picker 2017-02-24 23:16:51 +01:00
Xose Pérez
34116ac16d Basic check of the uploaded config file 2017-02-22 21:30:09 +01:00
Xose Pérez
23fae3e1e8 Added footer to web interface 2017-02-22 19:06:21 +01:00
Xose Pérez
39a81ea529 Backup and restore settings from file 2017-02-22 19:05:46 +01:00
Xose Pérez
758d166ccd Cleaner web embedding process 2017-02-20 23:34:40 +01:00
Xose Pérez
ec811f72df Authentication chanllenge only in /auth request 2017-02-17 23:43:18 +01:00
Xose Pérez
9d9f0e9a02 Embed images and favicon into HTML file 2017-02-17 23:38:29 +01:00
Xose Pérez
a65018f1b9 Fix new network auto-expand 2017-02-16 00:21:29 +01:00
Xose Pérez
eed5acc346 Unified web file to improve reliability 2017-02-15 17:23:06 +01:00
Xose Pérez
c578d7e868 Expand network configuration when adding a new network 2017-02-15 00:19:18 +01:00
Xose Pérez
21a11fd94a Issue #71. Replace placeholder hints with default values for netmask and dns fields 2017-02-15 00:19:04 +01:00
Xose Pérez
6402af4ab3 Issue #69. Allow temperatures to be reported in Fahrenheit degrees 2017-02-15 00:12:44 +01:00
Xose Pérez
bab4c9d433 Option to change the port the embedded webserver is listening to, defaults to 80 2017-02-14 00:21:07 +01:00
Xose Pérez
04c6fdb1b1 Rename connect method in JS and add some feedback messages 2017-02-11 00:29:03 +01:00