Merge branch 'master' of github.com:gskjold/AmsToMqttBridge

2026-01-25 03:46:14 +00:00 · 2019-03-24 20:54:20 +01:00 · 2019-03-24 20:54:20 +01:00 · af6e1617fc
commit af6e1617fc
parent 4fa3002502 662571ab38
275 changed files with 94 additions and 11505 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 [Dd]ebug/
 [Rr]elease/
 **/__vm/
+.DS_Store
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "Electrical/kicad-libs/kicad-symbols"]
-	path = Electrical/kicad-libs/kicad-symbols
-	url = https://github.com/kicad/kicad-symbols
--- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino
+++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino
--- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.sln
+++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.sln
--- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj
+++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj
--- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters
+++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters
--- a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp
+++ b/Code/Arduino/AmsToMqttBridge/accesspoint.cpp
--- a/Code/Arduino/AmsToMqttBridge/accesspoint.h
+++ b/Code/Arduino/AmsToMqttBridge/accesspoint.h
--- a/Code/Arduino/AmsToMqttBridge/configuration.cpp
+++ b/Code/Arduino/AmsToMqttBridge/configuration.cpp
--- a/Code/Arduino/AmsToMqttBridge/configuration.h
+++ b/Code/Arduino/AmsToMqttBridge/configuration.h
--- a/Code/Arduino/HanReader/HanReader.sln
+++ b/Code/Arduino/HanReader/HanReader.sln
--- a/Code/Arduino/HanReader/HanReader.vcxitems
+++ b/Code/Arduino/HanReader/HanReader.vcxitems
--- a/Code/Arduino/HanReader/HanReader.vcxitems.filters
+++ b/Code/Arduino/HanReader/HanReader.vcxitems.filters
--- a/Code/Arduino/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino
+++ b/Code/Arduino/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino
--- a/Code/Arduino/HanReader/examples/Kamstrup/mqtt/README.md
+++ b/Code/Arduino/HanReader/examples/Kamstrup/mqtt/README.md
--- a/Code/Arduino/HanReader/examples/read_han_simple/read_han_simple.ino
+++ b/Code/Arduino/HanReader/examples/read_han_simple/read_han_simple.ino
--- a/Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino
+++ b/Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino
--- a/Code/Arduino/HanReader/keywords.txt
+++ b/Code/Arduino/HanReader/keywords.txt
--- a/Libraries/HanReader/library.properties
+++ b/Libraries/HanReader/library.properties
@ -0,0 +1,9 @@
+name=HANreader
+version=1.0.0
+author=roarfred
+maintainer=roarfred <not@important.com>
+sentence=HAN support
+paragraph=HAN support
+category=Sensors
+url=https://github.com/roarfred/AmsToMqttBridge
+architectures=*
--- a/Code/Arduino/HanReader/readme.txt
+++ b/Code/Arduino/HanReader/readme.txt
--- a/Code/Arduino/HanReader/src/Aidon.h
+++ b/Code/Arduino/HanReader/src/Aidon.h
--- a/Code/Arduino/HanReader/src/Crc16.cpp
+++ b/Code/Arduino/HanReader/src/Crc16.cpp
--- a/Code/Arduino/HanReader/src/Crc16.h
+++ b/Code/Arduino/HanReader/src/Crc16.h
--- a/Code/Arduino/HanReader/src/DlmsReader.cpp
+++ b/Code/Arduino/HanReader/src/DlmsReader.cpp
--- a/Code/Arduino/HanReader/src/DlmsReader.h
+++ b/Code/Arduino/HanReader/src/DlmsReader.h
--- a/Code/Arduino/HanReader/src/HanReader.cpp
+++ b/Code/Arduino/HanReader/src/HanReader.cpp
--- a/Code/Arduino/HanReader/src/HanReader.h
+++ b/Code/Arduino/HanReader/src/HanReader.h
--- a/Code/Arduino/HanReader/src/Kaifa.h
+++ b/Code/Arduino/HanReader/src/Kaifa.h
--- a/Code/Arduino/HanReader/src/Kamstrup.h
+++ b/Code/Arduino/HanReader/src/Kamstrup.h
--- a/Code/Arduino/HanReader/.vs/HanReader/v15/.suo
+++ b/Code/Arduino/HanReader/.vs/HanReader/v15/.suo
--- a/Code/Arduino/HanReader/library.properties
+++ b/Code/Arduino/HanReader/library.properties
@ -1,4 +0,0 @@
-name=HanReader
-version=1.0.0
-author=Fred
-maintainer=Unknown
--- a/Debugging/Code/Arduino/KaifaTest/KaifaTest.ino
+++ b/Debugging/Code/Arduino/KaifaTest/KaifaTest.ino
--- a/Debugging/Code/Arduino/KaifaTest/KaifaTest.sln
+++ b/Debugging/Code/Arduino/KaifaTest/KaifaTest.sln
--- a/Debugging/Code/Arduino/KaifaTest/KaifaTest.vcxproj
+++ b/Debugging/Code/Arduino/KaifaTest/KaifaTest.vcxproj
--- a/Debugging/Code/Arduino/KaifaTest/KaifaTest.vcxproj.filters
+++ b/Debugging/Code/Arduino/KaifaTest/KaifaTest.vcxproj.filters
--- a/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.ino
+++ b/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.ino
--- a/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.sln
+++ b/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.sln
--- a/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj
+++ b/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj
--- a/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj.filters
+++ b/Debugging/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj.filters
--- a/Debugging/Code/Arduino/SelfService/README.md
+++ b/Debugging/Code/Arduino/SelfService/README.md
--- a/Debugging/Code/Arduino/SelfService/ams-mqtt.ino
+++ b/Debugging/Code/Arduino/SelfService/ams-mqtt.ino
--- a/Debugging/Code/ESPDebugger/.gitignore
+++ b/Debugging/Code/ESPDebugger/.gitignore
--- a/Debugging/Code/ESPDebugger/Circuit
+++ b/Debugging/Code/ESPDebugger/Circuit
--- a/Debugging/Code/ESPDebugger/Crc16.cpp
+++ b/Debugging/Code/ESPDebugger/Crc16.cpp
--- a/Debugging/Code/ESPDebugger/Crc16.h
+++ b/Debugging/Code/ESPDebugger/Crc16.h
--- a/Debugging/Code/ESPDebugger/DlmsReader.cpp
+++ b/Debugging/Code/ESPDebugger/DlmsReader.cpp
--- a/Debugging/Code/ESPDebugger/DlmsReader.h
+++ b/Debugging/Code/ESPDebugger/DlmsReader.h
--- a/Debugging/Code/ESPDebugger/ESPDebugger.ino
+++ b/Debugging/Code/ESPDebugger/ESPDebugger.ino
--- a/Debugging/Code/ESPDebugger/ESPDebugger.sln
+++ b/Debugging/Code/ESPDebugger/ESPDebugger.sln
--- a/Debugging/Code/ESPDebugger/ESPDebugger.vcxproj
+++ b/Debugging/Code/ESPDebugger/ESPDebugger.vcxproj
--- a/Debugging/Code/ESPDebugger/ESPDebugger.vcxproj.filters
+++ b/Debugging/Code/ESPDebugger/ESPDebugger.vcxproj.filters
--- a/Debugging/Code/ESPDebugger/HanReader.cpp
+++ b/Debugging/Code/ESPDebugger/HanReader.cpp
--- a/Debugging/Code/ESPDebugger/HanReader.h
+++ b/Debugging/Code/ESPDebugger/HanReader.h
--- a/Debugging/Code/ESPDebugger/KaifaHan.cpp
+++ b/Debugging/Code/ESPDebugger/KaifaHan.cpp
--- a/Debugging/Code/ESPDebugger/KaifaHan.h
+++ b/Debugging/Code/ESPDebugger/KaifaHan.h
--- a/Debugging/Code/ESPDebugger/screenshot.png
+++ b/Debugging/Code/ESPDebugger/screenshot.png
--- a/Debugging/Code/HanDebugger/.gitignore
+++ b/Debugging/Code/HanDebugger/.gitignore
--- a/Debugging/Code/HanDebugger/HanDebugger.sln
+++ b/Debugging/Code/HanDebugger/HanDebugger.sln
--- a/Debugging/Code/HanDebugger/HanDebugger/App.config
+++ b/Debugging/Code/HanDebugger/HanDebugger/App.config
--- a/Debugging/Code/HanDebugger/HanDebugger/Crc16.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/Crc16.cs
--- a/Debugging/Code/HanDebugger/HanDebugger/DlmsReader.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/DlmsReader.cs
--- a/Debugging/Code/HanDebugger/HanDebugger/HanDebugger.csproj
+++ b/Debugging/Code/HanDebugger/HanDebugger/HanDebugger.csproj
--- a/Debugging/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs
--- a/Debugging/Code/HanDebugger/HanDebugger/Program.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/Program.cs
--- a/Debugging/Code/HanDebugger/HanDebugger/Properties/AssemblyInfo.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/Properties/AssemblyInfo.cs
--- a/Debugging/Code/HanDebugger/HanDebugger/Reader.cs
+++ b/Debugging/Code/HanDebugger/HanDebugger/Reader.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/Crc16Test.cs
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/Crc16Test.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/DlmsReaderTest.cs
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/DlmsReaderTest.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/ESP
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/ESP
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/HanDebuggerTest.csproj
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/HanDebuggerTest.csproj
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/Kamstrup228.txt
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/Kamstrup228.txt
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/Properties/AssemblyInfo.cs
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/Properties/AssemblyInfo.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/ReaderTest.cs
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/ReaderTest.cs
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/SampleData.txt
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/SampleData.txt
--- a/Debugging/Code/HanDebugger/HanDebuggerTest/packages.config
+++ b/Debugging/Code/HanDebugger/HanDebuggerTest/packages.config
--- a/Debugging/Code/HanDebugger/screenshot.png
+++ b/Debugging/Code/HanDebugger/screenshot.png
--- a/Debugging/Code/README.md
+++ b/Debugging/Code/README.md
--- a/Debugging/Code/SerialTestPattern/README.md
+++ b/Debugging/Code/SerialTestPattern/README.md
--- a/Debugging/Code/SerialTestPattern/SerialTestPattern.gif
+++ b/Debugging/Code/SerialTestPattern/SerialTestPattern.gif
--- a/Debugging/Code/SerialTestPattern/SerialTestPattern.ino
+++ b/Debugging/Code/SerialTestPattern/SerialTestPattern.ino
--- a/Debugging/Documentation/Excerpt_BB12.pdf
+++ b/Debugging/Documentation/Excerpt_BB12.pdf
--- a/Debugging/Documentation/Excerpt_GB8.pdf
+++ b/Debugging/Documentation/Excerpt_GB8.pdf
--- a/Debugging/Documentation/Kaifa
+++ b/Debugging/Documentation/Kaifa
--- a/Debugging/Documentation/Kaifa
+++ b/Debugging/Documentation/Kaifa
--- a/Debugging/Documentation/Kamstrup
+++ b/Debugging/Documentation/Kamstrup
--- a/Debugging/Documentation/Kamstrup
+++ b/Debugging/Documentation/Kamstrup
--- a/Debugging/Documentation/NEK
+++ b/Debugging/Documentation/NEK
--- a/Debugging/Documentation/NVE_Info_kunder_HANgrensesnitt.pdf
+++ b/Debugging/Documentation/NVE_Info_kunder_HANgrensesnitt.pdf
--- a/Debugging/Documentation/OBIS
+++ b/Debugging/Documentation/OBIS
--- a/Debugging/Documentation/OBIS
+++ b/Debugging/Documentation/OBIS
--- a/Debugging/PCB/GETTING_STARTED.md
+++ b/Debugging/PCB/GETTING_STARTED.md
--- a/Debugging/PCB/HAN_ESP_Simple/Components.xlsx
+++ b/Debugging/PCB/HAN_ESP_Simple/Components.xlsx
--- a/Debugging/PCB/HAN_ESP_Simple/MQTT
+++ b/Debugging/PCB/HAN_ESP_Simple/MQTT
--- a/Debugging/PCB/HAN_ESP_Simple/PCB
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB
--- a/Debugging/PCB/HAN_ESP_Simple/PCB.PNG
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB.PNG
--- a/Debugging/PCB/HAN_ESP_Simple/PCB/AMSMQTT.PcbLib
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB/AMSMQTT.PcbLib
--- a/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PcbDoc
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PcbDoc
--- a/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcb
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcb
--- a/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcbStructure
+++ b/Debugging/PCB/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcbStructure
--- a/Show More
+++ b/Show More