From d7d148c5ebecf411066d0bcfa3a107c6fc182ee8 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Mon, 2 Mar 2020 08:13:44 -0800
Subject: [PATCH] Deck Mark V

---
 case/case.rkt            |  2 +-
 case/deck.rkt            |  8 +++--
 case/pine64-fragment.svg | 71 +++++++++++++++++++++++++---------------
 case/pine64.svg          | 45 +++++++++++++++++++------
 4 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/case/case.rkt b/case/case.rkt
index f20aa3e..7af8b30 100644
--- a/case/case.rkt
+++ b/case/case.rkt
@@ -24,7 +24,7 @@
 (define alps-switch-height 13.087)
 (define cherry-switch-width 13.62)
 (define cherry-switch-height 13.72)
-(define cherry? true)
+(define cherry? false)
 (define switch-height (if cherry? cherry-switch-height alps-switch-height))
 (define switch-width (if cherry? cherry-switch-width alps-switch-width))
 
diff --git a/case/deck.rkt b/case/deck.rkt
index f2876cb..f7999f8 100644
--- a/case/deck.rkt
+++ b/case/deck.rkt
@@ -61,7 +61,7 @@
                                  ;; the bottom middle has only one screw but
                                  ;; two hull positions
                                  (list (list (/ width 2) mid-bottom))
-                                 (drop hull-coords 5))])
+                                 (take (drop hull-coords 5) 2))])
              `(circle ((r ,(number->string screw-radius))
                        (cx ,(number->string (first s)))
                        (cy ,(number->string (second s))))))))
@@ -102,7 +102,7 @@
 ;; screen viewable: 116x68
 
 (define screen-slots
-  (let ((x 170)
+  (let ((x 180)
         (y "-65"))
     (list `(rect ((x ,(format "~s" x))
                   (y ,y)
@@ -188,5 +188,9 @@
 ;; live-reload with:
 ;; qiv --watch deck-switch.svg
 
+;; TODO: headphone jack is missing
+;; TODO: check HDMI width
 (write-out-layer 'switch)
+;; TODO: flip the bottom horizontally!
+;; TODO: remove heat sink cutout
 (write-out-layer 'bottom)
diff --git a/case/pine64-fragment.svg b/case/pine64-fragment.svg
index 3b31532..e3f9308 100644
--- a/case/pine64-fragment.svg
+++ b/case/pine64-fragment.svg
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <g id="g50">
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+    <g
+       id="g5839">
       <circle
          transform="scale(-1)"
          r="1.4013965"
@@ -9,6 +12,8 @@
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09720702;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <circle
          transform="scale(-1)"
+         inkscape:transform-center-y="-28.849266"
+         inkscape:transform-center-x="-0.72123166"
          r="1.4013966"
          cy="-222.54997"
          cx="-123.93"
@@ -21,14 +26,13 @@
          cx="-5.530683"
          id="path847-1"
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09720702;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <!-- this hole already exists, but we can use it for alignment -->
-      <!-- <circle -->
-      <!--    transform="scale(-1)" -->
-      <!--    r="1.4013966" -->
-      <!--    cy="-222.54997" -->
-      <!--    cx="-5.530683" -->
-      <!--    id="path847-5" -->
-      <!--    style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09720702;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> -->
+      <circle
+         transform="scale(-1)"
+         r="1.4013966"
+         cy="-222.54997"
+         cx="-5.530683"
+         id="path847-5"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09720702;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1)"
          y="-288.11554"
@@ -53,22 +57,11 @@
          width="59.823772"
          id="rect880"
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1762262;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1)"
-         y="-266.625"
-         x="-131.74718"
-         height="18.607777"
-         width="22.358181"
-         id="rect882"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1)"
-         y="-286.625"
-         x="-144.74718"
-         height="16.607777"
-         width="28.358181"
+      <path
          id="rect882"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="M 131.74718,266.625 H 109.389 v -18.60778 h 22.35818 z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
       <rect
          transform="scale(-1)"
          y="-233.26974"
@@ -109,6 +102,32 @@
          width="14.857372"
          id="rect890-4"
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="248.45453"
+         x="69.154579"
+         height="21.290863"
+         width="13.090864"
+         id="rect4524"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10913721;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="228.76283"
+         x="120.27613"
+         height="11.874357"
+         width="32.874359"
+         id="rect4572"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.12564273;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="244.12321"
+         x="-11.856783"
+         height="26.210566"
+         width="19.713566"
+         id="rect4608"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.28643477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="270.05338"
+         x="116.05337"
+         height="16.893267"
+         width="29.893267"
+         id="rect5217"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10673381;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
-
-
diff --git a/case/pine64.svg b/case/pine64.svg
index a715f5d..51972f5 100644
--- a/case/pine64.svg
+++ b/case/pine64.svg
@@ -26,8 +26,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.5180232"
-     inkscape:cx="310.28237"
-     inkscape:cy="111.81058"
+     inkscape:cx="290.35167"
+     inkscape:cy="122.18401"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -52,7 +52,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <g
-       id="g50">
+       id="g5839">
       <rect
          transform="scale(-1)"
          y="-296.8793"
@@ -115,14 +115,11 @@
          width="59.823772"
          id="rect880"
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1762262;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1)"
-         y="-266.625"
-         x="-131.74718"
-         height="18.607777"
-         width="22.358181"
+      <path
          id="rect882"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="M 131.74718,266.625 H 109.389 v -18.60778 h 22.35818 z"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
       <rect
          transform="scale(-1)"
          y="-233.26974"
@@ -163,6 +160,34 @@
          width="14.857372"
          id="rect890-4"
          style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="248.45453"
+         x="69.154579"
+         height="21.290863"
+         width="13.090864"
+         id="rect4524"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10913721;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="228.76283"
+         x="120.27613"
+         height="11.874357"
+         width="32.874359"
+         id="rect4572"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.12564273;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="244.12321"
+         x="-11.856783"
+         height="26.210566"
+         width="19.713566"
+         id="rect4608"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.28643477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="270.05338"
+         x="116.05337"
+         height="16.893267"
+         width="29.893267"
+         id="rect5217"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10673381;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
-- 
2.39.2