github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-09 04:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • d8dfaaa730 Version hardening Gunnar Skjold 2020-02-24 07:46:48 +01:00
  • f311b70b37 Merge branch 'master' into dev-v1.1.0 Gunnar Skjold 2020-02-24 07:17:48 +01:00
  • 52bc2b14c9 Some changes after testing Gunnar Skjold 2020-02-23 20:31:10 +01:00
  • 2ddfc16d6a Updated comment for rgbled() function ArnieO 2020-02-23 17:12:26 +01:00
  • 51ab4a7f07 Reducing precision on temperature and vcc in json to reduce length Gunnar Skjold 2020-02-23 11:34:25 +01:00
  • e90a30bfde Implemented blinking for red LED on error Gunnar Skjold 2020-02-22 17:23:56 +01:00
  • a63e6962d3 Merge pull request #38 from ArnieO/dev-v1.1.0 Gunnar Skjold 2020-02-22 16:42:19 +01:00
  • 951ccf7de5 Merge branch 'dev-v1.1.0' into dev-v1.1.0 Gunnar Skjold 2020-02-22 16:42:04 +01:00
  • 001e3376df Merge pull request #39 from gskjold/dev-v1.1.0-mqttraw Gunnar Skjold 2020-02-22 16:37:29 +01:00
  • 9e4bf93f0a Some changes to reduce dlms read errors Gunnar Skjold 2020-02-22 12:29:04 +01:00
  • e5ac823f69 Changed mqtt buffer to 384, JSON buffer to <512> ArnieO 2020-02-21 23:29:01 +01:00
  • 73fd228e2f Merge branch 'dev-v1.1.0' into dev-v1.1.0-mqttraw Gunnar Skjold 2020-02-21 20:58:17 +01:00
  • fdac8f88af Minor optimization Gunnar Skjold 2020-02-21 20:52:55 +01:00
  • 9c8552869c Preparations for selectable MQTT payload format Gunnar Skjold 2020-02-21 20:51:55 +01:00
  • be75b013c0 Added code for RGB LED ArnieO 2020-02-21 19:13:44 +01:00
  • 79274e490d Added code for RGB LED ArnieO 2020-02-21 18:53:05 +01:00
  • 47293eebe4 Added code for RGB LED ArnieO 2020-02-21 18:38:28 +01:00
  • 90b62638ed Dependency hardening Gunnar Skjold 2020-02-20 20:36:12 +01:00
  • 78e766156d Minimizing calls to web server Gunnar Skjold 2020-02-18 21:33:41 +01:00
  • 4b32af69a7 Fixed typo v1.0.3 v1.0.2 Gunnar Skjold 2020-02-18 07:37:42 +01:00
  • 916b5550d9 Fixed typo Gunnar Skjold 2020-02-18 07:25:10 +01:00
  • 48016240f9 Some cleanup after testing with ESP32 Gunnar Skjold 2020-02-17 20:06:52 +01:00
  • 518b408205 Minor changes to fix build Gunnar Skjold 2020-02-17 17:23:18 +01:00
  • 73a0359597 Minor changes to fix build Gunnar Skjold 2020-02-17 17:21:34 +01:00
  • bbe82f9cdc Added a small delay that helped smooth the voltage on a HAN powered device. No more sudden reboots Gunnar Skjold 2020-02-16 21:45:58 +01:00
  • 4786735d4c Support older config versions. Fixed css for AP mode. Some cleanup and changes to preserve power Gunnar Skjold 2020-02-16 20:09:29 +01:00
  • 227eb7b6ff Now using external base64 lib. Also updated some previously commited errors Gunnar Skjold 2020-02-16 16:03:01 +01:00
  • 00edd94033 Fixed some bugs from late night coding Gunnar Skjold 2020-02-16 15:46:01 +01:00
  • ccd818e1ab Merge branch 'master' into dev-v1.1.0 Gunnar Skjold 2020-02-16 15:28:47 +01:00
  • fc42fb22d8 Merge pull request #33 from gskjold/dev-v1.0.1 v1.0.1 Gunnar Skjold 2020-02-16 14:49:36 +01:00
  • f6066fbbf3 Cleanup and fix bugs found during testing Gunnar Skjold 2020-02-15 22:13:04 +01:00
  • 9c09740a41 Production graph and fixed vcc value Gunnar Skjold 2020-02-15 21:04:18 +01:00
  • 4e24e2949a Updated featheresp32 config to use Serial2 for Mbus Gunnar Skjold 2020-02-15 18:01:10 +01:00
  • eff00f1fe0 Only show temp if sensor is attached. Added common functions to get temp and vcc Gunnar Skjold 2020-02-14 21:48:03 +01:00
  • f484f3eb0e Merge branch 'dev-v1.0.1' into dev-v1.1.0 Gunnar Skjold 2020-02-14 20:19:15 +01:00
  • b2174dd521 If debug mode and HW_ROARFRED, use software serial to set upp RX for HAN with 2400 and TX for debugging with 115200 Gunnar Skjold 2020-02-14 20:14:30 +01:00
  • fe79a96827 Added change to allow auto modem sleep Gunnar Skjold 2020-02-14 19:52:15 +01:00
  • 517a40b0a6 Finalized new configuration menu and moved AP button trigger from setup to loop Gunnar Skjold 2020-02-14 19:49:25 +01:00
  • 75f3c8c592 Merge branch 'dev-v1.0.1' into dev-v1.1.0 Gunnar Skjold 2020-02-14 16:07:54 +01:00
  • 554cc7c023 Added date and time from meter as rtc in json Gunnar Skjold 2020-02-14 16:03:52 +01:00
  • 6d0c722c98 Using kwh and kvarh as standard for accumulated numbers from kamstrup Gunnar Skjold 2020-02-14 12:25:40 +01:00
  • d2f93c07bd Not sure if this does anything, but increased json and mqtt limits to see if Kamstrup list 3 is received Gunnar Skjold 2020-02-13 20:50:13 +01:00
  • d63516fd49 Deleted autosave Gunnar Skjold 2020-02-13 20:41:08 +01:00
  • c114b777c7 Minor changes to UI Gunnar Skjold 2020-02-13 20:40:33 +01:00
  • a06729b535 Bugfix for previous commit Gunnar Skjold 2020-02-12 20:11:55 +01:00
  • 0ea21991ea Continued work with v1.1.0 - Merge branch 'low_power' into dev-v1.1.0 - Corrected accumulated import/export from Aidon - Added VCC and RSSI to MQTT messages Gunnar Skjold 2020-02-12 19:55:06 +01:00
  • 1994f16b82 Merge branch 'dev-v1.0.1' into dev-v1.1.0 Gunnar Skjold 2020-02-12 16:41:04 +01:00
  • b6efae656f Expose export power in JSON Gunnar Skjold 2020-02-12 16:40:51 +01:00
  • fa0f93cefe Switched to reactive import for Q Gunnar Skjold 2020-02-12 13:25:36 +01:00
  • 058dc658c1 Switched to reactive import for Q Gunnar Skjold 2020-02-12 13:16:49 +01:00
  • f6df84bf9a Auto detect meter type Gunnar Skjold 2020-02-11 18:40:38 +01:00
  • 4b9cb27e58 Disable web security if AP mode is triggered Gunnar Skjold 2020-02-11 17:32:18 +01:00
  • 5f14517258 Minor changes after testing MQTT reconnect Gunnar Skjold 2020-02-11 17:25:52 +01:00
  • ad820fff01 Allow other services to get resources while trying to connect to mqtt Gunnar Skjold 2020-02-11 11:04:37 +01:00
  • 6d3d4adc7e Merge branch 'master' into low_power Gunnar Skjold 2020-02-09 13:45:27 +01:00
  • 99a23b3bf7 Cropped webui image v1.0.0 Gunnar Skjold 2020-02-09 13:19:48 +01:00
  • 15e861ce70 Added AP mode pin for both Wemos D1 and D32 Gunnar Skjold 2020-02-09 12:18:08 +01:00
  • fdfadb9bf9 Updated Aidon parser with support for 3 phase IT/TT system Gunnar Skjold 2020-02-08 18:23:56 +01:00
  • 388d35c390 Updated documentation Gunnar Skjold 2020-02-07 23:12:27 +01:00
  • e466a45b5c Fixed missing check in checkbox when configuration opened in firefox Gunnar Skjold 2020-02-07 22:33:55 +01:00
  • 2e7b9e8e43 Fixed missing check in checkbox when configuration opened in firefox Gunnar Skjold 2020-02-07 22:26:17 +01:00
  • deb2148e9a Software serial for development boards. Added a few extra boards Gunnar Skjold 2020-02-07 17:27:58 +01:00
  • 27cb5dd833 Trying a large sleep when cap is not charged Gunnar Skjold 2020-02-06 19:15:06 +01:00
  • 7e6ac860fd Merge branch 'master' into low_power Gunnar Skjold 2020-02-06 19:02:14 +01:00
  • 3a7f6078f4 Use builtin LED for Lolin D32 Gunnar Skjold 2020-02-06 19:02:05 +01:00
  • 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 Gunnar Skjold 2020-02-05 20:43:37 +01:00
  • 9bb596aab1 Reverted what was intended as support for earlier configuration versions. Gunnar Skjold 2020-02-02 08:15:49 +01:00
  • 4a3d22e75c Fixed script to generate webroot header files Gunnar Skjold 2020-02-01 09:57:43 +01:00
  • d68ffc827d Trigger build on changes in scripts and web Gunnar Skjold 2020-02-01 09:56:14 +01:00
  • 20c62a63cf Fixed script to generate webroot header files Gunnar Skjold 2020-02-01 09:54:58 +01:00
  • 8f85b43fc3 Made MQTT optional Gunnar Skjold 2020-02-01 09:52:37 +01:00
  • 57d8603790 Added option for electric distribution system (230/400) Gunnar Skjold 2020-01-31 21:30:20 +01:00
  • fc1f1554d8 Extracted webroot into usable files Gunnar Skjold 2020-01-31 21:08:27 +01:00
  • 70ed0b538a Merge branch 'master' into low_power Gunnar Skjold 2020-01-29 21:00:10 +01:00
  • ced6f125fd Trigger build on changing ini file Gunnar Skjold 2020-01-29 20:58:09 +01:00
  • f76cacf835 Trigger build on changing ini file Gunnar Skjold 2020-01-29 20:56:31 +01:00
  • a8205edae9 Fixed build after merge Gunnar Skjold 2020-01-29 20:53:52 +01:00
  • 0a317450f6 Merge branch 'master' into low_power Gunnar Skjold 2020-01-29 20:51:28 +01:00
  • e9ed6d825a Merge pull request #14 from gskjold/issue-9 Gunnar Skjold 2020-01-29 20:50:26 +01:00
  • a6751c787c Merge branch 'issue-9' into low_power Gunnar Skjold 2020-01-29 20:39:07 +01:00
  • 378dbbcc99 Only show phases with power, and always deliver volts and amps to frontend Gunnar Skjold 2020-01-29 20:38:53 +01:00
  • aed56b0b56 Merge branch 'issue-9' into low_power Gunnar Skjold 2020-01-28 21:19:01 +01:00
  • 36b37eb2a6 Calculate max power when receiving json from reader Gunnar Skjold 2020-01-28 21:18:48 +01:00
  • 550b216ba6 Merge branch 'issue-9' into low_power Gunnar Skjold 2020-01-28 21:12:00 +01:00
  • 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 Gunnar Skjold 2020-01-28 21:10:54 +01:00
  • 7fdedd8bcf Forgot some changes Gunnar Skjold 2020-01-28 19:20:50 +01:00
  • f693869bd4 Merge branch 'master' into issue-9 Gunnar Skjold 2020-01-28 19:18:13 +01:00
  • 3312f88804 Some changes to make it compile for both ESP8266 and ESP32 v0.2.0 Gunnar Skjold 2020-01-28 18:17:20 +01:00
  • 50faaca559 Moved Base64 lib Gunnar Skjold 2020-01-24 14:54:42 +01:00
  • bf44849ecf Added base64 lib directly into this project to fix build problem with esp32 Gunnar Skjold 2020-01-24 14:52:14 +01:00
  • 4bfd9dee9a Merge pull request #10 from gskjold/issue-6 Gunnar Skjold 2020-01-24 14:47:29 +01:00
  • 32d58fdd71 Stripped jquery and full bootstrap from image Gunnar Skjold 2020-01-23 19:45:29 +01:00
  • aef78962fb Some modifications to reduce power consumption i AP mode Gunnar Skjold 2020-01-23 18:47:02 +01:00
  • 8ee713b616 Included some code from @dakarym to support the self powered board for testing Gunnar Skjold 2020-01-22 15:26:07 +01:00
  • 0fa3e3585a Finalized live update of meter data in web gui Gunnar Skjold 2020-01-19 21:37:56 +01:00
  • a88291c0f0 Implemented new user interface and prepared for live view Gunnar Skjold 2020-01-17 21:49:36 +01:00
  • ac1609bfac Merge branch 'issue-6' into issue-9 Gunnar Skjold 2020-01-17 19:17:44 +01:00
  • 22d5839d60 Added HTML, CSS and JS for new user interface Gunnar Skjold 2020-01-17 14:41:02 +01:00
  • 8f0932f1f1 Added configurable basic auth to web server Gunnar Skjold 2020-01-15 21:22:06 +01:00
  • aeb161455e Enable config page on runtime with populated form Gunnar Skjold 2020-01-15 20:17:06 +01:00