From e555591ca083d597becf6257a437ae5fd6e0c6c6 Mon Sep 17 00:00:00 2001
From: Deon Spengler <dspengler@melbro.co.za>
Date: Thu, 10 Aug 2023 15:39:22 +0200
Subject: [PATCH] Further simplify

---
 cad/display-frame.scad | 58 ++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/cad/display-frame.scad b/cad/display-frame.scad
index c4b71dc..3b412a0 100644
--- a/cad/display-frame.scad
+++ b/cad/display-frame.scad
@@ -4,26 +4,30 @@ width=208.2;
 depth=70.2;
 height=8;
 
-display();
-module display(){
-// outer display frame
-difference(){
-  translate([0, 0, 0])
-    cube([width+(thickness*2), depth+(thickness*2), height]);
-  translate([thickness, thickness, 0])
-    cube([width, depth, height]);
-}
-
-// inner display catch
-translate([thickness, thickness, 1.5]){
-  padding=5;
-  ledge=0.8;
+display_frame();
+module display_frame(){
   difference(){
-    translate([padding, 0, 0])
-      cube([width-(padding*2), depth, thickness]);
-    translate([0, ledge, 0])
-      cube([width, depth-(ledge*2), thickness]);
+    // main frame
+    translate([0, 0, 0])
+      cube([width+(thickness*2), depth+(thickness*2), height+22]);
+    translate([thickness, thickness, 0])
+      cube([width, depth, height+22]);
+    
+    // hdmi gap
+    translate([thickness+95, depth+thickness, height])
+      cube([25, 0.8, 17]);
   }
+  
+  // inner display catch
+  translate([thickness, thickness, 1.5]){
+    padding=5;
+    ledge=0.8;
+    difference(){
+      translate([padding, 0, 0])
+        cube([width-(padding*2), depth, thickness]);
+      translate([0, ledge, 0])
+        cube([width, depth-(ledge*2), thickness]);
+    }
 }
 
 // usb compartment
@@ -34,30 +38,12 @@ translate([0, 0, 0])
 translate([146.6, 0, 0])
   battery_compartment();
 
-// raspberry pi 4 cover
-rpi4_cover();
-
 // display hinge
 translate([(width+thickness*2)/2, -9, 6.57])
   rotate([90, 270, 0])
     male_hinge();
 }
 
-module rpi4_cover(){
-  pi_height=22;
-  
-  difference(){
-    translate([0, 0, height])
-      cube([width+(thickness*2), depth+(thickness*2), pi_height]);
-    translate([thickness, thickness, height])
-      cube([width, depth, pi_height]);
-    
-    // hdmi gap
-    translate([thickness+95, depth+thickness, height])
-      cube([25, 0.8, 17]);
-  }
-}
-
 module usb_compartment(){
   usb_width=41;
   usb_height=4;