433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gunnar Skjold	30d73c3a6e	Updated documentation v1.1.0	2020-03-01 13:24:06 +01:00
Gunnar Skjold	bd905c3595	Merge pull request #44 from gskjold/dev-v1.1.0 ... Dev v1.1.0	2020-03-01 12:56:12 +01:00
Gunnar Skjold	1a2e70b1fb	Merge pull request #42 from ArnieO/dev-v1.1.0 ... Dev v1.1.0 Optional ESP8266 Vcc calibration factor in *.ini file	2020-03-01 12:53:56 +01:00
Gunnar Skjold	d6da7b2715	Merge branch 'dev-v1.1.0' of github.com:gskjold/AmsToMqttBridge into dev-v1.1.0	2020-03-01 09:41:18 +01:00
Gunnar Skjold	059a430f9a	Fixed problem with AP mode with INVALID_BUTTON_PIN set	2020-03-01 09:39:58 +01:00
Gunnar Skjold	8ade50c2a6	Initialize all meter data to 0. Removed calculations for i2	2020-02-26 09:06:29 +01:00
Gunnar Skjold	5b94d8ff61	Added calculated value for L2 current when missing from Aidon	2020-02-25 14:08:04 +01:00
ArnieO	232b9c279d	Optional Vcc calibration factor defined in *.ino	2020-02-24 20:05:34 +01:00
ArnieO	9b6a6af6ec	Merge remote-tracking branch 'upstream/dev-v1.1.0' into dev-v1.1.0	2020-02-24 13:32:26 +01:00
Gunnar Skjold	9671e1eba3	Fixed bug where UI showed stalled HAN when exporting power. Also, maybe fixed issue with Vcc precision in UI?	2020-02-24 12:01:51 +01:00
Gunnar Skjold	78e531a7e9	Changed term for production and consumption when local production is defined v1.1-rc1	2020-02-24 07:47:39 +01:00
Gunnar Skjold	478d63505d	Allow compiling when RGB is not defined	2020-02-24 07:47:12 +01:00
Gunnar Skjold	d8dfaaa730	Version hardening	2020-02-24 07:46:48 +01:00
Gunnar Skjold	f311b70b37	Merge branch 'master' into dev-v1.1.0	2020-02-24 07:17:48 +01:00
Gunnar Skjold	52bc2b14c9	Some changes after testing	2020-02-23 20:31:10 +01:00
ArnieO	2ddfc16d6a	Updated comment for rgbled() function	2020-02-23 17:12:26 +01:00
Gunnar Skjold	51ab4a7f07	Reducing precision on temperature and vcc in json to reduce length	2020-02-23 11:34:25 +01:00
Gunnar Skjold	e90a30bfde	Implemented blinking for red LED on error	2020-02-22 17:23:56 +01:00
Gunnar Skjold	a63e6962d3	Merge pull request #38 from ArnieO/dev-v1.1.0 ... Added code for optional RGB LED	2020-02-22 16:42:19 +01:00
Gunnar Skjold	951ccf7de5	Merge branch 'dev-v1.1.0' into dev-v1.1.0	2020-02-22 16:42:04 +01:00
Gunnar Skjold	001e3376df	Merge pull request #39 from gskjold/dev-v1.1.0-mqttraw ... Merged code preparations for other MQTT payload formats	2020-02-22 16:37:29 +01:00
Gunnar Skjold	9e4bf93f0a	Some changes to reduce dlms read errors	2020-02-22 12:29:04 +01:00
ArnieO	e5ac823f69	Changed mqtt buffer to 384, JSON buffer to <512>	2020-02-21 23:29:01 +01:00
Gunnar Skjold	73fd228e2f	Merge branch 'dev-v1.1.0' into dev-v1.1.0-mqttraw	2020-02-21 20:58:17 +01:00
Gunnar Skjold	fdac8f88af	Minor optimization	2020-02-21 20:52:55 +01:00
Gunnar Skjold	9c8552869c	Preparations for selectable MQTT payload format	2020-02-21 20:51:55 +01:00
ArnieO	be75b013c0	Added code for RGB LED	2020-02-21 19:13:44 +01:00
ArnieO	79274e490d	Added code for RGB LED	2020-02-21 18:53:05 +01:00
ArnieO	47293eebe4	Added code for RGB LED	2020-02-21 18:38:28 +01:00
Gunnar Skjold	90b62638ed	Dependency hardening	2020-02-20 20:36:12 +01:00
Gunnar Skjold	78e766156d	Minimizing calls to web server	2020-02-18 21:33:41 +01:00
Gunnar Skjold	4b32af69a7	Fixed typo v1.0.3 v1.0.2	2020-02-18 07:37:42 +01:00
Gunnar Skjold	916b5550d9	Fixed typo	2020-02-18 07:25:10 +01:00
Gunnar Skjold	48016240f9	Some cleanup after testing with ESP32	2020-02-17 20:06:52 +01:00
Gunnar Skjold	518b408205	Minor changes to fix build	2020-02-17 17:23:18 +01:00
Gunnar Skjold	73a0359597	Minor changes to fix build	2020-02-17 17:21:34 +01:00
Gunnar Skjold	bbe82f9cdc	Added a small delay that helped smooth the voltage on a HAN powered device. No more sudden reboots	2020-02-16 21:45:58 +01:00
Gunnar Skjold	4786735d4c	Support older config versions. Fixed css for AP mode. Some cleanup and changes to preserve power	2020-02-16 20:09:29 +01:00
Gunnar Skjold	227eb7b6ff	Now using external base64 lib. Also updated some previously commited errors	2020-02-16 16:03:01 +01:00
Gunnar Skjold	00edd94033	Fixed some bugs from late night coding	2020-02-16 15:46:01 +01:00
Gunnar Skjold	ccd818e1ab	Merge branch 'master' into dev-v1.1.0	2020-02-16 15:28:47 +01:00
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	f6066fbbf3	Cleanup and fix bugs found during testing	2020-02-15 22:13:04 +01:00
Gunnar Skjold	9c09740a41	Production graph and fixed vcc value	2020-02-15 21:04:18 +01:00
Gunnar Skjold	4e24e2949a	Updated featheresp32 config to use Serial2 for Mbus	2020-02-15 18:01:10 +01:00
Gunnar Skjold	eff00f1fe0	Only show temp if sensor is attached. Added common functions to get temp and vcc	2020-02-14 21:48:03 +01:00
Gunnar Skjold	f484f3eb0e	Merge branch 'dev-v1.0.1' into dev-v1.1.0	2020-02-14 20:19:15 +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	517a40b0a6	Finalized new configuration menu and moved AP button trigger from setup to loop	2020-02-14 19:49:25 +01:00