Check use-external-holder before union internal holders

oskarcokl · Aug 13, 2021 · ae60ea2 · ae60ea2
1 parent 84e86a5
commit ae60ea2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/dactyl_keyboard/manuform.clj b/src/dactyl_keyboard/manuform.clj
@@ -1587,12 +1587,14 @@
                                  (rj9-space frj9-start c))
                 (case-walls c))
               (if use-screw-inserts? (screw-insert-outers screw-placement c) ())
-              (case connector-type
-                :trrs (union (pro-micro-holder c)
-                             (trrs-usb-holder-holder c)
-                             (trrs-holder c))
-                :rj9 (union (usb-holder fusb-holder-position c)
-                            (rj9-holder frj9-start c))
+              (if-not use-external-holder?
+                (case connector-type
+                  :trrs (union (pro-micro-holder c)
+                               (trrs-usb-holder-holder c)
+                               (trrs-holder c))
+                  :rj9 (union (usb-holder fusb-holder-position c)
+                              (rj9-holder frj9-start c))
+                  ())
                 ()))
        (if use-screw-inserts? (screw-insert-holes screw-placement c) ())
        (if-not use-external-holder?