From 7217c7bc3b5ecaa498270f9526fed63efb5ef179 Mon Sep 17 00:00:00 2001
From: Roberto Alsina <roberto.alsina@gmail.com>
Date: Sat, 15 Apr 2023 19:21:03 -0300
Subject: [PATCH] Moved specific keyboard sizes and positions to dimensions.py

---
 notebook_nueva/Makefile               |   8 ++-
 notebook_nueva/base.py                |   2 +-
 notebook_nueva/components/keyboard.py |  84 ++++++++++++--------------
 notebook_nueva/dimensions.py          |  29 +++++++--
 notebook_nueva/hinged_lid.py          |   8 +--
 notebook_nueva/tandy_lid.stl          | Bin 268284 -> 268284 bytes
 notebook_nueva/tandy_lid_left.stl     | Bin 144484 -> 144484 bytes
 7 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/notebook_nueva/Makefile b/notebook_nueva/Makefile
index b078272..2ccbfc6 100644
--- a/notebook_nueva/Makefile
+++ b/notebook_nueva/Makefile
@@ -1,11 +1,13 @@
 STL_FILES = base.stl hinged_lid.stl simple_lid.stl tandy_lid.stl
 
-all: $(STL_FILES) .lint
+all: $(STL_FILES) lint
 
-%.stl: %.py dimensions.py utils.py
+%.stl: %.py dimensions.py utils.py components/*py
 	python $<
 
-.lint: *.py
+lint: .lint
+
+.lint: **.py
 	flake8 
 	touch .lint
 
diff --git a/notebook_nueva/base.py b/notebook_nueva/base.py
index 19ca435..b5936b2 100644
--- a/notebook_nueva/base.py
+++ b/notebook_nueva/base.py
@@ -118,7 +118,7 @@ def model():
         bottom_face="<Z",
         back_face=None,
         offset_x=dim.shell_t,
-        offset_y=dim.kbd_height + dim.shell_t,
+        offset_y=keyboard.kbd_height + dim.shell_t,
         shell_t=dim.shell_t,
     )
 
diff --git a/notebook_nueva/components/keyboard.py b/notebook_nueva/components/keyboard.py
index 57c040b..d1caaa7 100644
--- a/notebook_nueva/components/keyboard.py
+++ b/notebook_nueva/components/keyboard.py
@@ -1,47 +1,40 @@
 import cadquery as cq
-import math
 
-# TODO: move dimensions to dimensions.py
-# Size of the kbd board
-kbd_height = 95.5
-kbd_width = 305
-back_thickness = 19
-front_thickness = 12
+# These should be set from dimensions.py
+elements = None
+kbd_pillar_positions = []
+kbd_height = 0
+kbd_width = 0
+kbd_back_thickness = 0
+kbd_front_thickness = 0
+kbd_actual_height = 0
+kbd_angle = 0
 
-# Pythagoras
-actual_height = (kbd_height**2 - (back_thickness - front_thickness) ** 2) ** 0.5
-kbd_angle = math.acos(actual_height / kbd_height) * 180 / math.pi
 
-kbd_pillar_positions = [
-    (19, 16),
-    (142.5, 25.5),
-    (kbd_width - 20, 16),
-    (23.5, 79.5),
-    (145.5, 82.5),
-    (kbd_width - 19, 79.5),
-]
+def init():
+    global elements
 
-elements = [
-    # Shorter pillars
-    {
-        "x": 0,
-        "y": 0,
-        "z": 5.5,
-        "shape": cq.Sketch().push(kbd_pillar_positions).circle(5, mode="a"),
-    },
-    # Taller pillars with holes for self-tapping screws
-    {
-        "x": 0,
-        "y": 0,
-        "z": 2.5,
-        "shape": (
-            cq.Sketch()
-            .push(kbd_pillar_positions)
-            .circle(2.4, mode="a")
-            .circle(1.1, mode="s")
-        ),
-    },
-]
+    elements = [
+        # Shorter pillars
+        {
+            "x": 0,
+            "y": 0,
+            "z": 5.5,
+            "shape": cq.Sketch().push(kbd_pillar_positions).circle(5, mode="a"),
+        },
+        # Taller pillars with holes for self-tapping screws
+        {
+            "x": 0,
+            "y": 0,
+            "z": 2.5,
+            "shape": (
+                cq.Sketch()
+                .push(kbd_pillar_positions)
+                .circle(2.4, mode="a")
+                .circle(1.1, mode="s")
+            ),
+        },
+    ]
 
 
 def add(
@@ -62,7 +55,7 @@ def add(
     if bottom_face:
         model = (
             model.faces(bottom_face)
-            .workplane(centerOption="CenterOfBoundBox", offset=-front_thickness)
+            .workplane(centerOption="CenterOfBoundBox", offset=-kbd_front_thickness)
             .center(
                 -width / 2,
                 height / 2,
@@ -89,16 +82,15 @@ def add(
             .placeSketch(
                 cq.Sketch().polygon(
                     [
-                        [0, front_thickness],
-                        [shell_t, front_thickness],
-                        [actual_height + shell_t, back_thickness],
-                        [actual_height + shell_t, 1000],
+                        [0, kbd_front_thickness],
+                        [shell_t, kbd_front_thickness],
+                        [kbd_actual_height + shell_t, kbd_back_thickness],
+                        [kbd_actual_height + shell_t, 1000],
                         [0, 1000],
-                        [0, front_thickness],
+                        [0, kbd_front_thickness],
                     ]
                 )
             )
             .cutBlind(-1000)
         )
-
     return model
diff --git a/notebook_nueva/dimensions.py b/notebook_nueva/dimensions.py
index a9a88bb..15f4003 100644
--- a/notebook_nueva/dimensions.py
+++ b/notebook_nueva/dimensions.py
@@ -1,5 +1,8 @@
+import math
+
 import components.audio_plug as audio_plug
 import components.usb_hub as usb_hub
+import components.keyboard as keyboard
 
 ## Standard things (TODO move to separate file)
 
@@ -18,9 +21,27 @@ m4_bottom = 4
 
 
 ## Keyboard dimensions
-kbd_height = 95.5
-kbd_width = 305
-
+keyboard.kbd_height = 95.5
+keyboard.kbd_width = 305
+keyboard.kbd_back_thickness = 19
+keyboard.kbd_front_thickness = 12
+# Pythagoras
+keyboard.kbd_actual_height = (
+    keyboard.kbd_height**2
+    - (keyboard.kbd_back_thickness - keyboard.kbd_front_thickness) ** 2
+) ** 0.5
+keyboard.kbd_angle = (
+    math.acos(keyboard.kbd_actual_height / keyboard.kbd_height) * 180 / math.pi
+)
+keyboard.kbd_pillar_positions = [
+    (19, 16),
+    (142.5, 25.5),
+    (keyboard.kbd_width - 20, 16),
+    (23.5, 79.5),
+    (145.5, 82.5),
+    (keyboard.kbd_width - 19, 79.5),
+]
+keyboard.init()
 
 ## Screen dimensions
 # Whole screen size
@@ -38,7 +59,7 @@ vis_h = 55
 shell_t = 3
 
 # Size of the base
-width = kbd_width + 2 * shell_t
+width = keyboard.kbd_width + 2 * shell_t
 height = 159
 base_thickness = 30 + shell_t  # 30 inside
 
diff --git a/notebook_nueva/hinged_lid.py b/notebook_nueva/hinged_lid.py
index 70b0c82..95a8ba0 100644
--- a/notebook_nueva/hinged_lid.py
+++ b/notebook_nueva/hinged_lid.py
@@ -294,10 +294,10 @@ def model():
             cq.Sketch().polygon(
                 [
                     (0, 0),
-                    (0, keyboard.front_thickness),
-                    (dim.shell_t, keyboard.front_thickness),
-                    (keyboard.actual_height + dim.shell_t, keyboard.back_thickness),
-                    (keyboard.actual_height + dim.shell_t, dim.base_thickness),
+                    (0, keyboard.kbd_front_thickness),
+                    (dim.shell_t, keyboard.kbd_front_thickness),
+                    (keyboard.kbd_actual_height + dim.shell_t, keyboard.kbd_back_thickness),
+                    (keyboard.kbd_actual_height + dim.shell_t, dim.base_thickness),
                     (dim.height, dim.base_thickness),
                     (dim.height, 0),
                     (0, 0),
diff --git a/notebook_nueva/tandy_lid.stl b/notebook_nueva/tandy_lid.stl
index f281c8e96f98c4d962fb82acf29f16cf6e39b6a8..5c5bd0b00709e9f5db0da61923f4f2a482d2c6ed 100644
GIT binary patch
delta 85
zcmeyfUf|Dqfrb{wElf_{j2+XRy_wP(ji;~nX3}Ln5W9Mh()7FDO!17Z+iiWAT5W;!
p;Z7!1Ce}3v4(>Ia{<fRRkTGMsd=FDBBV$f`Z7<XI+Fs`RE&z7{ASVC-

delta 85
zcmeyfUf|Dqfrb{wElf_{jP28%y_wP(ji#^mX3}NdAG>;w;`F=TO!15@+iiWAT5W;!
p;Z7!1Cf3yl4(>IW{<fRRkTG++d=FDBBV%@ZZ7<XI+Fs`RE&z3iARhn#

diff --git a/notebook_nueva/tandy_lid_left.stl b/notebook_nueva/tandy_lid_left.stl
index 622fdc54189be3aab4899d9fadf923f7b8a94abe..ac638fdf47c7bf659946be8f3b110ef5617cb3d8 100644
GIT binary patch
delta 96
zcmV-m0H6Ql=m_NK2!ON!@GF-hECDi?@GAjEw`eQ@PD}xXx3_o!g*^d<w>`E2B?1Mk
zz`?ySmuI*EF#%||nYaO60Re2c_qhR!0Rf1YgS!D|0W+8Dy8$f)z+J1nBDWp90Y`XL
COC}Hi

delta 101
zcmV-r0Gj{g=m_NK2!ON!@GF-hECEKB1S|m_m+&hA6t`$B0ZvQ-gtxbN0fjvQgttAm
z0VM(jtH8m%Fqdbz0Wkq-x0$#BT>$}WxA(aLiva<LmxH?jX8|&o>$?Fh1;1UZydk$8
Hya7jex$Y*=