github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-17 17:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
303 Commits 6 Branches 125 Tags
Commit Graph

303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gunnar Skjold
818be07a08 Fixed compile errors 2019-07-21 14:11:53 +02:00
Gunnar Skjold
10f609b727 Added some stuff to gitignore 2019-07-21 13:48:12 +02:00
Vegar Westerlund
d8912a77e8 White space cleanup 2019-06-10 16:26:04 +02:00
Vegar Westerlund
1583b543bf Minor test tool cleanup 2019-06-10 16:25:29 +02:00
Vegar Westerlund
71e8deb9ed White space cleanup 2019-06-10 16:20:06 +02:00
Vegar Westerlund
07ef8db452 White space cleanup 2019-06-10 16:17:42 +02:00
Vegar Westerlund
47c16af402 Merge remote-tracking branch 'gskjold/master' into develop 
Conflicts:
	Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino
	Arduino Code/Arduino Libraries/HanReader/src/Aidon.h
 2019-06-10 16:07:42 +02:00
Vegar Westerlund
e2ca14a9eb Remove now unused Sketch (meant for Wifi Feather) 2019-06-10 15:47:03 +02:00
Vegar Westerlund
2ab09f0fbc Make AmsToMqttBridge run more board variants 
Do minor code cleanup add support for module boards
This includes ESP8266 NodeMCU and ESP32 Feather
 2019-06-10 15:45:07 +02:00
Vegar Westerlund
e6d0a0915e Only check for "holding down reset button" if button is available 2019-06-10 12:59:24 +02:00
Vegar Westerlund
4fb17239f0 Made HAN Configuration access point into a library 2019-06-10 12:59:21 +02:00
Vegar Westerlund
711500a581 Clean up HanToJson library and per meter header files 2019-06-07 23:34:47 +02:00
Vegar Westerlund
605eac8996 Minor Wifi feather updates 2019-06-07 23:34:47 +02:00
Vegar Westerlund
643c9a5e20 Minor fixes 2019-06-07 23:34:47 +02:00
Vegar Westerlund
779c996f90 Fixed up test cases. Not reliable as far as it goes 2019-06-07 23:34:44 +02:00
Vegar Westerlund
52573fa088 Clean up AmsToMqttBridge. Switch to using new ArduinoJson and HanToJson library 2019-06-07 14:12:19 +02:00
Vegar Westerlund
2681ab0548 Make com port a input argument 2019-06-06 23:58:34 +02:00
Vegar Westerlund
bb31e57fc2 Fix undefined return value 2019-06-04 21:45:44 +02:00
Gunnar Skjold
bc2ed7ba56
Merge pull request #4 from gskjold/aidon1p 
Aidon1p
 2019-05-22 09:09:50 +02:00
Gunnar Skjold
37e029df8a Merge branch 'master' into aidon1p 2019-05-22 09:07:42 +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
44dbe13f7e Removed unnecessary comam 2019-04-04 12:02:59 +02:00
Gunnar Skjold
29368b35af Added List2 for 1 phase meters. Will add List3 when List2 is confirmed 2019-04-04 12:00:59 +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