From 196cf55cbb8cc2c330a6e39ef8badb25e0dfcc43 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Tue, 14 Feb 2023 08:15:11 +0100 Subject: [PATCH 1/3] Removes some more osh-dir-std template leftovers --- doc/README.md | 10 ---------- res/README.md | 10 ---------- res/assets/README.md | 10 ---------- res/assets/media/README.md | 10 ---------- 4 files changed, 40 deletions(-) delete mode 100644 doc/README.md delete mode 100644 res/README.md delete mode 100644 res/assets/README.md delete mode 100644 res/assets/media/README.md diff --git a/doc/README.md b/doc/README.md deleted file mode 100644 index 9e415c2..0000000 --- a/doc/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `doc/` - -Documentation sources - How to use, build, repair, ... the piece of hardware described by the project. Below here, there should only be Markdown files (*maybe* also ValueFlows recipes). - diff --git a/res/README.md b/res/README.md deleted file mode 100644 index 73caa0e..0000000 --- a/res/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/` - -Stands for "resources", and should hold any files that are part of the sources of the project, but are not source code, design, scripts or documentation text files. This includes also binary files, next to text files. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/res/assets/README.md b/res/assets/README.md deleted file mode 100644 index 8f86ec7..0000000 --- a/res/assets/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/` - -All binary (and potentially large text-)resources should go here, as this allows to go "clean-slate" with this data from time to time, to reduce clone size, if done as a git sub-module (which can also be done later). Having it as a git sub-module, also allows to not fetch it at all, if storage or bandwidth is an issue, and it is not required for the task at hand. The sub-dirs within res/assets/ and res/ should be the same (excluding of course res/assets/assets/). - diff --git a/res/assets/media/README.md b/res/assets/media/README.md deleted file mode 100644 index 1a727a9..0000000 --- a/res/assets/media/README.md +++ /dev/null @@ -1,10 +0,0 @@ - - -# README `res/assets/media/` - -null - -- 2.44.2 From 525136359153832fb5db1c2efac37a3af67f3fed Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Tue, 14 Feb 2023 08:15:37 +0100 Subject: [PATCH 2/3] okh: Fixes syntax [fix] --- okh.toml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/okh.toml b/okh.toml index 246b8dc..4cd1375 100644 --- a/okh.toml +++ b/okh.toml @@ -21,7 +21,7 @@ tsdc = [ "3DP", "LAS", "ASM" ] [[part]] name = "4_piece_negative_mould" -image = "/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp +image = "/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp" tsdc = "3DP" source = "/mod/mould/direct_3D_negative_mould/src/mech/pieceX.scad" export = [ @@ -31,29 +31,30 @@ export = [ "/mod/mould/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl", ] printing-process = "FDM" -material = "ABS" ??? -infill = 30 ??? -raft-brim = true ??? -supports = false ??? -resolution-mm = 0.2 ??? -shell-thickness = 3 ??? -top-bottom-thickness = 3 ??? +material = "ABS" # TODO +infill = 30 # TODO +raft-brim = true # TODO +supports = false # TODO +resolution-mm = 0.2 # TODO +shell-thickness = 3 # TODO +top-bottom-thickness = 3 # TODO -[[part.outer-dimensions]] -openSCAD = "cylinder(h=30, r=28)" ??? -unit = "mm" ??? +[part.outer-dimensions] +openSCAD = "cylinder(h=30, r=28)" # TODO +unit = "mm" # TODO -[[part.mass]] -value = 30 ??? -unit = "g" ??? +[part.mass] +value = 30 # TODO +unit = "g" # TODO - \ No newline at end of file -- 2.44.2 From f602484e5f3ae52288c8c61f801f5d1552c1078d Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Tue, 14 Feb 2023 08:25:45 +0100 Subject: [PATCH 3/3] okh: Paths are repo-relative, not absolute [fix] --- okh.toml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/okh.toml b/okh.toml index 4cd1375..e7190da 100644 --- a/okh.toml +++ b/okh.toml @@ -8,27 +8,27 @@ repo = "https://code.curious.bio/curious.bio/myzel-akustikabsorber.git" license = "CC-BY-SA-4.0" licensor = "Curious Community Labs e. V." organisation = "Curious Community Labs e. V." -readme = "/README.md" -image = "/res/assets/media/img/FC5-Render-preview.webp" +readme = "README.md" +image = "res/assets/media/img/FC5-Render-preview.webp" documentation-language = "de" technology-readiness-level = "OTRL-3" documentation-readiness-level = "ODRL-2" function = "A prototype of an acoustic absorber made from mycelium composite material using organic residue" -user-manual = "/mod/README.md" -source = [ "/src/mech" ] -bom = "/bom.csv" +user-manual = "mod/README.md" +source = [ "src/mech" ] +bom = "bom.csv" tsdc = [ "3DP", "LAS", "ASM" ] [[part]] name = "4_piece_negative_mould" -image = "/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp" +image = "mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp" tsdc = "3DP" -source = "/mod/mould/direct_3D_negative_mould/src/mech/pieceX.scad" +source = "mod/mould/direct_3D_negative_mould/src/mech/pieceX.scad" export = [ - "/mod/mould/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl", - "/mod/mould/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl", - "/mod/mould/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl", - "/mod/mould/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl", + "mod/mould/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl", + "mod/mould/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl", + "mod/mould/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl", + "mod/mould/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl", ] printing-process = "FDM" material = "ABS" # TODO @@ -58,12 +58,12 @@ unit = "mm" [[part]] name = "direct_3D_negative_mould" -image = "/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp" +image = "mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp" tsdc = "3DP" -source = "/3DParts/ClampRing/ClampRing.scad" +source = "3DParts/ClampRing/ClampRing.scad" export = [ - "/3DParts/ClampRing/ClampRing.pdf", - "/3DParts/ClampRing/ClampRing.stl" + "3DParts/ClampRing/ClampRing.pdf", + "3DParts/ClampRing/ClampRing.stl" ] printing-process = "FDM" material = "ABS" @@ -84,9 +84,9 @@ unit = "g" [[part]] name = "PlanktoScope-Case" -image = "/doc/images/hardware/planktoscope_case_00.png" +image = "doc/images/hardware/planktoscope_case_00.png" tsdc = "CNC" -source = "/hardware/case/PlanktoScope-Case.f3z" -export = ["/hardware/case/PlanktoScope-Case.dxf"] +source = "hardware/case/PlanktoScope-Case.f3z" +export = ["hardware/case/PlanktoScope-Case.dxf"] outer-dimension-dim = "mm" outer-dimension = "cube(size = [350,150,150])" -- 2.44.2