github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-01 06:31:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
349 Commits 6 Branches 125 Tags
dbc551a41d5dac1f9a5b1c5d66c7ed0f6aa31c54
Commit Graph

349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gunnar Skjold
843cea7626 Updated readme v0.1.0 2019-12-12 19:39:00 +01:00
Gunnar Skjold
c82a2a1d4b Added adafruit esp32 feather as a target 2019-12-12 19:32:20 +01:00
Gunnar Skjold
86dd8c1b87 Updated readme 2019-12-12 19:25:32 +01:00
Gunnar Skjold
bdc0c03a76 Restructuring and cleaning out unnecessary files 2019-12-12 19:25:10 +01:00
Gunnar Skjold
5680b5a501 Restructuring and cleaning out unnecessary files 2019-12-12 19:23:15 +01:00
Gunnar Skjold
4cd1fa87d1 Making watt, amperage and volt the standard unit for all meters 2019-12-11 18:20:21 +01:00
Gunnar Skjold
1579562612 Set correct parity for Kamstrup 2019-12-11 14:40:08 +01:00
Gunnar Skjold
2713b5adae Updated readme with release and flashing section 2019-11-22 21:08:30 +01:00
Gunnar Skjold
c20b07bfc2 Add release version to binaries v0.0.3 2019-11-22 20:36:42 +01:00
Gunnar Skjold
0c3d44dc83 Changed name of build action v0.0.2 2019-11-22 20:32:22 +01:00
Gunnar Skjold
8a88c207ee Added release action 2019-11-22 20:29:02 +01:00
Gunnar Skjold
1bda47cbcd Merge branch 'master' of github.com:gskjold/AmsToMqttBridge v0.0.1 2019-11-22 20:19:42 +01:00
Gunnar Skjold
44be5a6969 PlatformIO configuration 2019-11-22 20:19:32 +01:00
Gunnar Skjold
108cdbfde8 Added cache 2019-11-22 20:01:20 +01:00
Gunnar Skjold
9df783d819 Added PlatformIO build file 2019-11-22 19:27:19 +01:00
Gunnar Skjold
f32de12907 Create build.yml 2019-11-22 19:24:56 +01:00
Gunnar Skjold
d0118c1dc0 Merge pull request #5 from vegarwe/develop 
Stott modul kort (ESP8266 NodeMCU og ESP32 Feather)
 2019-07-22 07:20:24 +02:00
Vegar Westerlund
cd02d19722 Merge remote-tracking branch 'gskjold/master' into develop 
Conflicts:
	.gitignore
	Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino
	Arduino Code/Arduino Libraries/HanReader/src/Aidon.h
 2019-07-21 17:42:55 +02:00
Vegar Westerlund
2d70f45995 Fix TODO 2019-07-21 17:35:32 +02:00
Vegar Westerlund
ba89731249 Fix review comments, copy-paste error. Short should be Long 2019-07-21 17:33:15 +02:00