Commit Graph

  • 568180d7b2 Update release.yml Gunnar Skjold 2019-12-12 19:49:22 +01:00
  • 0d99da6c9a Update build.yml Gunnar Skjold 2019-12-12 19:48:22 +01:00
  • 843cea7626 Updated readme v0.1.0 Gunnar Skjold 2019-12-12 19:39:00 +01:00
  • c82a2a1d4b Added adafruit esp32 feather as a target Gunnar Skjold 2019-12-12 19:32:20 +01:00
  • 86dd8c1b87 Updated readme Gunnar Skjold 2019-12-12 19:25:32 +01:00
  • bdc0c03a76 Restructuring and cleaning out unnecessary files Gunnar Skjold 2019-12-12 19:25:10 +01:00
  • 5680b5a501 Restructuring and cleaning out unnecessary files Gunnar Skjold 2019-12-12 19:23:15 +01:00
  • 4cd1fa87d1 Making watt, amperage and volt the standard unit for all meters Gunnar Skjold 2019-12-11 18:20:21 +01:00
  • 1579562612 Set correct parity for Kamstrup Gunnar Skjold 2019-12-11 14:40:08 +01:00
  • 2713b5adae Updated readme with release and flashing section Gunnar Skjold 2019-11-22 21:08:30 +01:00
  • c20b07bfc2 Add release version to binaries v0.0.3 Gunnar Skjold 2019-11-22 20:36:42 +01:00
  • 0c3d44dc83 Changed name of build action v0.0.2 Gunnar Skjold 2019-11-22 20:32:22 +01:00
  • 8a88c207ee Added release action Gunnar Skjold 2019-11-22 20:29:02 +01:00
  • 1bda47cbcd Merge branch 'master' of github.com:gskjold/AmsToMqttBridge v0.0.1 Gunnar Skjold 2019-11-22 20:19:42 +01:00
  • 44be5a6969 PlatformIO configuration Gunnar Skjold 2019-11-22 20:19:32 +01:00
  • 108cdbfde8 Added cache Gunnar Skjold 2019-11-22 20:01:20 +01:00
  • 9df783d819 Added PlatformIO build file Gunnar Skjold 2019-11-22 19:27:19 +01:00
  • f32de12907 Create build.yml Gunnar Skjold 2019-11-22 19:24:56 +01:00
  • d0118c1dc0 Merge pull request #5 from vegarwe/develop Gunnar Skjold 2019-07-22 07:20:24 +02:00
  • cd02d19722 Merge remote-tracking branch 'gskjold/master' into develop Vegar Westerlund 2019-07-21 17:42:55 +02:00
  • 2d70f45995 Fix TODO Vegar Westerlund 2019-07-21 17:35:32 +02:00
  • ba89731249 Fix review comments, copy-paste error. Short should be Long Vegar Westerlund 2019-07-21 17:33:15 +02:00
  • 818be07a08 Fixed compile errors Gunnar Skjold 2019-07-21 14:11:53 +02:00
  • 10f609b727 Added some stuff to gitignore Gunnar Skjold 2019-07-21 13:48:12 +02:00
  • d8912a77e8 White space cleanup Vegar Westerlund 2019-06-10 16:26:04 +02:00
  • 1583b543bf Minor test tool cleanup Vegar Westerlund 2019-06-10 16:25:29 +02:00
  • 71e8deb9ed White space cleanup Vegar Westerlund 2019-06-10 16:20:06 +02:00
  • 07ef8db452 White space cleanup Vegar Westerlund 2019-06-10 16:17:42 +02:00
  • 47c16af402 Merge remote-tracking branch 'gskjold/master' into develop Vegar Westerlund 2019-06-10 16:07:42 +02:00
  • e2ca14a9eb Remove now unused Sketch (meant for Wifi Feather) Vegar Westerlund 2019-06-10 15:47:03 +02:00
  • 2ab09f0fbc Make AmsToMqttBridge run more board variants Vegar Westerlund 2019-06-09 23:47:36 +02:00
  • e6d0a0915e Only check for "holding down reset button" if button is available Vegar Westerlund 2019-06-10 11:05:01 +02:00
  • 4fb17239f0 Made HAN Configuration access point into a library Vegar Westerlund 2019-06-09 23:21:32 +02:00
  • 711500a581 Clean up HanToJson library and per meter header files Vegar Westerlund 2019-06-07 23:33:54 +02:00
  • 605eac8996 Minor Wifi feather updates Vegar Westerlund 2019-06-07 22:51:00 +02:00
  • 643c9a5e20 Minor fixes Vegar Westerlund 2019-06-07 22:49:49 +02:00
  • 779c996f90 Fixed up test cases. Not reliable as far as it goes Vegar Westerlund 2019-06-07 22:35:47 +02:00
  • 52573fa088 Clean up AmsToMqttBridge. Switch to using new ArduinoJson and HanToJson library Vegar Westerlund 2019-06-07 00:10:59 +02:00
  • 2681ab0548 Make com port a input argument Vegar Westerlund 2019-06-06 23:58:34 +02:00
  • bb31e57fc2 Fix undefined return value Vegar Westerlund 2019-06-04 21:45:44 +02:00
  • bc2ed7ba56 Merge pull request #4 from gskjold/aidon1p Gunnar Skjold 2019-05-22 09:09:50 +02:00
  • 37e029df8a Merge branch 'master' into aidon1p Gunnar Skjold 2019-05-22 09:07:42 +02:00
  • 5f376ded75 Update README Vegar Westerlund 2019-05-12 20:00:10 +02:00
  • c8a36aa350 Decode 1-phase Kamstrup and Kaifa Vegar Westerlund 2019-05-12 19:29:02 +02:00
  • bf83f018f3 compile on d1 mini and working on 1 fase nuri Mona Lisagit config --global user.email 2018-09-02 16:45:06 +02:00
  • dce4db7dd6 Added one-phase meter Ruben Andreassen 2018-09-23 19:16:33 +02:00
  • 959283aa09 Add new library (HanToJson) and reduce the duplication needed in sketch(es) Vegar Westerlund 2019-05-12 16:09:24 +02:00
  • e70242740d Documentation for Adafruit Feather solution Vegar Westerlund 2019-05-11 21:48:48 +02:00
  • 9a2995667b Start working on a Adafruit Feather M0 WiFi w/ATWINC1500 firmware (with slight update to HanReader interface) Vegar Westerlund 2019-05-11 21:34:11 +02:00
  • 09caae4093 Add python code to simulate AMS data Vegar Westerlund 2019-05-11 17:10:56 +02:00
  • 1e602e9194 Ignores Vegar Westerlund 2019-05-11 14:26:34 +02:00
  • 0c765beea7 Increased MQTT max packet size to accomodate Kaifa List3 Gunnar Skjold 2019-04-27 18:19:30 +02:00
  • 44dbe13f7e Removed unnecessary comam Gunnar Skjold 2019-04-04 12:02:59 +02:00
  • 29368b35af Added List2 for 1 phase meters. Will add List3 when List2 is confirmed Gunnar Skjold 2019-04-04 12:00:59 +02:00
  • 61603f3d73 Fix to include Aidon List3 Gunnar Skjold 2019-03-25 13:04:26 +01:00
  • 29be4453b1 Small fix for Aidon list 3 Gunnar Skjold 2019-03-24 21:01:09 +01:00
  • 1d677a9c61 Small fix for Aidon list 3 Gunnar Skjold 2019-03-24 21:00:22 +01:00
  • af6e1617fc Merge branch 'master' of github.com:gskjold/AmsToMqttBridge Gunnar Skjold 2019-03-24 20:54:20 +01:00
  • 4fa3002502 Implementert Aidon liste 3 Gunnar Skjold 2019-03-24 20:54:08 +01:00
  • 662571ab38 Links fixed in readme Gunnar Skjold 2019-02-14 08:02:51 +01:00
  • 968f096906 Links fixed in readme Gunnar Skjold 2019-02-14 08:02:03 +01:00
  • 9ff733d6dd Links fixed in readme Gunnar Skjold 2019-02-14 08:00:56 +01:00
  • d840fd7c9a Merge branch 'DIYglenn-master' Gunnar Skjold 2019-02-14 07:58:40 +01:00
  • 7fb1b68139 More cleanup after merge Gunnar Skjold 2019-02-14 07:57:38 +01:00
  • 9427b5b5f9 git push origin master Merge branch 'DIYglenn-master' Gunnar Skjold 2019-02-14 07:49:17 +01:00
  • 3cb433b27e Merge DIYglenn Gunnar Skjold 2019-02-14 07:48:46 +01:00
  • a954b838f3 Change MQTT client to one that accepts packet size over 128 Gunnar Skjold 2019-02-13 20:49:39 +01:00
  • ab6b7e7724 Changes to make Aidon work. Will clean up later Gunnar Skjold 2019-02-12 21:07:18 +01:00
  • 0471e61ba5 Support for Aidon meter Gunnar Skjold 2019-02-12 17:52:41 +01:00
  • 8191476256 Support for Aidon meter Gunnar Skjold 2019-02-12 17:51:06 +01:00
  • 5b537c2928 Build on linux and send proper html ending from web server Gunnar Skjold 2019-01-27 10:15:51 +01:00
  • 7975184262 Update Electrical/GETTING_STARTED.md with git submodule information Håkon Løvdal 2018-04-15 23:25:17 +02:00
  • 6b17bc33c0 Set theme jekyll-theme-slate Roar Fredriksen 2018-04-13 17:53:39 +02:00
  • e9ca1f9b17 Update README.md Roar Fredriksen 2018-04-13 17:29:53 +02:00
  • cfb7a64206 Update README.md Roar Fredriksen 2018-04-13 17:24:43 +02:00
  • 0913950ff1 Set theme jekyll-theme-merlot Roar Fredriksen 2018-04-13 17:21:51 +02:00
  • 3bc5d47e0a Merge pull request #44 from xibriz/master Roar Fredriksen 2018-04-12 09:15:34 +02:00
  • 1d1a0cfba2 Added delay to make the ESP connect to the WiFi faster Ruben Andreassen 2018-04-10 19:55:06 +02:00
  • 33f3e0898c Switched Kamstrup and Aidon to match the HTML in accesspoint.cpp Ruben Andreassen 2018-04-10 19:53:51 +02:00
  • 0a07d808b4 Added default mqtt port Ruben Andreassen 2018-04-10 19:52:43 +02:00
  • a40e8a4116 Merge pull request #43 from roarfred/fixing_documentation Roar Fredriksen 2018-04-09 19:43:55 +02:00
  • d3d547071d Included dashboard screenshot Roar Fredriksen 2018-04-09 19:36:38 +02:00
  • 880ca36997 Fixing links Roar Fredriksen 2018-04-09 19:25:38 +02:00
  • c70b85f5af Fixed uppercase file extensions Roar Fredriksen 2018-04-09 19:18:22 +02:00
  • 4c915490e3 Added imaged for new board and updated main readme Roar Fredriksen 2018-04-09 19:15:54 +02:00
  • 901885fbb4 Update README.md Roar Fredriksen 2018-04-09 18:11:21 +02:00
  • 7ba1218e9d Merge pull request #37 from svenove/patch-1 Roar Fredriksen 2018-04-03 14:02:58 +02:00
  • e4897e931f Ready-to-order shoppingcart with all components Sven-Ove Bjerkan 2018-03-21 10:47:44 +01:00
  • 99ecba63e2 Merge pull request #36 from roarfred/CreatingAmsToMqttBridge Roar Fredriksen 2018-03-20 21:09:34 +01:00
  • d5a519a182 Working sample app Roar Fredriksen 2018-03-20 21:02:12 +01:00
  • c991403e25 Boot as AP, Configuration, TempSensor etc Roar Fredriksen 2018-03-20 01:21:49 +01:00
  • f8fe34a454 Including HanReader project Roar Fredriksen 2018-03-19 17:06:57 +01:00
  • 2f611afb0e Merge pull request #35 from roarfred/3D-Printing-Enclosure Roar Fredriksen 2018-03-19 17:00:27 +01:00
  • b9e18efc7f Created enclosure for 3D printing Roar Fredriksen 2018-03-19 16:55:33 +01:00
  • 71860d0719 Created project Roar Fredriksen 2018-03-13 22:07:09 +01:00
  • 923b08adb2 Merge pull request #32 from roarfred/Removing09FromHeader Roar Fredriksen 2018-03-08 00:26:52 +01:00
  • 187c2990e1 Merge branch 'master' into Removing09FromHeader Roar Fredriksen 2018-03-08 00:22:40 +01:00
  • b2f348f57d Made it work with Kaifa data Roar Fredriksen 2018-03-08 00:20:07 +01:00
  • cbefaf1c7c Making it work with new Kamstrup data Roar Fredriksen 2018-03-07 23:54:59 +01:00
  • e48c732098 Merge branch 'master' of https://github.com/roarfred/AmsToMqttBridge Roar Fredriksen 2018-03-07 23:01:28 +01:00