From 0c3531d5727a7560754b160eaa97d87621c8b263 Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Sat, 8 Feb 2025 13:10:28 +0100 Subject: [PATCH] Move files around, add case build job test --- .github/workflows/build-stls.yml | 23 ++++++++++++++++++ .gitmodules | 2 +- .../MCU_RaspberryPi_and_Boards.kicad_sym | 0 .../Crystal_SMD_HC49-US.kicad_mod | 0 .../Pico.wrl | 0 .../RP2040-QFN-56.kicad_mod | 0 .../RPi_Pico_SMD_TH.kicad_mod | 0 .../{butns => board}/SK6812-EC20.kicad_sym | 0 .../SK6812-EC20.pretty/SK6812-EC20.STEP | 0 .../SK6812-EC20.pretty/SK6812-EC20.kicad_mod | 0 hardware/{butns => board}/TS-1187A.step | 0 .../{butns => board}/butns-backend.kicad_sch | 0 .../{butns => board}/butns-frontend.kicad_sch | 0 hardware/{butns => board}/butns.kicad_pcb | 0 hardware/{butns => board}/butns.kicad_pro | 0 hardware/{butns => board}/butns.kicad_sch | 0 hardware/{butns => board}/butns.step | 0 hardware/{butns => board}/butns.stl | Bin hardware/{butns => board}/fp-lib-table | 0 .../jlcpcb/gerber/butns-CuBottom.gbr | 0 .../jlcpcb/gerber/butns-CuTop.gbr | 0 .../jlcpcb/gerber/butns-EdgeCuts.gbr | 0 .../jlcpcb/gerber/butns-MaskBottom.gbr | 0 .../jlcpcb/gerber/butns-MaskTop.gbr | 0 .../jlcpcb/gerber/butns-NPTH-drl_map.pdf | Bin .../jlcpcb/gerber/butns-NPTH.drl | 0 .../jlcpcb/gerber/butns-PTH-drl_map.pdf | Bin .../jlcpcb/gerber/butns-PTH.drl | 0 .../jlcpcb/gerber/butns-PasteBottom.gbr | 0 .../jlcpcb/gerber/butns-PasteTop.gbr | 0 .../jlcpcb/gerber/butns-SilkBottom.gbr | 0 .../jlcpcb/gerber/butns-SilkTop.gbr | 0 .../jlcpcb/gerber/butns-VScore.gbr | 0 .../jlcpcb/production_files/BOM-butns.csv | 0 .../jlcpcb/production_files/CPL-butns.csv | 0 .../jlcpcb/production_files/GERBER-butns.zip | Bin hardware/{butns => board}/jlcpcb/project.db | Bin .../model/Raspberry Pi Pico.step | 0 hardware/{butns => board}/model/butns.wrl | 0 hardware/{butns => board}/model/picow.stl | Bin .../model/shapes3D/C_0603_1608Metric.wrl | 0 .../model/shapes3D/D_SOD-323.wrl | 0 .../{butns => board}/model/shapes3D/Pico.wrl | 0 ...der_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl | 0 .../model/shapes3D/SK6812-EC20.wrl | 0 .../model/shapes3D/SOT-23-5.wrl | 0 .../model/shapes3D/TS-1187A.wrl | 0 .../{butns => board}/place_footprints.ini | 0 .../{butns => board}/place_footprints.log | 0 .../SW_Push_1P1T_XKB_TS-1187A.kicad_mod | 0 hardware/{butns => board}/sym-lib-table | 0 hardware/{butns => }/case/YAPP_Box | 0 hardware/{butns => }/case/base.stl | Bin hardware/{butns => }/case/buttons-inlay | 0 hardware/{butns => }/case/buttons-inly.stl | 0 .../{butns => }/case/buttons-lessbleed.stl | Bin .../case/buttons-pla-lessbleed-black | 0 .../case/buttons-pla-lessbleed-black.stl | 0 .../case/buttons-pla-lessbleed.3mf | Bin .../case/buttons-pla-lessbleed.stl | 0 hardware/{butns => }/case/buttons-pla.stl | Bin hardware/{butns => }/case/buttons.scad | 0 hardware/{butns => }/case/buttons.stl | Bin hardware/{butns => }/case/case.scad | 0 hardware/{butns => }/case/case.stl | 0 hardware/{butns => }/case/lid.stl | Bin hardware/{butns => }/case/roundedcube.scad | 0 67 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-stls.yml rename hardware/{butns => board}/MCU_RaspberryPi_and_Boards.kicad_sym (100%) rename hardware/{butns => board}/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod (100%) rename hardware/{butns => board}/MCU_RaspberryPi_and_Boards.pretty/Pico.wrl (100%) rename hardware/{butns => board}/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod (100%) rename hardware/{butns => board}/MCU_RaspberryPi_and_Boards.pretty/RPi_Pico_SMD_TH.kicad_mod (100%) rename hardware/{butns => board}/SK6812-EC20.kicad_sym (100%) rename hardware/{butns => board}/SK6812-EC20.pretty/SK6812-EC20.STEP (100%) rename hardware/{butns => board}/SK6812-EC20.pretty/SK6812-EC20.kicad_mod (100%) rename hardware/{butns => board}/TS-1187A.step (100%) rename hardware/{butns => board}/butns-backend.kicad_sch (100%) rename hardware/{butns => board}/butns-frontend.kicad_sch (100%) rename hardware/{butns => board}/butns.kicad_pcb (100%) rename hardware/{butns => board}/butns.kicad_pro (100%) rename hardware/{butns => board}/butns.kicad_sch (100%) rename hardware/{butns => board}/butns.step (100%) rename hardware/{butns => board}/butns.stl (100%) rename hardware/{butns => board}/fp-lib-table (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-CuBottom.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-CuTop.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-EdgeCuts.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-MaskBottom.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-MaskTop.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-NPTH-drl_map.pdf (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-NPTH.drl (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-PTH-drl_map.pdf (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-PTH.drl (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-PasteBottom.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-PasteTop.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-SilkBottom.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-SilkTop.gbr (100%) rename hardware/{butns => board}/jlcpcb/gerber/butns-VScore.gbr (100%) rename hardware/{butns => board}/jlcpcb/production_files/BOM-butns.csv (100%) rename hardware/{butns => board}/jlcpcb/production_files/CPL-butns.csv (100%) rename hardware/{butns => board}/jlcpcb/production_files/GERBER-butns.zip (100%) rename hardware/{butns => board}/jlcpcb/project.db (100%) rename hardware/{butns => board}/model/Raspberry Pi Pico.step (100%) rename hardware/{butns => board}/model/butns.wrl (100%) rename hardware/{butns => board}/model/picow.stl (100%) rename hardware/{butns => board}/model/shapes3D/C_0603_1608Metric.wrl (100%) rename hardware/{butns => board}/model/shapes3D/D_SOD-323.wrl (100%) rename hardware/{butns => board}/model/shapes3D/Pico.wrl (100%) rename hardware/{butns => board}/model/shapes3D/PinHeader_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl (100%) rename hardware/{butns => board}/model/shapes3D/SK6812-EC20.wrl (100%) rename hardware/{butns => board}/model/shapes3D/SOT-23-5.wrl (100%) rename hardware/{butns => board}/model/shapes3D/TS-1187A.wrl (100%) rename hardware/{butns => board}/place_footprints.ini (100%) rename hardware/{butns => board}/place_footprints.log (100%) rename hardware/{butns => board}/switch.pretty/SW_Push_1P1T_XKB_TS-1187A.kicad_mod (100%) rename hardware/{butns => board}/sym-lib-table (100%) rename hardware/{butns => }/case/YAPP_Box (100%) rename hardware/{butns => }/case/base.stl (100%) rename hardware/{butns => }/case/buttons-inlay (100%) rename hardware/{butns => }/case/buttons-inly.stl (100%) rename hardware/{butns => }/case/buttons-lessbleed.stl (100%) rename hardware/{butns => }/case/buttons-pla-lessbleed-black (100%) rename hardware/{butns => }/case/buttons-pla-lessbleed-black.stl (100%) rename hardware/{butns => }/case/buttons-pla-lessbleed.3mf (100%) rename hardware/{butns => }/case/buttons-pla-lessbleed.stl (100%) rename hardware/{butns => }/case/buttons-pla.stl (100%) rename hardware/{butns => }/case/buttons.scad (100%) rename hardware/{butns => }/case/buttons.stl (100%) rename hardware/{butns => }/case/case.scad (100%) rename hardware/{butns => }/case/case.stl (100%) rename hardware/{butns => }/case/lid.stl (100%) rename hardware/{butns => }/case/roundedcube.scad (100%) diff --git a/.github/workflows/build-stls.yml b/.github/workflows/build-stls.yml new file mode 100644 index 0000000..cbff9f2 --- /dev/null +++ b/.github/workflows/build-stls.yml @@ -0,0 +1,23 @@ +name: Compile Firmware + +on: + - push + - pull_request + +jobs: + compile-firmware: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Generate Models + uses: pkoehlers/openscad-build-action@v1 + with: + input-file: 'hardware/case/case.scad' + output-file: 'case.stl' + - name: Archive + uses: actions/upload-artifact@v4 + with: + name: case + path: case.stl \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 1ed02f2..379fcf3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "hardware/butns/case/YAPP_Box"] - path = hardware/butns/case/YAPP_Box + path = hardware/case/YAPP_Box url = https://github.com/mrWheel/YAPP_Box.git diff --git a/hardware/butns/MCU_RaspberryPi_and_Boards.kicad_sym b/hardware/board/MCU_RaspberryPi_and_Boards.kicad_sym similarity index 100% rename from hardware/butns/MCU_RaspberryPi_and_Boards.kicad_sym rename to hardware/board/MCU_RaspberryPi_and_Boards.kicad_sym diff --git a/hardware/butns/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod b/hardware/board/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod similarity index 100% rename from hardware/butns/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod rename to hardware/board/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod diff --git a/hardware/butns/MCU_RaspberryPi_and_Boards.pretty/Pico.wrl b/hardware/board/MCU_RaspberryPi_and_Boards.pretty/Pico.wrl similarity index 100% rename from hardware/butns/MCU_RaspberryPi_and_Boards.pretty/Pico.wrl rename to hardware/board/MCU_RaspberryPi_and_Boards.pretty/Pico.wrl diff --git a/hardware/butns/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod b/hardware/board/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod similarity index 100% rename from hardware/butns/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod rename to hardware/board/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod diff --git a/hardware/butns/MCU_RaspberryPi_and_Boards.pretty/RPi_Pico_SMD_TH.kicad_mod b/hardware/board/MCU_RaspberryPi_and_Boards.pretty/RPi_Pico_SMD_TH.kicad_mod similarity index 100% rename from hardware/butns/MCU_RaspberryPi_and_Boards.pretty/RPi_Pico_SMD_TH.kicad_mod rename to hardware/board/MCU_RaspberryPi_and_Boards.pretty/RPi_Pico_SMD_TH.kicad_mod diff --git a/hardware/butns/SK6812-EC20.kicad_sym b/hardware/board/SK6812-EC20.kicad_sym similarity index 100% rename from hardware/butns/SK6812-EC20.kicad_sym rename to hardware/board/SK6812-EC20.kicad_sym diff --git a/hardware/butns/SK6812-EC20.pretty/SK6812-EC20.STEP b/hardware/board/SK6812-EC20.pretty/SK6812-EC20.STEP similarity index 100% rename from hardware/butns/SK6812-EC20.pretty/SK6812-EC20.STEP rename to hardware/board/SK6812-EC20.pretty/SK6812-EC20.STEP diff --git a/hardware/butns/SK6812-EC20.pretty/SK6812-EC20.kicad_mod b/hardware/board/SK6812-EC20.pretty/SK6812-EC20.kicad_mod similarity index 100% rename from hardware/butns/SK6812-EC20.pretty/SK6812-EC20.kicad_mod rename to hardware/board/SK6812-EC20.pretty/SK6812-EC20.kicad_mod diff --git a/hardware/butns/TS-1187A.step b/hardware/board/TS-1187A.step similarity index 100% rename from hardware/butns/TS-1187A.step rename to hardware/board/TS-1187A.step diff --git a/hardware/butns/butns-backend.kicad_sch b/hardware/board/butns-backend.kicad_sch similarity index 100% rename from hardware/butns/butns-backend.kicad_sch rename to hardware/board/butns-backend.kicad_sch diff --git a/hardware/butns/butns-frontend.kicad_sch b/hardware/board/butns-frontend.kicad_sch similarity index 100% rename from hardware/butns/butns-frontend.kicad_sch rename to hardware/board/butns-frontend.kicad_sch diff --git a/hardware/butns/butns.kicad_pcb b/hardware/board/butns.kicad_pcb similarity index 100% rename from hardware/butns/butns.kicad_pcb rename to hardware/board/butns.kicad_pcb diff --git a/hardware/butns/butns.kicad_pro b/hardware/board/butns.kicad_pro similarity index 100% rename from hardware/butns/butns.kicad_pro rename to hardware/board/butns.kicad_pro diff --git a/hardware/butns/butns.kicad_sch b/hardware/board/butns.kicad_sch similarity index 100% rename from hardware/butns/butns.kicad_sch rename to hardware/board/butns.kicad_sch diff --git a/hardware/butns/butns.step b/hardware/board/butns.step similarity index 100% rename from hardware/butns/butns.step rename to hardware/board/butns.step diff --git a/hardware/butns/butns.stl b/hardware/board/butns.stl similarity index 100% rename from hardware/butns/butns.stl rename to hardware/board/butns.stl diff --git a/hardware/butns/fp-lib-table b/hardware/board/fp-lib-table similarity index 100% rename from hardware/butns/fp-lib-table rename to hardware/board/fp-lib-table diff --git a/hardware/butns/jlcpcb/gerber/butns-CuBottom.gbr b/hardware/board/jlcpcb/gerber/butns-CuBottom.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-CuBottom.gbr rename to hardware/board/jlcpcb/gerber/butns-CuBottom.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-CuTop.gbr b/hardware/board/jlcpcb/gerber/butns-CuTop.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-CuTop.gbr rename to hardware/board/jlcpcb/gerber/butns-CuTop.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-EdgeCuts.gbr b/hardware/board/jlcpcb/gerber/butns-EdgeCuts.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-EdgeCuts.gbr rename to hardware/board/jlcpcb/gerber/butns-EdgeCuts.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-MaskBottom.gbr b/hardware/board/jlcpcb/gerber/butns-MaskBottom.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-MaskBottom.gbr rename to hardware/board/jlcpcb/gerber/butns-MaskBottom.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-MaskTop.gbr b/hardware/board/jlcpcb/gerber/butns-MaskTop.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-MaskTop.gbr rename to hardware/board/jlcpcb/gerber/butns-MaskTop.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-NPTH-drl_map.pdf b/hardware/board/jlcpcb/gerber/butns-NPTH-drl_map.pdf similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-NPTH-drl_map.pdf rename to hardware/board/jlcpcb/gerber/butns-NPTH-drl_map.pdf diff --git a/hardware/butns/jlcpcb/gerber/butns-NPTH.drl b/hardware/board/jlcpcb/gerber/butns-NPTH.drl similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-NPTH.drl rename to hardware/board/jlcpcb/gerber/butns-NPTH.drl diff --git a/hardware/butns/jlcpcb/gerber/butns-PTH-drl_map.pdf b/hardware/board/jlcpcb/gerber/butns-PTH-drl_map.pdf similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-PTH-drl_map.pdf rename to hardware/board/jlcpcb/gerber/butns-PTH-drl_map.pdf diff --git a/hardware/butns/jlcpcb/gerber/butns-PTH.drl b/hardware/board/jlcpcb/gerber/butns-PTH.drl similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-PTH.drl rename to hardware/board/jlcpcb/gerber/butns-PTH.drl diff --git a/hardware/butns/jlcpcb/gerber/butns-PasteBottom.gbr b/hardware/board/jlcpcb/gerber/butns-PasteBottom.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-PasteBottom.gbr rename to hardware/board/jlcpcb/gerber/butns-PasteBottom.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-PasteTop.gbr b/hardware/board/jlcpcb/gerber/butns-PasteTop.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-PasteTop.gbr rename to hardware/board/jlcpcb/gerber/butns-PasteTop.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-SilkBottom.gbr b/hardware/board/jlcpcb/gerber/butns-SilkBottom.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-SilkBottom.gbr rename to hardware/board/jlcpcb/gerber/butns-SilkBottom.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-SilkTop.gbr b/hardware/board/jlcpcb/gerber/butns-SilkTop.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-SilkTop.gbr rename to hardware/board/jlcpcb/gerber/butns-SilkTop.gbr diff --git a/hardware/butns/jlcpcb/gerber/butns-VScore.gbr b/hardware/board/jlcpcb/gerber/butns-VScore.gbr similarity index 100% rename from hardware/butns/jlcpcb/gerber/butns-VScore.gbr rename to hardware/board/jlcpcb/gerber/butns-VScore.gbr diff --git a/hardware/butns/jlcpcb/production_files/BOM-butns.csv b/hardware/board/jlcpcb/production_files/BOM-butns.csv similarity index 100% rename from hardware/butns/jlcpcb/production_files/BOM-butns.csv rename to hardware/board/jlcpcb/production_files/BOM-butns.csv diff --git a/hardware/butns/jlcpcb/production_files/CPL-butns.csv b/hardware/board/jlcpcb/production_files/CPL-butns.csv similarity index 100% rename from hardware/butns/jlcpcb/production_files/CPL-butns.csv rename to hardware/board/jlcpcb/production_files/CPL-butns.csv diff --git a/hardware/butns/jlcpcb/production_files/GERBER-butns.zip b/hardware/board/jlcpcb/production_files/GERBER-butns.zip similarity index 100% rename from hardware/butns/jlcpcb/production_files/GERBER-butns.zip rename to hardware/board/jlcpcb/production_files/GERBER-butns.zip diff --git a/hardware/butns/jlcpcb/project.db b/hardware/board/jlcpcb/project.db similarity index 100% rename from hardware/butns/jlcpcb/project.db rename to hardware/board/jlcpcb/project.db diff --git a/hardware/butns/model/Raspberry Pi Pico.step b/hardware/board/model/Raspberry Pi Pico.step similarity index 100% rename from hardware/butns/model/Raspberry Pi Pico.step rename to hardware/board/model/Raspberry Pi Pico.step diff --git a/hardware/butns/model/butns.wrl b/hardware/board/model/butns.wrl similarity index 100% rename from hardware/butns/model/butns.wrl rename to hardware/board/model/butns.wrl diff --git a/hardware/butns/model/picow.stl b/hardware/board/model/picow.stl similarity index 100% rename from hardware/butns/model/picow.stl rename to hardware/board/model/picow.stl diff --git a/hardware/butns/model/shapes3D/C_0603_1608Metric.wrl b/hardware/board/model/shapes3D/C_0603_1608Metric.wrl similarity index 100% rename from hardware/butns/model/shapes3D/C_0603_1608Metric.wrl rename to hardware/board/model/shapes3D/C_0603_1608Metric.wrl diff --git a/hardware/butns/model/shapes3D/D_SOD-323.wrl b/hardware/board/model/shapes3D/D_SOD-323.wrl similarity index 100% rename from hardware/butns/model/shapes3D/D_SOD-323.wrl rename to hardware/board/model/shapes3D/D_SOD-323.wrl diff --git a/hardware/butns/model/shapes3D/Pico.wrl b/hardware/board/model/shapes3D/Pico.wrl similarity index 100% rename from hardware/butns/model/shapes3D/Pico.wrl rename to hardware/board/model/shapes3D/Pico.wrl diff --git a/hardware/butns/model/shapes3D/PinHeader_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl b/hardware/board/model/shapes3D/PinHeader_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl similarity index 100% rename from hardware/butns/model/shapes3D/PinHeader_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl rename to hardware/board/model/shapes3D/PinHeader_1x08_P2.54mm_Vertical_SMD_Pin1Left.wrl diff --git a/hardware/butns/model/shapes3D/SK6812-EC20.wrl b/hardware/board/model/shapes3D/SK6812-EC20.wrl similarity index 100% rename from hardware/butns/model/shapes3D/SK6812-EC20.wrl rename to hardware/board/model/shapes3D/SK6812-EC20.wrl diff --git a/hardware/butns/model/shapes3D/SOT-23-5.wrl b/hardware/board/model/shapes3D/SOT-23-5.wrl similarity index 100% rename from hardware/butns/model/shapes3D/SOT-23-5.wrl rename to hardware/board/model/shapes3D/SOT-23-5.wrl diff --git a/hardware/butns/model/shapes3D/TS-1187A.wrl b/hardware/board/model/shapes3D/TS-1187A.wrl similarity index 100% rename from hardware/butns/model/shapes3D/TS-1187A.wrl rename to hardware/board/model/shapes3D/TS-1187A.wrl diff --git a/hardware/butns/place_footprints.ini b/hardware/board/place_footprints.ini similarity index 100% rename from hardware/butns/place_footprints.ini rename to hardware/board/place_footprints.ini diff --git a/hardware/butns/place_footprints.log b/hardware/board/place_footprints.log similarity index 100% rename from hardware/butns/place_footprints.log rename to hardware/board/place_footprints.log diff --git a/hardware/butns/switch.pretty/SW_Push_1P1T_XKB_TS-1187A.kicad_mod b/hardware/board/switch.pretty/SW_Push_1P1T_XKB_TS-1187A.kicad_mod similarity index 100% rename from hardware/butns/switch.pretty/SW_Push_1P1T_XKB_TS-1187A.kicad_mod rename to hardware/board/switch.pretty/SW_Push_1P1T_XKB_TS-1187A.kicad_mod diff --git a/hardware/butns/sym-lib-table b/hardware/board/sym-lib-table similarity index 100% rename from hardware/butns/sym-lib-table rename to hardware/board/sym-lib-table diff --git a/hardware/butns/case/YAPP_Box b/hardware/case/YAPP_Box similarity index 100% rename from hardware/butns/case/YAPP_Box rename to hardware/case/YAPP_Box diff --git a/hardware/butns/case/base.stl b/hardware/case/base.stl similarity index 100% rename from hardware/butns/case/base.stl rename to hardware/case/base.stl diff --git a/hardware/butns/case/buttons-inlay b/hardware/case/buttons-inlay similarity index 100% rename from hardware/butns/case/buttons-inlay rename to hardware/case/buttons-inlay diff --git a/hardware/butns/case/buttons-inly.stl b/hardware/case/buttons-inly.stl similarity index 100% rename from hardware/butns/case/buttons-inly.stl rename to hardware/case/buttons-inly.stl diff --git a/hardware/butns/case/buttons-lessbleed.stl b/hardware/case/buttons-lessbleed.stl similarity index 100% rename from hardware/butns/case/buttons-lessbleed.stl rename to hardware/case/buttons-lessbleed.stl diff --git a/hardware/butns/case/buttons-pla-lessbleed-black b/hardware/case/buttons-pla-lessbleed-black similarity index 100% rename from hardware/butns/case/buttons-pla-lessbleed-black rename to hardware/case/buttons-pla-lessbleed-black diff --git a/hardware/butns/case/buttons-pla-lessbleed-black.stl b/hardware/case/buttons-pla-lessbleed-black.stl similarity index 100% rename from hardware/butns/case/buttons-pla-lessbleed-black.stl rename to hardware/case/buttons-pla-lessbleed-black.stl diff --git a/hardware/butns/case/buttons-pla-lessbleed.3mf b/hardware/case/buttons-pla-lessbleed.3mf similarity index 100% rename from hardware/butns/case/buttons-pla-lessbleed.3mf rename to hardware/case/buttons-pla-lessbleed.3mf diff --git a/hardware/butns/case/buttons-pla-lessbleed.stl b/hardware/case/buttons-pla-lessbleed.stl similarity index 100% rename from hardware/butns/case/buttons-pla-lessbleed.stl rename to hardware/case/buttons-pla-lessbleed.stl diff --git a/hardware/butns/case/buttons-pla.stl b/hardware/case/buttons-pla.stl similarity index 100% rename from hardware/butns/case/buttons-pla.stl rename to hardware/case/buttons-pla.stl diff --git a/hardware/butns/case/buttons.scad b/hardware/case/buttons.scad similarity index 100% rename from hardware/butns/case/buttons.scad rename to hardware/case/buttons.scad diff --git a/hardware/butns/case/buttons.stl b/hardware/case/buttons.stl similarity index 100% rename from hardware/butns/case/buttons.stl rename to hardware/case/buttons.stl diff --git a/hardware/butns/case/case.scad b/hardware/case/case.scad similarity index 100% rename from hardware/butns/case/case.scad rename to hardware/case/case.scad diff --git a/hardware/butns/case/case.stl b/hardware/case/case.stl similarity index 100% rename from hardware/butns/case/case.stl rename to hardware/case/case.stl diff --git a/hardware/butns/case/lid.stl b/hardware/case/lid.stl similarity index 100% rename from hardware/butns/case/lid.stl rename to hardware/case/lid.stl diff --git a/hardware/butns/case/roundedcube.scad b/hardware/case/roundedcube.scad similarity index 100% rename from hardware/butns/case/roundedcube.scad rename to hardware/case/roundedcube.scad