278 Commits

Author SHA1 Message Date
Vegar Westerlund
bb31e57fc2 Fix undefined return value 2019-06-04 21:45:44 +02:00
Vegar Westerlund
5f376ded75 Update README 2019-05-12 20:00:10 +02:00
Vegar Westerlund
c8a36aa350 Decode 1-phase Kamstrup and Kaifa 2019-05-12 19:55:09 +02:00
Mona Lisagit config --global user.email
bf83f018f3 compile on d1 mini and working on 1 fase nuri 2019-05-12 19:49:36 +02:00
Ruben Andreassen
dce4db7dd6 Added one-phase meter 2019-05-12 18:32:03 +02:00
Vegar Westerlund
959283aa09 Add new library (HanToJson) and reduce the duplication needed in sketch(es) 2019-05-12 16:09:52 +02:00
Vegar Westerlund
e70242740d Documentation for Adafruit Feather solution 2019-05-12 16:09:49 +02:00
Vegar Westerlund
9a2995667b Start working on a Adafruit Feather M0 WiFi w/ATWINC1500 firmware (with slight update to HanReader interface) 2019-05-11 21:34:42 +02:00
Vegar Westerlund
09caae4093 Add python code to simulate AMS data 2019-05-11 21:34:38 +02:00
Vegar Westerlund
1e602e9194 Ignores 2019-05-11 20:17:15 +02:00
Gunnar Skjold
0c765beea7 Increased MQTT max packet size to accomodate Kaifa List3 2019-04-27 18:19:30 +02:00
Gunnar Skjold
61603f3d73 Fix to include Aidon List3 2019-03-25 13:04:26 +01:00
Gunnar Skjold
29be4453b1 Small fix for Aidon list 3 2019-03-24 21:01:09 +01:00
Gunnar Skjold
1d677a9c61 Small fix for Aidon list 3 2019-03-24 21:00:22 +01:00
Gunnar Skjold
af6e1617fc Merge branch 'master' of github.com:gskjold/AmsToMqttBridge 2019-03-24 20:54:20 +01:00
Gunnar Skjold
4fa3002502 Implementert Aidon liste 3 2019-03-24 20:54:08 +01:00
Gunnar Skjold
662571ab38 Links fixed in readme 2019-02-14 08:02:51 +01:00
Gunnar Skjold
968f096906 Links fixed in readme 2019-02-14 08:02:03 +01:00
Gunnar Skjold
9ff733d6dd Links fixed in readme 2019-02-14 08:00:56 +01:00
Gunnar Skjold
d840fd7c9a Merge branch 'DIYglenn-master' 2019-02-14 07:58:40 +01:00
Gunnar Skjold
7fb1b68139 More cleanup after merge 2019-02-14 07:57:38 +01:00
Gunnar Skjold
9427b5b5f9 git push origin master
Merge branch 'DIYglenn-master'
2019-02-14 07:49:17 +01:00
Gunnar Skjold
3cb433b27e Merge DIYglenn 2019-02-14 07:48:46 +01:00
Gunnar Skjold
a954b838f3 Change MQTT client to one that accepts packet size over 128 2019-02-13 20:49:39 +01:00
Gunnar Skjold
ab6b7e7724 Changes to make Aidon work. Will clean up later 2019-02-12 21:07:18 +01:00
Gunnar Skjold
0471e61ba5 Support for Aidon meter 2019-02-12 17:52:41 +01:00
Gunnar Skjold
8191476256 Support for Aidon meter 2019-02-12 17:51:06 +01:00
Gunnar Skjold
5b537c2928 Build on linux and send proper html ending from web server 2019-01-27 10:15:51 +01:00
Håkon Løvdal
7975184262 Update Electrical/GETTING_STARTED.md with git submodule information 2018-04-15 23:25:17 +02:00
Roar Fredriksen
6b17bc33c0 Set theme jekyll-theme-slate 2018-04-13 17:53:39 +02:00
Roar Fredriksen
e9ca1f9b17
Update README.md 2018-04-13 17:29:53 +02:00
Roar Fredriksen
cfb7a64206
Update README.md 2018-04-13 17:24:43 +02:00
Roar Fredriksen
0913950ff1 Set theme jekyll-theme-merlot 2018-04-13 17:21:51 +02:00
Roar Fredriksen
3bc5d47e0a
Merge pull request #44 from xibriz/master
This solves partly #44 and #40
2018-04-12 09:15:34 +02:00
Ruben Andreassen
1d1a0cfba2 Added delay to make the ESP connect to the WiFi faster 2018-04-10 19:55:06 +02:00
Ruben Andreassen
33f3e0898c Switched Kamstrup and Aidon to match the HTML in accesspoint.cpp 2018-04-10 19:53:51 +02:00
Ruben Andreassen
0a07d808b4 Added default mqtt port 2018-04-10 19:52:43 +02:00
Roar Fredriksen
a40e8a4116
Merge pull request #43 from roarfred/fixing_documentation
Fixing documentation
2018-04-09 19:43:55 +02:00
Roar Fredriksen
d3d547071d Included dashboard screenshot 2018-04-09 19:36:38 +02:00
Roar Fredriksen
880ca36997 Fixing links 2018-04-09 19:25:38 +02:00
Roar Fredriksen
c70b85f5af Fixed uppercase file extensions 2018-04-09 19:18:22 +02:00
Roar Fredriksen
4c915490e3 Added imaged for new board and updated main readme 2018-04-09 19:15:54 +02:00
Roar Fredriksen
901885fbb4
Update README.md 2018-04-09 18:11:21 +02:00
Roar Fredriksen
7ba1218e9d
Merge pull request #37 from svenove/patch-1
Ready-to-order shoppingcart with all components
2018-04-03 14:02:58 +02:00
Sven-Ove Bjerkan
e4897e931f
Ready-to-order shoppingcart with all components 2018-03-21 10:47:44 +01:00
Roar Fredriksen
99ecba63e2
Merge pull request #36 from roarfred/CreatingAmsToMqttBridge
Creating ams to mqtt bridge
2018-03-20 21:09:34 +01:00
Roar Fredriksen
d5a519a182 Working sample app 2018-03-20 21:02:12 +01:00
Roar Fredriksen
c991403e25 Boot as AP, Configuration, TempSensor etc 2018-03-20 01:21:49 +01:00
Roar Fredriksen
f8fe34a454 Including HanReader project 2018-03-19 17:06:57 +01:00
Roar Fredriksen
2f611afb0e
Merge pull request #35 from roarfred/3D-Printing-Enclosure
Created enclosure for 3D printing
2018-03-19 17:00:27 +01:00