diff --git a/Electrical/Board_001/Components.xlsx b/Electrical/HAN_ESP_Simple/Components.xlsx similarity index 100% rename from Electrical/Board_001/Components.xlsx rename to Electrical/HAN_ESP_Simple/Components.xlsx diff --git a/Electrical/Board_001/MQTT screenshot.png b/Electrical/HAN_ESP_Simple/MQTT screenshot.png similarity index 100% rename from Electrical/Board_001/MQTT screenshot.png rename to Electrical/HAN_ESP_Simple/MQTT screenshot.png diff --git a/Electrical/Board_001/PCB (3D).pdf b/Electrical/HAN_ESP_Simple/PCB (3D).pdf similarity index 100% rename from Electrical/Board_001/PCB (3D).pdf rename to Electrical/HAN_ESP_Simple/PCB (3D).pdf diff --git a/Electrical/Board_001/PCB.PNG b/Electrical/HAN_ESP_Simple/PCB.PNG similarity index 100% rename from Electrical/Board_001/PCB.PNG rename to Electrical/HAN_ESP_Simple/PCB.PNG diff --git a/Electrical/Board_001/PCB/AMSMQTT.PcbLib b/Electrical/HAN_ESP_Simple/PCB/AMSMQTT.PcbLib similarity index 100% rename from Electrical/Board_001/PCB/AMSMQTT.PcbLib rename to Electrical/HAN_ESP_Simple/PCB/AMSMQTT.PcbLib diff --git a/Electrical/Board_001/PCB/AMSTOMQTT.PcbDoc b/Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PcbDoc similarity index 100% rename from Electrical/Board_001/PCB/AMSTOMQTT.PcbDoc rename to Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PcbDoc diff --git a/Electrical/Board_001/PCB/AMSTOMQTT.PrjPcb b/Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcb similarity index 100% rename from Electrical/Board_001/PCB/AMSTOMQTT.PrjPcb rename to Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcb diff --git a/Electrical/Board_001/PCB/AMSTOMQTT.PrjPcbStructure b/Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcbStructure similarity index 100% rename from Electrical/Board_001/PCB/AMSTOMQTT.PrjPcbStructure rename to Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.PrjPcbStructure diff --git a/Electrical/Board_001/PCB/AMSTOMQTT.SchDoc b/Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.SchDoc similarity index 100% rename from Electrical/Board_001/PCB/AMSTOMQTT.SchDoc rename to Electrical/HAN_ESP_Simple/PCB/AMSTOMQTT.SchDoc diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT-macro.APR_LIB b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT-macro.APR_LIB similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT-macro.APR_LIB rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT-macro.APR_LIB diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.DRR b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.DRR similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.DRR rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.DRR diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.EXTREP b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.EXTREP similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.EXTREP rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.EXTREP diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBL b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GBL similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBL rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GBL diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBS b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GBS similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GBS rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GBS diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GKO b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GKO similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GKO rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GKO diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM1 b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM1 similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM1 rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM1 diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM13 b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM13 similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM13 rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM13 diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM15 b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM15 similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GM15 rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GM15 diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPB b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GPB similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPB rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GPB diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPT b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GPT similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GPT rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GPT diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTL b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTL similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTL rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTL diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTO b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTO similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTO rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTO diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTP b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTP similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTP rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTP diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTS b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTS similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.GTS rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.GTS diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.LDP b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.LDP similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.LDP rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.LDP diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.REP b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.REP similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.REP rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.REP diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.RUL b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.RUL similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.RUL rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.RUL diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.TXT b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.TXT similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.TXT rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.TXT diff --git a/Electrical/Board_001/PCB/Gerber/AMSTOMQTT.apr b/Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.apr similarity index 100% rename from Electrical/Board_001/PCB/Gerber/AMSTOMQTT.apr rename to Electrical/HAN_ESP_Simple/PCB/Gerber/AMSTOMQTT.apr diff --git a/Electrical/Board_001/PCB/Gerber/Status Report.Txt b/Electrical/HAN_ESP_Simple/PCB/Gerber/Status Report.Txt similarity index 100% rename from Electrical/Board_001/PCB/Gerber/Status Report.Txt rename to Electrical/HAN_ESP_Simple/PCB/Gerber/Status Report.Txt diff --git a/Electrical/Board_001/PCB/National Semiconductor Amplifier.IntLib b/Electrical/HAN_ESP_Simple/PCB/National Semiconductor Amplifier.IntLib similarity index 100% rename from Electrical/Board_001/PCB/National Semiconductor Amplifier.IntLib rename to Electrical/HAN_ESP_Simple/PCB/National Semiconductor Amplifier.IntLib diff --git a/Electrical/Board_001/PCB/National Semiconductor LDO.IntLib b/Electrical/HAN_ESP_Simple/PCB/National Semiconductor LDO.IntLib similarity index 100% rename from Electrical/Board_001/PCB/National Semiconductor LDO.IntLib rename to Electrical/HAN_ESP_Simple/PCB/National Semiconductor LDO.IntLib diff --git a/Electrical/Board_001/Prototype.jpg b/Electrical/HAN_ESP_Simple/Prototype.jpg similarity index 100% rename from Electrical/Board_001/Prototype.jpg rename to Electrical/HAN_ESP_Simple/Prototype.jpg diff --git a/Electrical/Board_001/README.md b/Electrical/HAN_ESP_Simple/README.md similarity index 100% rename from Electrical/Board_001/README.md rename to Electrical/HAN_ESP_Simple/README.md diff --git a/Electrical/Board_001/Raw HAN (scope).jpg b/Electrical/HAN_ESP_Simple/Raw HAN (scope).jpg similarity index 100% rename from Electrical/Board_001/Raw HAN (scope).jpg rename to Electrical/HAN_ESP_Simple/Raw HAN (scope).jpg diff --git a/Electrical/Board_001/Schematics.PNG b/Electrical/HAN_ESP_Simple/Schematics.PNG similarity index 100% rename from Electrical/Board_001/Schematics.PNG rename to Electrical/HAN_ESP_Simple/Schematics.PNG diff --git a/Electrical/Board_001/Schematics.pdf b/Electrical/HAN_ESP_Simple/Schematics.pdf similarity index 100% rename from Electrical/Board_001/Schematics.pdf rename to Electrical/HAN_ESP_Simple/Schematics.pdf diff --git a/Electrical/Board_001/Simple HAN to FTDI Circuit (breadboard).jpg b/Electrical/HAN_ESP_Simple/Simple HAN to FTDI Circuit (breadboard).jpg similarity index 100% rename from Electrical/Board_001/Simple HAN to FTDI Circuit (breadboard).jpg rename to Electrical/HAN_ESP_Simple/Simple HAN to FTDI Circuit (breadboard).jpg diff --git a/Electrical/Board_002/.gitignore b/Electrical/HAN_TTL_TSS721/.gitignore similarity index 100% rename from Electrical/Board_002/.gitignore rename to Electrical/HAN_TTL_TSS721/.gitignore diff --git a/Electrical/Board_002/README.md b/Electrical/HAN_TTL_TSS721/README.md similarity index 100% rename from Electrical/Board_002/README.md rename to Electrical/HAN_TTL_TSS721/README.md diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wings b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wings similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wings rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wings diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wrl b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wrl similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wrl rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x06.wrl diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wings b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wings similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wings rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wings diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wrl b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wrl similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wrl rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x08.wrl diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wings b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wings similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wings rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wings diff --git a/Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl diff --git a/Electrical/Board_002/Socket_Arduino_Uno.pretty/Arduino_1pin.kicad_mod b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Arduino_1pin.kicad_mod similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.pretty/Arduino_1pin.kicad_mod rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Arduino_1pin.kicad_mod diff --git a/Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x06.kicad_mod b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x06.kicad_mod similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x06.kicad_mod rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x06.kicad_mod diff --git a/Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x08.kicad_mod b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x08.kicad_mod similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x08.kicad_mod rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x08.kicad_mod diff --git a/Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x10.kicad_mod b/Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x10.kicad_mod similarity index 100% rename from Electrical/Board_002/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x10.kicad_mod rename to Electrical/HAN_TTL_TSS721/Socket_Arduino_Uno.pretty/Socket_Strip_Arduino_1x10.kicad_mod diff --git a/Electrical/Board_002/docs/tss721a.pdf b/Electrical/HAN_TTL_TSS721/docs/tss721a.pdf similarity index 100% rename from Electrical/Board_002/docs/tss721a.pdf rename to Electrical/HAN_TTL_TSS721/docs/tss721a.pdf diff --git a/Electrical/Board_002/fp-lib-table b/Electrical/HAN_TTL_TSS721/fp-lib-table similarity index 100% rename from Electrical/Board_002/fp-lib-table rename to Electrical/HAN_TTL_TSS721/fp-lib-table diff --git a/Electrical/Board_002/lib/amstomqtt.dcm b/Electrical/HAN_TTL_TSS721/lib/amstomqtt.dcm similarity index 100% rename from Electrical/Board_002/lib/amstomqtt.dcm rename to Electrical/HAN_TTL_TSS721/lib/amstomqtt.dcm diff --git a/Electrical/Board_002/lib/amstomqtt.lib b/Electrical/HAN_TTL_TSS721/lib/amstomqtt.lib similarity index 100% rename from Electrical/Board_002/lib/amstomqtt.lib rename to Electrical/HAN_TTL_TSS721/lib/amstomqtt.lib diff --git a/Electrical/Board_002/mbus-receiver-opto.png b/Electrical/HAN_TTL_TSS721/mbus-receiver-opto.png similarity index 100% rename from Electrical/Board_002/mbus-receiver-opto.png rename to Electrical/HAN_TTL_TSS721/mbus-receiver-opto.png diff --git a/Electrical/Board_002/mbus-receiver-opto.sch b/Electrical/HAN_TTL_TSS721/mbus-receiver-opto.sch similarity index 100% rename from Electrical/Board_002/mbus-receiver-opto.sch rename to Electrical/HAN_TTL_TSS721/mbus-receiver-opto.sch diff --git a/Electrical/Board_002/shield1-cache.lib b/Electrical/HAN_TTL_TSS721/shield1-cache.lib similarity index 100% rename from Electrical/Board_002/shield1-cache.lib rename to Electrical/HAN_TTL_TSS721/shield1-cache.lib diff --git a/Electrical/Board_002/shield1.kicad_pcb b/Electrical/HAN_TTL_TSS721/shield1.kicad_pcb similarity index 100% rename from Electrical/Board_002/shield1.kicad_pcb rename to Electrical/HAN_TTL_TSS721/shield1.kicad_pcb diff --git a/Electrical/Board_002/shield1.net b/Electrical/HAN_TTL_TSS721/shield1.net similarity index 100% rename from Electrical/Board_002/shield1.net rename to Electrical/HAN_TTL_TSS721/shield1.net diff --git a/Electrical/Board_002/shield1.png b/Electrical/HAN_TTL_TSS721/shield1.png similarity index 100% rename from Electrical/Board_002/shield1.png rename to Electrical/HAN_TTL_TSS721/shield1.png diff --git a/Electrical/Board_002/shield1.pro b/Electrical/HAN_TTL_TSS721/shield1.pro similarity index 100% rename from Electrical/Board_002/shield1.pro rename to Electrical/HAN_TTL_TSS721/shield1.pro diff --git a/Electrical/Board_002/shield1.sch b/Electrical/HAN_TTL_TSS721/shield1.sch similarity index 100% rename from Electrical/Board_002/shield1.sch rename to Electrical/HAN_TTL_TSS721/shield1.sch diff --git a/Electrical/Board_003/.gitignore b/Electrical/MBus_Simulator/.gitignore similarity index 100% rename from Electrical/Board_003/.gitignore rename to Electrical/MBus_Simulator/.gitignore diff --git a/Electrical/Board_003/MBus_Simulator.B.Cu.png b/Electrical/MBus_Simulator/MBus_Simulator.B.Cu.png similarity index 100% rename from Electrical/Board_003/MBus_Simulator.B.Cu.png rename to Electrical/MBus_Simulator/MBus_Simulator.B.Cu.png diff --git a/Electrical/Board_003/MBus_Simulator.B.Cu.svg b/Electrical/MBus_Simulator/MBus_Simulator.B.Cu.svg similarity index 100% rename from Electrical/Board_003/MBus_Simulator.B.Cu.svg rename to Electrical/MBus_Simulator/MBus_Simulator.B.Cu.svg diff --git a/Electrical/Board_003/MBus_Simulator.F.Cu.png b/Electrical/MBus_Simulator/MBus_Simulator.F.Cu.png similarity index 100% rename from Electrical/Board_003/MBus_Simulator.F.Cu.png rename to Electrical/MBus_Simulator/MBus_Simulator.F.Cu.png diff --git a/Electrical/Board_003/MBus_Simulator.F.Cu.svg b/Electrical/MBus_Simulator/MBus_Simulator.F.Cu.svg similarity index 100% rename from Electrical/Board_003/MBus_Simulator.F.Cu.svg rename to Electrical/MBus_Simulator/MBus_Simulator.F.Cu.svg diff --git a/Electrical/Board_003/MBus_Simulator.png b/Electrical/MBus_Simulator/MBus_Simulator.png similarity index 100% rename from Electrical/Board_003/MBus_Simulator.png rename to Electrical/MBus_Simulator/MBus_Simulator.png diff --git a/Electrical/Board_003/MBus_Simulator.schematic.png b/Electrical/MBus_Simulator/MBus_Simulator.schematic.png similarity index 100% rename from Electrical/Board_003/MBus_Simulator.schematic.png rename to Electrical/MBus_Simulator/MBus_Simulator.schematic.png diff --git a/Electrical/Board_003/MBus_Simulator.schematic.svg b/Electrical/MBus_Simulator/MBus_Simulator.schematic.svg similarity index 100% rename from Electrical/Board_003/MBus_Simulator.schematic.svg rename to Electrical/MBus_Simulator/MBus_Simulator.schematic.svg diff --git a/Electrical/Board_003/Makefile b/Electrical/MBus_Simulator/Makefile similarity index 100% rename from Electrical/Board_003/Makefile rename to Electrical/MBus_Simulator/Makefile diff --git a/Electrical/Board_003/README.md b/Electrical/MBus_Simulator/README.md similarity index 100% rename from Electrical/Board_003/README.md rename to Electrical/MBus_Simulator/README.md diff --git a/Electrical/Board_003/doc/MBus_USB.pdf b/Electrical/MBus_Simulator/doc/MBus_USB.pdf similarity index 100% rename from Electrical/Board_003/doc/MBus_USB.pdf rename to Electrical/MBus_Simulator/doc/MBus_USB.pdf diff --git a/Electrical/Board_003/doc/minimaster.tif b/Electrical/MBus_Simulator/doc/minimaster.tif similarity index 100% rename from Electrical/Board_003/doc/minimaster.tif rename to Electrical/MBus_Simulator/doc/minimaster.tif diff --git a/Electrical/Board_003/fp-lib-table b/Electrical/MBus_Simulator/fp-lib-table similarity index 100% rename from Electrical/Board_003/fp-lib-table rename to Electrical/MBus_Simulator/fp-lib-table diff --git a/Electrical/Board_003/lib/6mm_logo_copper.emp b/Electrical/MBus_Simulator/lib/6mm_logo_copper.emp similarity index 100% rename from Electrical/Board_003/lib/6mm_logo_copper.emp rename to Electrical/MBus_Simulator/lib/6mm_logo_copper.emp diff --git a/Electrical/Board_003/mbus_master-cache.lib b/Electrical/MBus_Simulator/mbus_master-cache.lib similarity index 100% rename from Electrical/Board_003/mbus_master-cache.lib rename to Electrical/MBus_Simulator/mbus_master-cache.lib diff --git a/Electrical/Board_003/mbus_master.kicad_pcb b/Electrical/MBus_Simulator/mbus_master.kicad_pcb similarity index 100% rename from Electrical/Board_003/mbus_master.kicad_pcb rename to Electrical/MBus_Simulator/mbus_master.kicad_pcb diff --git a/Electrical/Board_003/mbus_master.net b/Electrical/MBus_Simulator/mbus_master.net similarity index 100% rename from Electrical/Board_003/mbus_master.net rename to Electrical/MBus_Simulator/mbus_master.net diff --git a/Electrical/Board_003/mbus_master.pro b/Electrical/MBus_Simulator/mbus_master.pro similarity index 100% rename from Electrical/Board_003/mbus_master.pro rename to Electrical/MBus_Simulator/mbus_master.pro diff --git a/Electrical/Board_003/mbus_master.sch b/Electrical/MBus_Simulator/mbus_master.sch similarity index 100% rename from Electrical/Board_003/mbus_master.sch rename to Electrical/MBus_Simulator/mbus_master.sch diff --git a/Electrical/Board_003/simulation/.gitignore b/Electrical/MBus_Simulator/simulation/.gitignore similarity index 100% rename from Electrical/Board_003/simulation/.gitignore rename to Electrical/MBus_Simulator/simulation/.gitignore diff --git a/Electrical/Board_003/simulation/README.md b/Electrical/MBus_Simulator/simulation/README.md similarity index 100% rename from Electrical/Board_003/simulation/README.md rename to Electrical/MBus_Simulator/simulation/README.md diff --git a/Electrical/Board_003/simulation/current_limit.png b/Electrical/MBus_Simulator/simulation/current_limit.png similarity index 100% rename from Electrical/Board_003/simulation/current_limit.png rename to Electrical/MBus_Simulator/simulation/current_limit.png diff --git a/Electrical/Board_003/simulation/current_limit.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/current_limit.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/current_limit.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/current_limit.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/current_limit.qucs-s.sch b/Electrical/MBus_Simulator/simulation/current_limit.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/current_limit.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/current_limit.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_001.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_001.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_001.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_001.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_001.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_001.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_001.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_001.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_002.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_002.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_002.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_002.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_002.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_002.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_002.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_002.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_003.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_003.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_003.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_003.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_003.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_003.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_003.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_003.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_004.png b/Electrical/MBus_Simulator/simulation/mbus_master_004.png similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_004.png rename to Electrical/MBus_Simulator/simulation/mbus_master_004.png diff --git a/Electrical/Board_003/simulation/mbus_master_004.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_004.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_004.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_004.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_004.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_004.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_004.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_004.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_100.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_100.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_100.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_100.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_100.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_100.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_100.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_100.qucs-s.sch diff --git a/Electrical/Board_003/simulation/mbus_master_100_v2.png b/Electrical/MBus_Simulator/simulation/mbus_master_100_v2.png similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_100_v2.png rename to Electrical/MBus_Simulator/simulation/mbus_master_100_v2.png diff --git a/Electrical/Board_003/simulation/mbus_master_100_v3.png b/Electrical/MBus_Simulator/simulation/mbus_master_100_v3.png similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_100_v3.png rename to Electrical/MBus_Simulator/simulation/mbus_master_100_v3.png diff --git a/Electrical/Board_003/simulation/mbus_master_101.png b/Electrical/MBus_Simulator/simulation/mbus_master_101.png similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_101.png rename to Electrical/MBus_Simulator/simulation/mbus_master_101.png diff --git a/Electrical/Board_003/simulation/mbus_master_101.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/mbus_master_101.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_101.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/mbus_master_101.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/mbus_master_101.qucs-s.sch b/Electrical/MBus_Simulator/simulation/mbus_master_101.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/mbus_master_101.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/mbus_master_101.qucs-s.sch diff --git a/Electrical/Board_003/simulation/minimaster_001.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/minimaster_001.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/minimaster_001.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/minimaster_001.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/minimaster_001.qucs-s.sch b/Electrical/MBus_Simulator/simulation/minimaster_001.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/minimaster_001.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/minimaster_001.qucs-s.sch diff --git a/Electrical/Board_003/simulation/minimaster_002.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/minimaster_002.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/minimaster_002.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/minimaster_002.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/minimaster_002.qucs-s.sch b/Electrical/MBus_Simulator/simulation/minimaster_002.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/minimaster_002.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/minimaster_002.qucs-s.sch diff --git a/Electrical/Board_003/simulation/minimaster_003.qucs-s.dpl b/Electrical/MBus_Simulator/simulation/minimaster_003.qucs-s.dpl similarity index 100% rename from Electrical/Board_003/simulation/minimaster_003.qucs-s.dpl rename to Electrical/MBus_Simulator/simulation/minimaster_003.qucs-s.dpl diff --git a/Electrical/Board_003/simulation/minimaster_003.qucs-s.sch b/Electrical/MBus_Simulator/simulation/minimaster_003.qucs-s.sch similarity index 100% rename from Electrical/Board_003/simulation/minimaster_003.qucs-s.sch rename to Electrical/MBus_Simulator/simulation/minimaster_003.qucs-s.sch diff --git a/Electrical/Board_003/simulation/zener_test.dpl b/Electrical/MBus_Simulator/simulation/zener_test.dpl similarity index 100% rename from Electrical/Board_003/simulation/zener_test.dpl rename to Electrical/MBus_Simulator/simulation/zener_test.dpl diff --git a/Electrical/Board_003/simulation/zener_test.sch b/Electrical/MBus_Simulator/simulation/zener_test.sch similarity index 100% rename from Electrical/Board_003/simulation/zener_test.sch rename to Electrical/MBus_Simulator/simulation/zener_test.sch diff --git a/Electrical/Board_003/simulation/zener_test_v2.png b/Electrical/MBus_Simulator/simulation/zener_test_v2.png similarity index 100% rename from Electrical/Board_003/simulation/zener_test_v2.png rename to Electrical/MBus_Simulator/simulation/zener_test_v2.png diff --git a/Electrical/Board_003/simulation/zener_test_v3.png b/Electrical/MBus_Simulator/simulation/zener_test_v3.png similarity index 100% rename from Electrical/Board_003/simulation/zener_test_v3.png rename to Electrical/MBus_Simulator/simulation/zener_test_v3.png diff --git a/Electrical/Board_003/zener_not_ok.png b/Electrical/MBus_Simulator/zener_not_ok.png similarity index 100% rename from Electrical/Board_003/zener_not_ok.png rename to Electrical/MBus_Simulator/zener_not_ok.png diff --git a/Electrical/Board_003/zener_ok.png b/Electrical/MBus_Simulator/zener_ok.png similarity index 100% rename from Electrical/Board_003/zener_ok.png rename to Electrical/MBus_Simulator/zener_ok.png diff --git a/Electrical/README.md b/Electrical/README.md index 3d695596..e67621ac 100644 --- a/Electrical/README.md +++ b/Electrical/README.md @@ -3,9 +3,9 @@ Here are links to the different board designs together with a short summary. -## Board 1 +## HAN_ESP_Simple (Was: Board 1) -The project's original [board design](Board_001). It +The project's original [board design](HAN_ESP_Simple). It * is based on the ESP8266 chip. * is powered by USB. @@ -16,9 +16,9 @@ The project's original [board design](Board_001). It Prototypes have been made and some people have started using them(?). -## Board 2 +## HAN_TTL_TSS721 (Was: Board 2) -This [board design](Board_002) is a newer alternative to the original. It +This [board design](HAN_TTL_TSS721) is a newer alternative to the original. It * is an Arduino shield. * uses the industry standard TSS721 chip to interface the M-bus. @@ -29,9 +29,9 @@ This [board design](Board_002) is a newer alternative to the original. It Unfinished, just started. -## Board 3 +## MBUS_Simulator (Was: Board 3) -This [board](Board_003) is a M-bus master simulator to be able to develop and +This [board](MBUS_Simulator) is a M-bus master simulator to be able to develop and test the other boards without being dependent on having and using a real AMS unit. diff --git a/README.md b/README.md index 7a253e07..44062ae9 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,14 @@ 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/Board_001) +- [x] [Simple circuit to transform MBus levels to 3.3V serial](/Electrical/HAN_ESP_Simple) - [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/Board_001/PCB) -- [X] [PCB layout](/Electrical/Board_001/PCB) +- [X] [Real schematics, including ESP8266](/Electrical/HAN_ESP_Simple/PCB) +- [X] [PCB layout](/Electrical/HAN_ESP_Simple/PCB) - [ ] Arduino library - [X] [Arduino sample sketch to read values and report to MQTT server](/Code/Arduino) @@ -32,7 +32,7 @@ More details in [electrical design](./Electrical). ### Circuit prototype -![Breadboard](Electrical/Board_001/Prototype.jpg) +![Breadboard](Electrical/HAN_ESP_Simple/Prototype.jpg) ### MQTT output -![MQTT screenshot](Electrical/Board_001/MQTT%20screenshot.png) +![MQTT screenshot](Electrical/HAN_ESP_Simple/MQTT%20screenshot.png)