diff --git a/Electrical/Components.xlsx b/Electrical/Board_001/Components.xlsx similarity index 100% rename from Electrical/Components.xlsx rename to Electrical/Board_001/Components.xlsx diff --git a/Electrical/MQTT screenshot.png b/Electrical/Board_001/MQTT screenshot.png similarity index 100% rename from Electrical/MQTT screenshot.png rename to Electrical/Board_001/MQTT screenshot.png diff --git a/Electrical/PCB (3D).pdf b/Electrical/Board_001/PCB (3D).pdf similarity index 100% rename from Electrical/PCB (3D).pdf rename to Electrical/Board_001/PCB (3D).pdf diff --git a/Electrical/PCB.PNG b/Electrical/Board_001/PCB.PNG similarity index 100% rename from Electrical/PCB.PNG rename to Electrical/Board_001/PCB.PNG diff --git a/Electrical/PCB/AMSMQTT.PcbLib b/Electrical/Board_001/PCB/AMSMQTT.PcbLib similarity index 100% rename from Electrical/PCB/AMSMQTT.PcbLib rename to Electrical/Board_001/PCB/AMSMQTT.PcbLib diff --git a/Electrical/PCB/AMSTOMQTT.PcbDoc b/Electrical/Board_001/PCB/AMSTOMQTT.PcbDoc similarity index 100% rename from Electrical/PCB/AMSTOMQTT.PcbDoc rename to Electrical/Board_001/PCB/AMSTOMQTT.PcbDoc diff --git a/Electrical/PCB/AMSTOMQTT.PrjPcb b/Electrical/Board_001/PCB/AMSTOMQTT.PrjPcb similarity index 100% rename from Electrical/PCB/AMSTOMQTT.PrjPcb rename to Electrical/Board_001/PCB/AMSTOMQTT.PrjPcb diff --git a/Electrical/PCB/AMSTOMQTT.PrjPcbStructure b/Electrical/Board_001/PCB/AMSTOMQTT.PrjPcbStructure similarity index 100% rename from Electrical/PCB/AMSTOMQTT.PrjPcbStructure rename to Electrical/Board_001/PCB/AMSTOMQTT.PrjPcbStructure diff --git a/Electrical/PCB/AMSTOMQTT.SchDoc b/Electrical/Board_001/PCB/AMSTOMQTT.SchDoc similarity index 100% rename from Electrical/PCB/AMSTOMQTT.SchDoc rename to Electrical/Board_001/PCB/AMSTOMQTT.SchDoc diff --git a/Electrical/PCB/Gerber/AMSTOMQTT-macro.APR_LIB b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT-macro.APR_LIB similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT-macro.APR_LIB rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT-macro.APR_LIB diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.DRR b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.DRR similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.DRR rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.DRR diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.EXTREP b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.EXTREP similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.EXTREP rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.EXTREP diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GBL b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBL similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GBL rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBL diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GBS b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBS similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GBS rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBS diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GKO b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GKO similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GKO rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GKO diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GM1 b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM1 similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GM1 rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM1 diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GM13 b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM13 similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GM13 rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM13 diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GM15 b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM15 similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GM15 rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM15 diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GPB b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPB similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GPB rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPB diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GPT b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPT similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GPT rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPT diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GTL b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTL similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GTL rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTL diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GTO b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTO similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GTO rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTO diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GTP b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTP similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GTP rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTP diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.GTS b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTS similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.GTS rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTS diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.LDP b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.LDP similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.LDP rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.LDP diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.REP b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.REP similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.REP rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.REP diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.RUL b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.RUL similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.RUL rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.RUL diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.TXT b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.TXT similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.TXT rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.TXT diff --git a/Electrical/PCB/Gerber/AMSTOMQTT.apr b/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.apr similarity index 100% rename from Electrical/PCB/Gerber/AMSTOMQTT.apr rename to Electrical/Board_001/PCB/Gerber/AMSTOMQTT.apr diff --git a/Electrical/PCB/Gerber/Status Report.Txt b/Electrical/Board_001/PCB/Gerber/Status Report.Txt similarity index 100% rename from Electrical/PCB/Gerber/Status Report.Txt rename to Electrical/Board_001/PCB/Gerber/Status Report.Txt diff --git a/Electrical/PCB/National Semiconductor Amplifier.IntLib b/Electrical/Board_001/PCB/National Semiconductor Amplifier.IntLib similarity index 100% rename from Electrical/PCB/National Semiconductor Amplifier.IntLib rename to Electrical/Board_001/PCB/National Semiconductor Amplifier.IntLib diff --git a/Electrical/PCB/National Semiconductor LDO.IntLib b/Electrical/Board_001/PCB/National Semiconductor LDO.IntLib similarity index 100% rename from Electrical/PCB/National Semiconductor LDO.IntLib rename to Electrical/Board_001/PCB/National Semiconductor LDO.IntLib diff --git a/Electrical/Prototype.jpg b/Electrical/Board_001/Prototype.jpg similarity index 100% rename from Electrical/Prototype.jpg rename to Electrical/Board_001/Prototype.jpg diff --git a/Electrical/README.md b/Electrical/Board_001/README.md similarity index 100% rename from Electrical/README.md rename to Electrical/Board_001/README.md diff --git a/Electrical/Raw HAN (scope).jpg b/Electrical/Board_001/Raw HAN (scope).jpg similarity index 100% rename from Electrical/Raw HAN (scope).jpg rename to Electrical/Board_001/Raw HAN (scope).jpg diff --git a/Electrical/Schematics.PNG b/Electrical/Board_001/Schematics.PNG similarity index 100% rename from Electrical/Schematics.PNG rename to Electrical/Board_001/Schematics.PNG diff --git a/Electrical/Schematics.pdf b/Electrical/Board_001/Schematics.pdf similarity index 100% rename from Electrical/Schematics.pdf rename to Electrical/Board_001/Schematics.pdf diff --git a/Electrical/Simple HAN to FTDI Circuit (breadboard).jpg b/Electrical/Board_001/Simple HAN to FTDI Circuit (breadboard).jpg similarity index 100% rename from Electrical/Simple HAN to FTDI Circuit (breadboard).jpg rename to Electrical/Board_001/Simple HAN to FTDI Circuit (breadboard).jpg diff --git a/README.md b/README.md index e6537179..e8285574 100644 --- a/README.md +++ b/README.md @@ -14,24 +14,24 @@ Components will be ESP8622, Arduino code, a (very simplified) M-bus <-> 3.3V ser As a start, we should try to get information from the three types of AMS meters currently being installed in Norway. Some details about these are available here: [NVE_Info_kunder_HANgrensesnitt.pdf](Documentation/NVE_Info_kunder_HANgrensesnitt.pdf) The project should include: -- [x] [Simple circuit to transform MBus levels to 3.3V serial](/Electrical) +- [x] [Simple circuit to transform MBus levels to 3.3V serial](/Electrical/Board_001) - [x] [Code to capture and analyze data from PC](/Code/HanDebugger) - [x] [Code to capture and analyze data from Arduino](/Code/ESPDebugger) - [x] [Sample data from various meters](/Samples) - [x] [Documentation on HAN / MBus / DLMS/COSEM](/Documentation) - [X] [Code to parse DLMS data into a structure](/Code/Arduino/HanReader/src) -- [X] [Real schematics, including ESP8266](/Electrical/PCB) -- [X] [PCB layout](/Electrical/PCB) +- [X] [Real schematics, including ESP8266](/Electrical/Board_001/PCB) +- [X] [PCB layout](/Electrical/Board_001/PCB) - [ ] Arduino library - [X] [Arduino sample sketch to read values and report to MQTT server](/Code/Arduino) ## Electrical design -* [Electrical design](./Electrical) +* [Electrical design](./Electrical/Board_001) ### Circuit prototype -![Breadboard](/Electrical/Prototype.jpg) +![Breadboard](/Electrical/Board_001/Prototype.jpg) ### MQTT output -![MQTT screenshot](/Electrical/MQTT%20screenshot.png) +![MQTT screenshot](/Electrical/Board_001/MQTT%20screenshot.png)