diff --git a/tir_sportif/feinwerkbau _lp103/trigger/stl/trigger.stl b/tir_sportif/feinwerkbau _lp103/trigger/stl/trigger.stl
new file mode 100644
index 0000000..b028e24
Binary files /dev/null and b/tir_sportif/feinwerkbau _lp103/trigger/stl/trigger.stl differ
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/trigger_v1.stl b/tir_sportif/feinwerkbau _lp103/trigger/stl/trigger_v1.old.stl
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/trigger_v1.stl
rename to tir_sportif/feinwerkbau _lp103/trigger/stl/trigger_v1.old.stl
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/trigger_v2.stl b/tir_sportif/feinwerkbau _lp103/trigger/stl/trigger_v2.old.stl
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/trigger_v2.stl
rename to tir_sportif/feinwerkbau _lp103/trigger/stl/trigger_v2.old.stl
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/rail.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/rail.svg
similarity index 60%
rename from tir_sportif/feinwerkbau _lp103/trigger/rail.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/rail.svg
index d81892a..ca2c9ed 100644
--- a/tir_sportif/feinwerkbau _lp103/trigger/rail.svg
+++ b/tir_sportif/feinwerkbau _lp103/trigger/svg/rail.svg
@@ -8,7 +8,7 @@
version="1.1"
id="svg1"
sodipodi:docname="rail.svg"
- inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+ inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@@ -25,9 +25,9 @@
inkscape:document-units="mm"
inkscape:zoom="15.098056"
inkscape:cx="15.134399"
- inkscape:cy="3.874671"
+ inkscape:cy="8.9415485"
inkscape:window-width="1920"
- inkscape:window-height="1015"
+ inkscape:window-height="1016"
inkscape:window-x="0"
inkscape:window-y="36"
inkscape:window-maximized="1"
@@ -42,7 +42,7 @@
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/t_back_v1.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/t_back_v1.svg
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/t_back_v1.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/t_back_v1.svg
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/t_back_v2.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/t_back_v2.svg
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/t_back_v2.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/t_back_v2.svg
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/t_front_v1.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/t_front_v1.svg
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/t_front_v1.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/t_front_v1.svg
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/t_front_v2.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/t_front_v2.svg
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/t_front_v2.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/t_front_v2.svg
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/tmp.svg b/tir_sportif/feinwerkbau _lp103/trigger/svg/tmp.svg
similarity index 100%
rename from tir_sportif/feinwerkbau _lp103/trigger/tmp.svg
rename to tir_sportif/feinwerkbau _lp103/trigger/svg/tmp.svg
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/trigger.png b/tir_sportif/feinwerkbau _lp103/trigger/trigger.png
new file mode 100644
index 0000000..7eaf093
Binary files /dev/null and b/tir_sportif/feinwerkbau _lp103/trigger/trigger.png differ
diff --git a/tir_sportif/feinwerkbau _lp103/trigger/trigger.scad b/tir_sportif/feinwerkbau _lp103/trigger/trigger.scad
index f32de5d..548c109 100644
--- a/tir_sportif/feinwerkbau _lp103/trigger/trigger.scad
+++ b/tir_sportif/feinwerkbau _lp103/trigger/trigger.scad
@@ -1,43 +1,27 @@
-$fn = 128;
+$fn=60;
-include
+include
+include ;
difference() {
- linear_extrude(height = 17, center=true)
- import("rail.svg");
- translate([0,-1.5,0]) {
- rotate([0,90,0]) {
- cylinder(h=8, d=3.2, center=true);
- translate([0,0,4]) {
- cylinder(h=3, d=5.5, center=true);
- }
+ diff()
+ prismoid(size1=[9,10], size2=[9,17], h=12, rounding=.5, center=true) {
+ edge_profile([BOT+BACK, BOT+FRONT], excess=5, convexity=10) {
+ mask2d_roundover(h=3,mask_angle=$edge_angle);
}
}
- translate([-2,-1.5,0]) {
- rotate([90,60,90]) {
- ISO4014(key="M3", l=8);
+ color("blue") {
+ translate([0,0,1]) cuboid([1,20,3], rounding=.5);
+ translate([0,0,6]) cuboid([2,20,5]);
+ }
+ color("red") translate([0,0,3.5]) ycyl(d=3.8, l=20);
+ color("green") {
+ * rotate([0,0,30]) {
+ nutcatch_parallel("M3", clh=3.5);
+ hole_through(name="M3", l=10, cld=0.1, h=0, hcld=0.4);
}
}
+ color("cyan") translate([0,0,-2.5]) rotate([0,0,30]) zcyl(d=7, l=7, $fn=6);
+ color("red") translate([3.5, 0, -2.5]) rotate([0,90,0]) screw("M3x5");
+
}
-
-
-
-// Trigger v1
-* translate([0,-29,9]) {
- rotate([0,90,0]) {
- linear_extrude(height = 3, center=true)
- import("t_back_v1.svg");
- linear_extrude(height = 5, center=true)
- import("t_front_v1.svg");
- }
-}
-
-// Trigger v2
-translate([0,-29,8.5]) {
- rotate([0,90,0]) {
- linear_extrude(height = 4, center=true)
- import("t_back_v2.svg");
- linear_extrude(height = 8, center=true)
- import("t_front_v2.svg");
- }
-}
\ No newline at end of file