From e015585a8b554d4945db0c1cde4bb4336d12f892 Mon Sep 17 00:00:00 2001
From: Roberto Alsina <roberto.alsina@gmail.com>
Date: Sat, 15 Apr 2023 19:29:46 -0300
Subject: [PATCH] Make keyboard more parametric

---
 notebook_nueva/components/keyboard.py |  15 ++++++++++-----
 notebook_nueva/dimensions.py          |   5 +++++
 notebook_nueva/tandy_lid.stl          | Bin 268284 -> 268284 bytes
 notebook_nueva/tandy_lid_left.stl     | Bin 144484 -> 144484 bytes
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/notebook_nueva/components/keyboard.py b/notebook_nueva/components/keyboard.py
index d1caaa7..9e7dcfa 100644
--- a/notebook_nueva/components/keyboard.py
+++ b/notebook_nueva/components/keyboard.py
@@ -9,6 +9,11 @@ kbd_back_thickness = 0
 kbd_front_thickness = 0
 kbd_actual_height = 0
 kbd_angle = 0
+kbd_pillar_offset_1 = 0
+kbd_pillar_radius_1 = 0
+kbd_pillar_offset_2 = 0
+kbd_pillar_radius_2 = 0
+kbd_screw_radius = 0
 
 
 def init():
@@ -19,19 +24,19 @@ def init():
         {
             "x": 0,
             "y": 0,
-            "z": 5.5,
-            "shape": cq.Sketch().push(kbd_pillar_positions).circle(5, mode="a"),
+            "z": kbd_pillar_offset_1,
+            "shape": cq.Sketch().push(kbd_pillar_positions).circle(kbd_pillar_radius_1, mode="a"),
         },
         # Taller pillars with holes for self-tapping screws
         {
             "x": 0,
             "y": 0,
-            "z": 2.5,
+            "z": kbd_pillar_offset_2,
             "shape": (
                 cq.Sketch()
                 .push(kbd_pillar_positions)
-                .circle(2.4, mode="a")
-                .circle(1.1, mode="s")
+                .circle(kbd_pillar_radius_2, mode="a")
+                .circle(kbd_screw_radius, mode="s")
             ),
         },
     ]
diff --git a/notebook_nueva/dimensions.py b/notebook_nueva/dimensions.py
index 15f4003..71fb19c 100644
--- a/notebook_nueva/dimensions.py
+++ b/notebook_nueva/dimensions.py
@@ -41,6 +41,11 @@ keyboard.kbd_pillar_positions = [
     (145.5, 82.5),
     (keyboard.kbd_width - 19, 79.5),
 ]
+keyboard.kbd_pillar_offset_1 = 5.5
+keyboard.kbd_pillar_radius_1 = 5
+keyboard.kbd_pillar_offset_2 = 2.5
+keyboard.kbd_pillar_radius_2 = 2.4
+keyboard.kbd_screw_radius = 1.1
 keyboard.init()
 
 ## Screen dimensions
diff --git a/notebook_nueva/tandy_lid.stl b/notebook_nueva/tandy_lid.stl
index 5c5bd0b00709e9f5db0da61923f4f2a482d2c6ed..aa3b9d1de7e48becca1895943a39c1c389df4acb 100644
GIT binary patch
delta 884
zcmWmAK}eHf90qXq*FvJh4&p&1L}Kh9N+uqnQwP~$%dw_?e&&+c=F%LJCOXQdeaxI|
zgv8#62#JsoK?&I>AtOFKj2*@p5z<j4M#zvD5wb(ibNTT+@BiJq_j~I*_WF)JZrJvu
z=+1bgM-|;5=#il6Va<EwT-9zPSwtHE4st+}q&k4jh8M{P%&b=qM18u0{+KlR!4IYz
zerznUejvSrKuCBHgE~`zbPa)ZGDe(t!Ql|Lq?mMaMslP>!(g8zG}N|Xq%XrranhoL
z6DF4~d39?9$xb%OEIAs%pnMN$gEWqU2<ap5MlpR8z@ZNU__%)o*}9;<2Qm3bE`~69
zA3~ZS!7wO>B%?A+o#P-M#+JZ1sIgka5y7d(L!@?6jQ}50g=C3)0<@A{vPhaI!7-BA
zKPgF362+;dDJ;H?f-o=(Q3=>oY8qW9PGIJyxji<6?gHlaj5tI!&Y_o|p!dy*ChE^T
z`Ztm$R~PUdrwd45i8ltWkUg>t%wI9FZ0hGz^v}S&{7kB%I^*c)&*i$hAD3&&Vtq|&
zL|Xz5l3d~|EF<|yg=9(V3$RGsWS2A>;FxKisUMhI2LE1G&`SyMD1rCrUBR{MTq}^S
zmtdWYkwfBK1%H|JRs7<N)t>|%Btddq`^~gZ+SYK@SPIESTFA*7*iK<^DUEdW3T%>_
ZY208I$t<TOx1p@=20Q>TYuyb^mH#l!K&Aiy

delta 883
zcmW;IPe_w-9LI6?)k31f4&p&1LSlFbr8PWs>>xXAIo7l}^Fd<Hr6rPo&`~z+Vdh*T
zJnR<{G9n~IP(t>LkP$;->@dcNkd7iTB!<Kgu^sw+y1aOQf8S@%^X#c_TkG4_sA<`i
zqATSVyDGZC|FXL!sPb+(SG7Ah%MpJsu#r6yC)HkDXL?XxpfeuX6ZPRP<|m}d2Y#?_
z`EX&0<2rHl0U@D2Eb6QR>Fft<WSE@xW4q5v+yen}Lb9aYkL|G^6=SsxfKLM$qogGO
zj#$os<kjs#l$C6dX>u@#MfpA|O&W(lm~@l3L)d;ZP!9|V>N7(&FR1T9%<sv?5j^hQ
z2x<(ZLXuKNPAI!N4`G>S8KbD$C@M#6VcgXF5OtN9q#6blR))C7Kr7iH3#54*9HMm3
zxWq*{CNP&C<JNCjA)pHrVpvpS5_5ob0G*xW<&i1OPN27@#3rh77IS$9bN8(HMg5t>
z{FNlhwR!xR-}9(1#1jEm$Szp|`d3797WMNf=8r&MekN5>*Q0V%{e3Pslo7=yM_!W}
z@h<`!i7(<Sm`f-xsgMk5eE}ATi|mkQ6CASUSUo^*ntXgIh7YhF!{H<1SjKDDmr(`M
z`4X&=VX{v;R=_DMu!7&l;;1ao+F2(oAM2QWCT**D)kp&6BrW7<6>KH2NGDMTufPVG
ZCYO?u(&eON(<;~1fDZt4t*fD_@()5^L!tlx

diff --git a/notebook_nueva/tandy_lid_left.stl b/notebook_nueva/tandy_lid_left.stl
index ac638fdf47c7bf659946be8f3b110ef5617cb3d8..2245bae2221d4b711d6b3f08e28f08bc8b7aae72 100644
GIT binary patch
delta 881
zcmWmAPe_w-9LI5f4<;i<ghWI{NW=~ju~x*0v4iX|#)yy(9b|;85Q!lX!fe{qxom>?
zXYCtv))+W7)>=9JrFj@Th{V`Ib|?vv7~vsyh#f>i`g|@g-rwi@+q36+>W8NKp($Kc
z?w||?l}+4aKdAhYV|5OyV+lM*Imj+aliMNCLV80ue8Q>#Z5>iuhFlI~{__HivhI;$
z7zaHgs0$=dLgZisi-A#;i!2lK7}#TFSk5sVX^o(29Q#;yl8Rtq8(03sI40niYf;oO
z$7z<2l%r}#wqBxQq<sQ3SX~oXcweC|l40_T6v(+4wr3`B)1NWC+tW$){*>IE!R8VP
z&tP+Y7FFlC&vMVIgq)p2Wl858j(jJ9I7SCa$8pz_*Qg}vB^A<>09LY1;-o{s5o?Oo
z4RlFV%#ctLcl9K3v27k4ptNgV`INLSV6LS=259>Nk2l|8E(2{zD~ln+8O&aw3mNsm
zkSB|n?+_DtyNLIAoJHLt-^d$seF^+S>4!_ItmOU*<|{x)S5(80Y!36YoVqDLa_WXS
zK43ge0%Vt@NlTtzA&;t%o{zvv;^c^Ila2zIBHiRKDFJ=;6aPN6irGVcf5!L7ui~)>
ziWpsFnV8qW9?QwfkbY8I!!P>QQB{%x35~FG^0RCN*LI}&1yv@~#78U}SVT5aU8J3?
aZ{h(O8+bnNS5;~gXB8LCK=)Tw^U;5g)mUNx

delta 881
zcmW;IPiWF%9LI6KvWA3*F(Sr@7!e*ugjs}yj2Iq7Bw}>vFeHY>7$Fih&}_NQ*>W)U
z$9%%M5@G+s%$n<Ie-7edj1UjQ!x$Y#NbC?E!owILeLh`YyuZ));rG*D?buj5Hiir0
z45(m0tjbB+f*>0Zuj&oTsq#I?Xeaw5O>Txj3mFXIUXxV@+VVnn4C-PS^Y52njCGe3
z!no)fMRkxI36Y~wEQZHW4zfy2<KU3xAIG+bV`~IdSwk!vNky>rPKY%zf%wmrD9%rD
zq-IziQi{r++IfYFk*-NlXZ1~D;eL(kBqQV}$&+(2Y;RAYe#FG9pG?VzGwRMP<_jb|
zi+7%%L)AD2=Om$=9NXr>(|K%rSqCg%9AzizIG$R5gG!Pn86*P<U?ICCPP!F1VNJ98
zfi5bE8B{Kb*_Fhj+ZRwr7`0<TJfd0`F;`O{1GH_C*BkFKmw+~>#cWU`8O&~=^BK8s
zP>+`|-y%lxZV7+p(K6}=`A*)Ft1I9yN<UbUlBj!Ym@fexU6Z;&EobGrdX|-I>L81a
z{UbO_d}N=bNlOl2p_xOK$-pOIA#rj-c1d?0Op|`{hZKRn{F$$Jt>Xi9tmE+47m!=W
z&mJzI9AuT4HozgPhm|3IQr!@5LL+QnL5d8K3h{DbCAhMu8sAVQGDAGXyop8UHmYw6
bbdmZdh-^thySJs-u6in%O+foA(s=j}0CiSm