From 68bd7537ff490e35c9dbf1e0c97c234ccb20687f Mon Sep 17 00:00:00 2001
From: Daniele Verducci <daniele.verducci@ichibi.eu>
Date: Tue, 6 Jan 2026 11:33:14 +0100
Subject: [PATCH] Better speaker grille supports, fixed power swith cutout

---
 enclosure/fabula_enclosure.scad | 19 ++++++++++---------
 enclosure/test_fit.scad         |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/enclosure/fabula_enclosure.scad b/enclosure/fabula_enclosure.scad
index eb559b7..d35ef43 100644
--- a/enclosure/fabula_enclosure.scad
+++ b/enclosure/fabula_enclosure.scad
@@ -4,7 +4,7 @@ use <cutouts.scad>
 
 // FABULA open source storyteller enclosure
 
-// TODO: open hardware logo, Fabula logo, cutouts for components and buttons, tag slot with led mount
+// TODO: open hardware logo, Fabula logo, move switch cutout, tag slot with led mount
 
 box_cut_height = 10;
 pcb_screw_size = 3;
@@ -28,9 +28,9 @@ module fabula_enclosure_bottom() {
     }
     
     // Speaker grille reinforcements
-    translate([-68, -40, 22.5]) {
-        for (i = [1 : 14]) {
-            translate([i*5, 0, 0]) cube([2, 80, 2]);            
+    translate([-59, -40, 22.5]) {
+        for (i = [0 : 10]) {
+            translate([i*5.8, 0, 0]) cube([2, 80, 2]);            
         }
     }
 }
@@ -38,16 +38,17 @@ module fabula_enclosure_bottom() {
 module fabula_enclosure_top() {
     difference() {
         union() {
-            //box();
+            box();
             
             // Supports
-            translate([-66.1, 30.1, -16.2]) #pcb_support(pcb_screw_size);
-            translate([-66.1, -27.8, -16.2]) #pcb_support(pcb_screw_size);
-            translate([64.1, 24.2, -16.2]) #pcb_support(pcb_screw_size);
-            translate([64.1, -26.8, -16.2]) #pcb_support(pcb_screw_size);
+            translate([-66.1, 30.1, -16.2]) pcb_support(pcb_screw_size);
+            translate([-66.1, -27.8, -16.2]) pcb_support(pcb_screw_size);
+            translate([64.1, 24.2, -16.2]) pcb_support(pcb_screw_size);
+            translate([64.1, -26.8, -16.2]) pcb_support(pcb_screw_size);
         }
     
         // Cutouts
+        translate([90, 5, 10]) rotate([90, 0, 0]) rotate([0, 90, 0]) switch_cutout();
         translate([20, 13.5, -30]) keycap();
         translate([35.5, -12.5, -30]) keycap();
         translate([44.5, 23.5, -30]) keycap();
diff --git a/enclosure/test_fit.scad b/enclosure/test_fit.scad
index 813ba8c..52aae0b 100644
--- a/enclosure/test_fit.scad
+++ b/enclosure/test_fit.scad
@@ -20,6 +20,6 @@ module test_fit_components() {
     translate([2.05, -61.05, 43]) vol_down_keycap();
 }
 
-test_fit_components();
-//translate([0, 0, 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_bottom();
-#translate([0, 0, 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_top();
\ No newline at end of file
+//test_fit_components();
+translate([0, 0, 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_bottom();
+translate([0, 0, 20]) rotate([0, 0, -90]) rotate([180, 0, 0]) fabula_enclosure_top();
\ No newline at end of file