From 87b6a11a30752a156ca2a3986a0bd2b7ccfaa3b2 Mon Sep 17 00:00:00 2001 From: deboxed Date: Thu, 5 Feb 2026 11:45:31 +0100 Subject: [PATCH 1/2] add make all target --- Makefile | 8 +++----- get_targets.py | 9 +++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 get_targets.py diff --git a/Makefile b/Makefile index 1317654..20c28f9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ -# TARGETS=$(shell sed '/^module [a-z0-9_-]*().*make..\?me.*$$/!d;s/module //;s/().*/.stl/' main.scad) - - +TARGETS=$(shell python3 get_targets.py main.json) GENERATED_FILES = $(wildcard *.deps) \ $(wildcard *.stl) \ @@ -9,14 +7,14 @@ GENERATED_FILES = $(wildcard *.deps) \ .phony: all clean -# all: ${TARGETS} +all: ${TARGETS} include $(wildcard *.deps) %.stl: main.scad main.json Makefile flatpak run org.openscad.OpenSCAD --enable textmetrics -p main.json -P $(basename $@) -DFN=64 -D "MODELVER=\"$(shell git rev-parse --short=6 HEAD)\"" -m make -o $@ -d $@.deps $< -%.png: +%.png: main.scad main.json Makefile flatpak run org.openscad.OpenSCAD --enable textmetrics -p main.json -P $(basename $@) -DFN=32 --render --imgsize 1600,1200 -o $@ main.scad clean: diff --git a/get_targets.py b/get_targets.py new file mode 100644 index 0000000..3474616 --- /dev/null +++ b/get_targets.py @@ -0,0 +1,9 @@ +import json +import sys + +with open(sys.argv[1]) as f: + d = json.load(f) + sets=[] + for set in d['parameterSets']: + sets.append(set + '.stl') + print(' '.join(sets)) From 9c9abf9f1dab0255e7710a331da9e211db98409a Mon Sep 17 00:00:00 2001 From: deboxed Date: Thu, 5 Feb 2026 12:16:51 +0100 Subject: [PATCH 2/2] add svg stamp support --- svg/Makefile | 22 +++ get_targets.py => svg/get_targets.py | 0 svg/main.json | 41 +++++ svg/main.scad | 41 +++++ svg/svg/all_connectors_are_beautiful.svg | 192 +++++++++++++++++++++++ svg/svg/ichthus.svg | 79 ++++++++++ Makefile => text/Makefile | 0 text/get_targets.py | 9 ++ main.json => text/main.json | 14 ++ main.scad => text/main.scad | 0 10 files changed, 398 insertions(+) create mode 100644 svg/Makefile rename get_targets.py => svg/get_targets.py (100%) create mode 100644 svg/main.json create mode 100644 svg/main.scad create mode 100644 svg/svg/all_connectors_are_beautiful.svg create mode 100644 svg/svg/ichthus.svg rename Makefile => text/Makefile (100%) create mode 100644 text/get_targets.py rename main.json => text/main.json (52%) rename main.scad => text/main.scad (100%) diff --git a/svg/Makefile b/svg/Makefile new file mode 100644 index 0000000..c5f58c1 --- /dev/null +++ b/svg/Makefile @@ -0,0 +1,22 @@ +TARGETS=$(shell python3 get_targets.py main.json) + +GENERATED_FILES = $(wildcard *.deps) \ + $(wildcard *.stl) \ + $(wildcard *.png) \ + $(wildcard *.generated.scad) + +.phony: all clean + +all: ${TARGETS} + +include $(wildcard *.deps) + +%.stl: main.scad main.json Makefile + flatpak run org.openscad.OpenSCAD --enable textmetrics -p main.json -P $(basename $@) -DFN=64 -D "MODELVER=\"$(shell git rev-parse --short=6 HEAD)\"" -m make -o $@ -d $@.deps $< + +%.png: main.scad main.json Makefile + flatpak run org.openscad.OpenSCAD --enable textmetrics -p main.json -P $(basename $@) -DFN=32 --render --imgsize 1600,1200 -o $@ main.scad + +clean: + rm -rf ${GENERATED_FILES} + diff --git a/get_targets.py b/svg/get_targets.py similarity index 100% rename from get_targets.py rename to svg/get_targets.py diff --git a/svg/main.json b/svg/main.json new file mode 100644 index 0000000..5968b05 --- /dev/null +++ b/svg/main.json @@ -0,0 +1,41 @@ +{ + "fileFormatVersion": "1", + "parameterSets": { + "usba": { + "base_thickness": "1", + "file": "svg\/all_connectors_are_beautiful.svg", + "id_back": "usba-back", + "id_front": "usba", + "img_depth": "1.5", + "img_offset": "0", + "img_scale": "1" + }, + "radicaalinclusief": { + "base_thickness": "1", + "file": "svg\/ichthus.svg", + "id_back": "layer2", + "id_front": "layer1", + "img_depth": "1.5", + "img_offset": "0", + "img_scale": "1" + }, + "usbb": { + "base_thickness": "1", + "file": "svg\/all_connectors_are_beautiful.svg", + "id_back": "usbb-back", + "id_front": "usbb", + "img_depth": "1.5", + "img_offset": "0", + "img_scale": "1" + }, + "usbc": { + "base_thickness": "1", + "file": "svg\/all_connectors_are_beautiful.svg", + "id_back": "usbc-back", + "id_front": "usbc", + "img_depth": "1.5", + "img_offset": "0", + "img_scale": "1" + } + } +} diff --git a/svg/main.scad b/svg/main.scad new file mode 100644 index 0000000..e4d6eb8 --- /dev/null +++ b/svg/main.scad @@ -0,0 +1,41 @@ +/* [Main design variables] */ +file = "svg/all_connectors_are_beautiful.svg"; +id_front = "usba"; +id_back = "usba-back"; + +/* [front params] */ +img_depth = 1.5; +img_scale = 1; +img_offset = 0; + +/* [back params] */ + +base_thickness = 1; + +/* [hidden] */ + + +scale([-1,1,1]) +stamp(); + +translate([40,0,0]) +%stamp(); + + +module stamp() +{ +union() +{ + translate(v = [img_offset,img_offset,0]) + scale([img_scale,img_scale,1]) + linear_extrude(height = base_thickness) + import(file, id=id_back); + + translate(v = [img_offset,img_offset,0]) + scale([img_scale,img_scale,1]) + color("white") + linear_extrude(height = base_thickness+img_depth) + import(file, id=id_front); +} +} + diff --git a/svg/svg/all_connectors_are_beautiful.svg b/svg/svg/all_connectors_are_beautiful.svg new file mode 100644 index 0000000..060c93f --- /dev/null +++ b/svg/svg/all_connectors_are_beautiful.svg @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/svg/ichthus.svg b/svg/svg/ichthus.svg new file mode 100644 index 0000000..c9daf1d --- /dev/null +++ b/svg/svg/ichthus.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Makefile b/text/Makefile similarity index 100% rename from Makefile rename to text/Makefile diff --git a/text/get_targets.py b/text/get_targets.py new file mode 100644 index 0000000..3474616 --- /dev/null +++ b/text/get_targets.py @@ -0,0 +1,9 @@ +import json +import sys + +with open(sys.argv[1]) as f: + d = json.load(f) + sets=[] + for set in d['parameterSets']: + sets.append(set + '.stl') + print(' '.join(sets)) diff --git a/main.json b/text/main.json similarity index 52% rename from main.json rename to text/main.json index 23b6641..265e806 100644 --- a/main.json +++ b/text/main.json @@ -14,6 +14,20 @@ "stamp_depth": "1.5", "textsize": "36", "variant": "stamp" + }, + "test": { + "base_rounding_stamp": "4", + "base_rounding_stencil": "2", + "base_thickness_stamp": "1", + "base_thickness_stencil": "0.40000000000000002", + "border": "3", + "font_index": "5", + "font_manual": "Ubuntu:style=Bold", + "font_set": "2", + "line": "my test #mytest", + "stamp_depth": "1.5", + "textsize": "20", + "variant": "stamp" } } } diff --git a/main.scad b/text/main.scad similarity index 100% rename from main.scad rename to text/main.scad