From 1a60b2327e37ee22ea4587f4df5ad8d95182d5fb Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Sat, 15 Apr 2023 18:48:04 -0300 Subject: [PATCH] Move components into package --- notebook_nueva/base.py | 14 +- notebook_nueva/components/__init__.py | 0 notebook_nueva/{ => components}/audio_plug.py | 0 .../{ => components}/battery_holder.py | 0 notebook_nueva/{ => components}/hdmi_out.py | 0 notebook_nueva/{ => components}/keyboard.py | 1 + .../{ => components}/screen_pillars.py | 0 notebook_nueva/{ => components}/simple_lid.py | 0 notebook_nueva/{ => components}/usb_hub.py | 0 .../{ => components}/zero_holder.py | 0 notebook_nueva/dimensions.py | 4 +- notebook_nueva/hinged_lid.py | 2 +- notebook_nueva/lid.svg | 1269 ----------------- notebook_nueva/tandy_lid.stl | Bin 268284 -> 268284 bytes notebook_nueva/tandy_lid_left.stl | Bin 144484 -> 144484 bytes 15 files changed, 11 insertions(+), 1279 deletions(-) create mode 100644 notebook_nueva/components/__init__.py rename notebook_nueva/{ => components}/audio_plug.py (100%) rename notebook_nueva/{ => components}/battery_holder.py (100%) rename notebook_nueva/{ => components}/hdmi_out.py (100%) rename notebook_nueva/{ => components}/keyboard.py (98%) rename notebook_nueva/{ => components}/screen_pillars.py (100%) rename notebook_nueva/{ => components}/simple_lid.py (100%) rename notebook_nueva/{ => components}/usb_hub.py (100%) rename notebook_nueva/{ => components}/zero_holder.py (100%) delete mode 100644 notebook_nueva/lid.svg diff --git a/notebook_nueva/base.py b/notebook_nueva/base.py index 8beeff8..00619b9 100644 --- a/notebook_nueva/base.py +++ b/notebook_nueva/base.py @@ -1,13 +1,13 @@ import cadquery as cq from cq_warehouse.drafting import Draft -import audio_plug -import battery_holder -import hdmi_out -import keyboard -import screen_pillars -import usb_hub -import zero_holder as cpu_holder +import components.audio_plug as audio_plug +import components.battery_holder as battery_holder +import components.hdmi_out as hdmi_out +import components.keyboard as keyboard +import components.screen_pillars as screen_pillars +import components.usb_hub as usb_hub +import components.zero_holder as cpu_holder import dimensions as dim from utils import export diff --git a/notebook_nueva/components/__init__.py b/notebook_nueva/components/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/notebook_nueva/audio_plug.py b/notebook_nueva/components/audio_plug.py similarity index 100% rename from notebook_nueva/audio_plug.py rename to notebook_nueva/components/audio_plug.py diff --git a/notebook_nueva/battery_holder.py b/notebook_nueva/components/battery_holder.py similarity index 100% rename from notebook_nueva/battery_holder.py rename to notebook_nueva/components/battery_holder.py diff --git a/notebook_nueva/hdmi_out.py b/notebook_nueva/components/hdmi_out.py similarity index 100% rename from notebook_nueva/hdmi_out.py rename to notebook_nueva/components/hdmi_out.py diff --git a/notebook_nueva/keyboard.py b/notebook_nueva/components/keyboard.py similarity index 98% rename from notebook_nueva/keyboard.py rename to notebook_nueva/components/keyboard.py index a0359d3..57c040b 100644 --- a/notebook_nueva/keyboard.py +++ b/notebook_nueva/components/keyboard.py @@ -1,6 +1,7 @@ import cadquery as cq import math +# TODO: move dimensions to dimensions.py # Size of the kbd board kbd_height = 95.5 kbd_width = 305 diff --git a/notebook_nueva/screen_pillars.py b/notebook_nueva/components/screen_pillars.py similarity index 100% rename from notebook_nueva/screen_pillars.py rename to notebook_nueva/components/screen_pillars.py diff --git a/notebook_nueva/simple_lid.py b/notebook_nueva/components/simple_lid.py similarity index 100% rename from notebook_nueva/simple_lid.py rename to notebook_nueva/components/simple_lid.py diff --git a/notebook_nueva/usb_hub.py b/notebook_nueva/components/usb_hub.py similarity index 100% rename from notebook_nueva/usb_hub.py rename to notebook_nueva/components/usb_hub.py diff --git a/notebook_nueva/zero_holder.py b/notebook_nueva/components/zero_holder.py similarity index 100% rename from notebook_nueva/zero_holder.py rename to notebook_nueva/components/zero_holder.py diff --git a/notebook_nueva/dimensions.py b/notebook_nueva/dimensions.py index 502091a..a9a88bb 100644 --- a/notebook_nueva/dimensions.py +++ b/notebook_nueva/dimensions.py @@ -1,5 +1,5 @@ -import audio_plug -import usb_hub +import components.audio_plug as audio_plug +import components.usb_hub as usb_hub ## Standard things (TODO move to separate file) diff --git a/notebook_nueva/hinged_lid.py b/notebook_nueva/hinged_lid.py index 382d7a2..70b0c82 100644 --- a/notebook_nueva/hinged_lid.py +++ b/notebook_nueva/hinged_lid.py @@ -1,7 +1,7 @@ import cadquery as cq import dimensions as dim -import keyboard +import components.keyboard as keyboard from utils import export mounting_pillar_positions = [(x, -y) for x, y in dim.mounting_pillar_positions] diff --git a/notebook_nueva/lid.svg b/notebook_nueva/lid.svg deleted file mode 100644 index 19f9445..0000000 --- a/notebook_nueva/lid.svg +++ /dev/null @@ -1,1269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/notebook_nueva/tandy_lid.stl b/notebook_nueva/tandy_lid.stl index 21602dbb85d795b4e3c5499731e14a1b38388d4e..f281c8e96f98c4d962fb82acf29f16cf6e39b6a8 100644 GIT binary patch delta 939 zcmW;IPe_w-9LI6?O)JBLhv7jaOk!B1)DjOt7XuNtrJ35Cxg_SMu0+yA#dPX}%eh8* z*e@a^BBWGM!hAyJWzapss`vw)e;f)?l$H}{Sosa$V*^GX$#sAoR;5D{s=N`EL#9bL*=ochc^CDDWHfHG3K%!v5WfCi+PoV$oW2e%Sa{`eMaNsH^=Y;rp9pb0V(z4wbOpoIw^SyCP_0{BSqujkmVQ`SEkW66w}m1 zK#EnAo5BFtXVtRy$Y+v2A&IQxs=?Uo>X((vYBVSpvQ8BY#VS8}SK8Dqj4C&Xb2}4Y nE{Mau$$?nUYIfACK7_E{dWOX`=_Y4F680xUq9;QqE{^{Li%41v delta 940 zcmWmAPe_w-90qXqO)JBL2k9VEA~9U3;2%6hT?}NfEybqInNwoUr6!UkI&_;hr<-$> z#C{PG5h0<166PzSZY>YuL1aWo&_yC7N+cx0cIbI7AD-v;{qDE-ebWm$>4hABK({2- zCf$U(ZjugNg_<)-NoJyDZmm##HA$;(OkFd}lbA)y)s7iBE#g$=tXmd2QO7rslEhXE z^kj{M$zd&)19eFCKwGYpHBoPFqTeTHt>81$6)P5ZSznUM1|Y=MfI*sRo0K+!Y0^fD zZh_54tVEdX(I5q)y^=ft_}VsTfmn2iS69#nAzd zS(8NX#;t+7NCo834eFT=$TBf^f;_TFyd<{^>?3J4T@n^0J-BuE9uA-N02k1O~Iq)vSqLVpXi>|r?+RqRJU@kxbh^-GybvOXrq#5Mx-Bs{{eFp5-94#+aedj!11 zOcqIQ0PHgjFx3EUHo(7^arE6F=nmq0RF31Z(>&WIr4wM9w2@6x6as&k>>>Q(h}9Yf zg(L_vb1lC3nEDu!67_?JD_&pHF;PFH^rJ r#h~URSUwlU^4=7fAy=ak%Nj@x#rqT48{KMnN(|$vsA#F^smr1N46auf diff --git a/notebook_nueva/tandy_lid_left.stl b/notebook_nueva/tandy_lid_left.stl index 80cdd6d3c1a00069fb15420e680a4c34e943110e..622fdc54189be3aab4899d9fadf923f7b8a94abe 100644 GIT binary patch delta 934 zcmW;ITS(Jk7{_s*(M-b&2?>b`J0K((%R(eXLWD%@fOOG?NysSE5Q!39%i}yWK|HKI z;i1OBQ?6xsc-76eybvkrLc9>^LPA0)yofHuO8Wh}`S5+-=Vkx@{+nB|n_IE7FCU?Trxu9o4`7&vI*O4jxjE<$|_@Jl71Jq_GU@Pv8S2 zP2lj`I}n_}YgbL8a>)pZp91TwY?hx?lGQ1(TNAI;MO*O$5pz3OV+C1-?YNTCfm-FPVday-4jfqBV)whTfL+ga zqV_nSuqsHRQwqEh;;Xc#|DeA+OFQndwSwI3lJazvms-IMoWm4$}Ib@OeNS1;y0}1CnXd<{)+{ zFeZX>)1-C7*cVAEc`=ONac2Z|fqWv*$hlGQ4`tjQm4xVxaqJ9WbdJlmNk>B1_d{}C zzlJ1N3*KNJB=uy41V~btZy}6YCY5hN4)Kv)vPiNfKsPBTzeyYzr{D44J14PA$dC7U zAK^)S?S?7LVlqa|(_oEN$O@9XWOW*!sEMFHlR@A&#G0Ibr6uOpOA*OdJGNR0PL_0M z29*G52P`cy+jQ+hwLYJbGiiUXHOE5nj|;h4g{hgdxZE*^%VoquB6H$TbF4UH4RP~_ jI{h