From 82265052fc57016fb496f5c17c586978974dfd23 Mon Sep 17 00:00:00 2001 From: Josh Peedimaa Date: Mon, 18 Apr 2022 14:03:43 +0300 Subject: [PATCH] update --- project.clj | 3 ++- src/dactyl_keyboard/dactyl.clj | 24 ++++++++++++++++++++++++ test/dactyl_cave/core_test.clj | 19 ++++++++++++++----- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 6e1f03f..6d58d87 100644 --- a/project.clj +++ b/project.clj @@ -6,7 +6,8 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :plugins [[lein-auto "0.1.3"] [lein-exec "0.3.7"]] - :aliases {"generate" ["exec" "-p" "src/dactyl_keyboard/dactyl.clj"]} + :aliases {"generate" ["exec" "-p" "src/dactyl_keyboard/dactyl.clj"], + "generate2" ["exec" "-p" "test/dactyl_cave/core_test.clj"]} :dependencies [[org.clojure/clojure "1.7.0"] [unicode-math "0.2.0"] [scad-clj "0.4.0"]]) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index 83a83fb..fc6fa4e 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -765,6 +765,30 @@ ; ; wire-posts ; ))) +;(spit "things/test.scad" +; (write-scad +; (extrude-linear +; {:height 2.6 :center false} +; (project +; (difference +; (union +; ;key-holes +; ;connectors +; ;thumb +; ;thumb-connectors +; case-walls +; ;thumbcaps +; ;(translate [5 5 0] thumbcaps) +; ;(translate [0 0 0] caps) +; ;(translate [4 4 0] caps) +; ;(translate [-4 -4 0] caps) +; ;(translate [-10 10 0] caps) +; ;rj9-space +; +; ) ;(translate [0 0 -100] case-walls) +; ;(translate [0 0 -10] screw-insert-screw-holes) +; ))))) + (spit "things/right-plate.scad" (write-scad (cut diff --git a/test/dactyl_cave/core_test.clj b/test/dactyl_cave/core_test.clj index 2259ab4..0a72886 100644 --- a/test/dactyl_cave/core_test.clj +++ b/test/dactyl_cave/core_test.clj @@ -1,7 +1,16 @@ (ns dactyl-cave.core-test - (:require [clojure.test :refer :all] - [dactyl-cave.core :refer :all])) + ;(:require [clojure.test :refer :all] + ; [dactyl-cave.core :refer :all])) -(deftest a-test - (testing "FIXME, I fail." - (is (= 0 1)))) + (:refer-clojure :exclude [use import]) + (:require [clojure.core.matrix :refer [array matrix mmul]] + [scad-clj.scad :refer :all] + [scad-clj.model :refer :all] + [unicode-math.core :refer :all])) + + + +(spit "things/right-plate-polygon.scad" + (write-scad +(polygon [[-83 0] [-81.7 11.88] [-80.76 21.6] [-74.64 41] [-71.67 45.4] [-73.5 47.3] [-70.74 52.21] [-57.39 62.9]]) + ))