369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gunnar Skjold	fc42fb22d8	Merge pull request #33 from gskjold/dev-v1.0.1 ... Dev v1.0.1 v1.0.1	2020-02-16 14:49:36 +01:00
Gunnar Skjold	4e24e2949a	Updated featheresp32 config to use Serial2 for Mbus	2020-02-15 18:01:10 +01:00
Gunnar Skjold	b2174dd521	If debug mode and HW_ROARFRED, use software serial to set upp RX for HAN with 2400 and TX for debugging with 115200	2020-02-14 20:14:30 +01:00
Gunnar Skjold	fe79a96827	Added change to allow auto modem sleep	2020-02-14 19:52:15 +01:00
Gunnar Skjold	554cc7c023	Added date and time from meter as rtc in json	2020-02-14 16:03:52 +01:00
Gunnar Skjold	d2f93c07bd	Not sure if this does anything, but increased json and mqtt limits to see if Kamstrup list 3 is received	2020-02-13 20:50:13 +01:00
Gunnar Skjold	b6efae656f	Expose export power in JSON	2020-02-12 16:40:51 +01:00
Gunnar Skjold	fa0f93cefe	Switched to reactive import for Q	2020-02-12 13:25:36 +01:00
Gunnar Skjold	058dc658c1	Switched to reactive import for Q	2020-02-12 13:16:49 +01:00
Gunnar Skjold	4b9cb27e58	Disable web security if AP mode is triggered	2020-02-11 17:32:18 +01:00
Gunnar Skjold	5f14517258	Minor changes after testing MQTT reconnect	2020-02-11 17:25:52 +01:00
Gunnar Skjold	ad820fff01	Allow other services to get resources while trying to connect to mqtt	2020-02-11 11:04:37 +01:00
Gunnar Skjold	99a23b3bf7	Cropped webui image v1.0.0	2020-02-09 13:19:48 +01:00
Gunnar Skjold	15e861ce70	Added AP mode pin for both Wemos D1 and D32	2020-02-09 12:18:08 +01:00
Gunnar Skjold	fdfadb9bf9	Updated Aidon parser with support for 3 phase IT/TT system	2020-02-08 18:23:56 +01:00
Gunnar Skjold	388d35c390	Updated documentation	2020-02-07 23:12:27 +01:00
Gunnar Skjold	e466a45b5c	Fixed missing check in checkbox when configuration opened in firefox	2020-02-07 22:33:55 +01:00
Gunnar Skjold	2e7b9e8e43	Fixed missing check in checkbox when configuration opened in firefox	2020-02-07 22:26:17 +01:00
Gunnar Skjold	deb2148e9a	Software serial for development boards. Added a few extra boards	2020-02-07 17:27:58 +01:00
Gunnar Skjold	3a7f6078f4	Use builtin LED for Lolin D32	2020-02-06 19:02:05 +01:00
Gunnar Skjold	dbc551a41d	Moved configuration object to main file and load the config before start. Fixed issue where partiy is switched for Kamstrup half way when in debug mode	2020-02-05 20:43:37 +01:00
Gunnar Skjold	9bb596aab1	Reverted what was intended as support for earlier configuration versions.	2020-02-02 08:15:49 +01:00
Gunnar Skjold	4a3d22e75c	Fixed script to generate webroot header files	2020-02-01 09:57:43 +01:00
Gunnar Skjold	d68ffc827d	Trigger build on changes in scripts and web	2020-02-01 09:56:14 +01:00
Gunnar Skjold	20c62a63cf	Fixed script to generate webroot header files	2020-02-01 09:54:58 +01:00
Gunnar Skjold	8f85b43fc3	Made MQTT optional	2020-02-01 09:52:37 +01:00
Gunnar Skjold	57d8603790	Added option for electric distribution system (230/400)	2020-01-31 21:30:20 +01:00
Gunnar Skjold	fc1f1554d8	Extracted webroot into usable files	2020-01-31 21:08:27 +01:00
Gunnar Skjold	ced6f125fd	Trigger build on changing ini file	2020-01-29 20:58:09 +01:00
Gunnar Skjold	f76cacf835	Trigger build on changing ini file	2020-01-29 20:56:31 +01:00
Gunnar Skjold	a8205edae9	Fixed build after merge	2020-01-29 20:53:52 +01:00
Gunnar Skjold	e9ed6d825a	Merge pull request #14 from gskjold/issue-9 ... New web interface that is always available	2020-01-29 20:50:26 +01:00
Gunnar Skjold	378dbbcc99	Only show phases with power, and always deliver volts and amps to frontend	2020-01-29 20:38:53 +01:00
Gunnar Skjold	36b37eb2a6	Calculate max power when receiving json from reader	2020-01-28 21:18:48 +01:00
Gunnar Skjold	7e4047096b	Stripped away bootstrap css and created a smaller boot.css as replacement. Load real bootstrap from CDN. Added HTML only (non-js) view of data	2020-01-28 21:10:54 +01:00
Gunnar Skjold	7fdedd8bcf	Forgot some changes	2020-01-28 19:20:50 +01:00
Gunnar Skjold	f693869bd4	Merge branch 'master' into issue-9	2020-01-28 19:18:13 +01:00
Gunnar Skjold	3312f88804	Some changes to make it compile for both ESP8266 and ESP32 v0.2.0	2020-01-28 18:17:20 +01:00
Gunnar Skjold	50faaca559	Moved Base64 lib	2020-01-24 14:54:42 +01:00
Gunnar Skjold	bf44849ecf	Added base64 lib directly into this project to fix build problem with esp32	2020-01-24 14:52:14 +01:00
Gunnar Skjold	4bfd9dee9a	Merge pull request #10 from gskjold/issue-6 ... Make the configuration page available all the time	2020-01-24 14:47:29 +01:00
Gunnar Skjold	32d58fdd71	Stripped jquery and full bootstrap from image	2020-01-23 19:45:29 +01:00
Gunnar Skjold	0fa3e3585a	Finalized live update of meter data in web gui	2020-01-19 21:37:56 +01:00
Gunnar Skjold	a88291c0f0	Implemented new user interface and prepared for live view	2020-01-17 21:49:36 +01:00
Gunnar Skjold	ac1609bfac	Merge branch 'issue-6' into issue-9	2020-01-17 19:17:44 +01:00
Gunnar Skjold	22d5839d60	Added HTML, CSS and JS for new user interface	2020-01-17 14:41:02 +01:00
Gunnar Skjold	8f0932f1f1	Added configurable basic auth to web server	2020-01-15 21:22:06 +01:00
Gunnar Skjold	aeb161455e	Enable config page on runtime with populated form	2020-01-15 20:17:06 +01:00
Gunnar Skjold	568180d7b2	Update release.yml	2019-12-12 19:49:22 +01:00
Gunnar Skjold	0d99da6c9a	Update build.yml	2019-12-12 19:48:22 +01:00