diff --git a/.gitignore b/.gitignore index 71b675cd..c07b723e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ [Dd]ebug/ [Rr]elease/ **/__vm/ +.DS_Store diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index efc06aff..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Electrical/kicad-libs/kicad-symbols"] - path = Electrical/kicad-libs/kicad-symbols - url = https://github.com/kicad/kicad-symbols diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino similarity index 100% rename from Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino rename to Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.sln b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.sln similarity index 100% rename from Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.sln rename to Arduino Code/AmsToMqttBridge/AmsToMqttBridge.sln diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.vcxproj similarity index 100% rename from Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj rename to Arduino Code/AmsToMqttBridge/AmsToMqttBridge.vcxproj diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters similarity index 100% rename from Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters rename to Arduino Code/AmsToMqttBridge/AmsToMqttBridge.vcxproj.filters diff --git a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp b/Arduino Code/AmsToMqttBridge/accesspoint.cpp similarity index 98% rename from Code/Arduino/AmsToMqttBridge/accesspoint.cpp rename to Arduino Code/AmsToMqttBridge/accesspoint.cpp index 711f02aa..f1fe2723 100644 --- a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp +++ b/Arduino Code/AmsToMqttBridge/accesspoint.cpp @@ -97,8 +97,8 @@ void accesspoint::handleRoot() { server.send(200, "text/html", ""); // Empty content inhibits Content-length header so we have to close the socket ourselves. String html = String("\r\n\r\n
\r\n\t\r\n\r\n\r\n\r\n\t\r\n\r\n\t\r\n\r\n"); server.sendContent(html); - server.sendContent(""); - server.client().stop(); // Stop is needed because we sent no content length + server.sendContent(""); // (End 1/2) Sending a zero length chunk to terminate session + server.client().stop(); // (End 2/2) Stop is needed because we sent no content length } diff --git a/Code/Arduino/AmsToMqttBridge/accesspoint.h b/Arduino Code/AmsToMqttBridge/accesspoint.h similarity index 100% rename from Code/Arduino/AmsToMqttBridge/accesspoint.h rename to Arduino Code/AmsToMqttBridge/accesspoint.h diff --git a/Code/Arduino/AmsToMqttBridge/configuration.cpp b/Arduino Code/AmsToMqttBridge/configuration.cpp similarity index 100% rename from Code/Arduino/AmsToMqttBridge/configuration.cpp rename to Arduino Code/AmsToMqttBridge/configuration.cpp diff --git a/Code/Arduino/AmsToMqttBridge/configuration.h b/Arduino Code/AmsToMqttBridge/configuration.h similarity index 100% rename from Code/Arduino/AmsToMqttBridge/configuration.h rename to Arduino Code/AmsToMqttBridge/configuration.h diff --git a/Code/Arduino/HanReader/HanReader.sln b/Arduino Code/Arduino Libraries/HanReader/HanReader.sln similarity index 100% rename from Code/Arduino/HanReader/HanReader.sln rename to Arduino Code/Arduino Libraries/HanReader/HanReader.sln diff --git a/Code/Arduino/HanReader/HanReader.vcxitems b/Arduino Code/Arduino Libraries/HanReader/HanReader.vcxitems similarity index 100% rename from Code/Arduino/HanReader/HanReader.vcxitems rename to Arduino Code/Arduino Libraries/HanReader/HanReader.vcxitems diff --git a/Code/Arduino/HanReader/HanReader.vcxitems.filters b/Arduino Code/Arduino Libraries/HanReader/HanReader.vcxitems.filters similarity index 100% rename from Code/Arduino/HanReader/HanReader.vcxitems.filters rename to Arduino Code/Arduino Libraries/HanReader/HanReader.vcxitems.filters diff --git a/Code/Arduino/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino b/Arduino Code/Arduino Libraries/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino similarity index 100% rename from Code/Arduino/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino rename to Arduino Code/Arduino Libraries/HanReader/examples/Kamstrup/mqtt/KamstrupMqtt.ino diff --git a/Code/Arduino/HanReader/examples/Kamstrup/mqtt/README.md b/Arduino Code/Arduino Libraries/HanReader/examples/Kamstrup/mqtt/README.md similarity index 100% rename from Code/Arduino/HanReader/examples/Kamstrup/mqtt/README.md rename to Arduino Code/Arduino Libraries/HanReader/examples/Kamstrup/mqtt/README.md diff --git a/Code/Arduino/HanReader/examples/read_han_simple/read_han_simple.ino b/Arduino Code/Arduino Libraries/HanReader/examples/read_han_simple/read_han_simple.ino similarity index 100% rename from Code/Arduino/HanReader/examples/read_han_simple/read_han_simple.ino rename to Arduino Code/Arduino Libraries/HanReader/examples/read_han_simple/read_han_simple.ino diff --git a/Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino b/Arduino Code/Arduino Libraries/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino similarity index 100% rename from Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino rename to Arduino Code/Arduino Libraries/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino diff --git a/Code/Arduino/HanReader/keywords.txt b/Arduino Code/Arduino Libraries/HanReader/keywords.txt similarity index 100% rename from Code/Arduino/HanReader/keywords.txt rename to Arduino Code/Arduino Libraries/HanReader/keywords.txt diff --git a/Arduino Code/Arduino Libraries/HanReader/library.properties b/Arduino Code/Arduino Libraries/HanReader/library.properties new file mode 100644 index 00000000..80866f62 --- /dev/null +++ b/Arduino Code/Arduino Libraries/HanReader/library.properties @@ -0,0 +1,9 @@ +name=HANreader +version=1.0.0 +author=roarfred +maintainer=roarfred