feat: remodel case in openscad

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "geeboard_firmware/qmk_firmware"]
-	path = external/qmk_firmware
-	url = https://github.com/qmk/qmk_firmware.git

external/qmk_firmware

@@ -1 +0,0 @@
-Subproject commit ba63bac661c3c6154f3b42a85167b3552d29f0f8

geeboard_case/geeboard_case.scad

@@ -0,0 +1,30 @@
+module rounded_square(dimensions, radius, center=true) {
+  minkowski(){
+    square(dimensions - 2 * [radius,radius], center=center);
+    circle(radius);
+  }
+}
+
+CASE_WIDTH = 245;
+CASE_HEIGHT = 92;
+CASE_THICKNESS = 6.0;
+SCREW_DIAMETER = 3.0;
+SCREW_OFFSET = 4;
+// solution and simplification of 
+// 2*(INNER_RADIUS+CASE_THICKNESS)^2 = (INNER_RADIUS+OUTER_RADIUS+sqrt(2 * SCREW_OFFSET ^ 2))^2
+// INNER_RADIUS = sqrt(2) * (2 * SCREW_OFFSET - CASE_THICKNESS) + 3 * SCREW_OFFSET - 2 * CASE_THICKNESS;
+INNER_RADIUS = (2 + sqrt(2)) * (2 * SCREW_OFFSET - CASE_THICKNESS) - SCREW_OFFSET;
+
+echo("INNER_RADIUS=", INNER_RADIUS);
+
+
+difference() {
+
+  rounded_square([245,92], SCREW_OFFSET);
+  translate([+(CASE_WIDTH/2 - SCREW_OFFSET), +(CASE_HEIGHT/2 - SCREW_OFFSET)]) circle(SCREW_DIAMETER / 2);
+  translate([+(CASE_WIDTH/2 - SCREW_OFFSET), -(CASE_HEIGHT/2 - SCREW_OFFSET)]) circle(SCREW_DIAMETER / 2);
+  translate([-(CASE_WIDTH/2 - SCREW_OFFSET), +(CASE_HEIGHT/2 - SCREW_OFFSET)]) circle(SCREW_DIAMETER / 2);
+  translate([-(CASE_WIDTH/2 - SCREW_OFFSET), -(CASE_HEIGHT/2 - SCREW_OFFSET)]) circle(SCREW_DIAMETER / 2);
+  rounded_square([245 - 2 * CASE_THICKNESS,92 - 2 * CASE_THICKNESS], INNER_RADIUS);
+}
+

geeboard_firmware/Makefile

@@ -1,28 +0,0 @@
-# Inspired by Makefile from https://github.com/Felerius/planck-layout
-
-keyboard := geeboard
-layout := bone2planck
-qmk_dir := ../external/qmk_firmware
-keyboard_dir := ${qmk_dir}/keyboards/${keyboard}
-
-.PHONY: build
-build: ${keyboard_dir}
-	$(MAKE) -C ${qmk_dir} ${keyboard}:${layout}
-
-.PHONY: flash
-flash: ${keyboard_dir}
-	$(MAKE) -C ${qmk_dir} ${keyboard}:${layout}:flash
-
-.PHONY: clean
-clean:
-	$(MAKE) -C ${qmk_dir} clean
-	rm ${keyboard_dir}
-
-# execute any qmk make target e.g. other keyboard/keymaps
-.PHONY: %
-%:
-	$(MAKE) -C ${qmk_dir} $@
-
-${keyboard_dir}:
-	ln -sf "../../../geeboard_firmware" $@
-

geeboard_firmware/config.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#define ANALOG_JOYSTICK_X_AXIS_PIN GP28
-#define ANALOG_JOYSTICK_Y_AXIS_PIN GP29
-#define POINTING_DEVICE_INVERT_Y
-#define POINTING_DEVICE_INVERT_X
-#define ANALOG_JOYSTICK_WEIGHTS {0,0,0,0,0,0,0,0,0,0,0,15,15,16,17,18,18,19,19,20,20,21,21,21,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,24,24,24,24,24,25,25,25,26,26,26,27,28,28,29,29,30,31,32,33,34,35,36,37,38,40,41,43,44,46,48,49,51,53,56,58,60,62,65,68,70,73,76,79,82,85,89,92,96,100}
-
-#define POINTING_DEVICE_AUTO_MOUSE_ENABLE
-#define AUTO_MOUSE_TIME 1500
-

geeboard_firmware/keymaps/bone2planck/keymap.c

@@ -1,152 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-// for intellisense, has to be commented for building
-/*
-#include "..\..\..\..\quantum\keymap_extras\keymap_german.h"
-#include "..\..\..\..\tmk_core\common\keycode.h"
-*/
-
-/*
-Bone2Planck for the planck keyboard from the qmk_firmware at commit 7ea022b as of the 
-[[Keymap Removal] Planck and related keymaps.](https://github.com/qmk/qmk_firmware/pull/22683)
-*/
-
-
-/* This Layout tries to emulate the Bone2 Variant of Neo2, and is intended to be used with a German QWERTZ Softwarelayout.
-It has "üäöß" as it is optimized for a mix of German & English.
-My favourite features are the placement of the special characters often used for programming right on the home row
-and the number & navigation block combo, so you never have to move your hands from their home position.
-
-Bone2 wiki page: http://wiki.neo-layout.org/wiki/Bone
-*/
-
-void pointing_device_init_user(void) {
-  set_auto_mouse_layer(6);     // only required if AUTO_MOUSE_DEFAULT_LAYER is not set to index of <mouse_layer>
-  set_auto_mouse_enable(true); // always required before the auto mouse feature will work
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Bone2 (adapted)
-* ,-----------------------------------------------------------------------------------.
-* | ß    |   J  |   D  |   U  |   A  |   X  |   P  |   H  |   L  |   M  |   W  |  Q   |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  M1  |   C  |   T  |   I  |   E  |   O  |   B  |   N  |   R  |   S  |   G  |M1/Ent|  //hold for M1, tap for Enter
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|   F  |   V  |   Ü  |   Ä  |   Ö  |   Y  |   Z  |   ,  |   .  |   K  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-// columnt -t -o' '
-[0] = LAYOUT_ortho_4x12(
-    DE_SS,               DE_J,    DE_D,    DE_U,    DE_A,    DE_X,    DE_P,    DE_H,   DE_L,    DE_M,    DE_W,   DE_Q         ,
-    LT(1,KC_TAB),        DE_C,    DE_T,    DE_I,    DE_E,    DE_O,    DE_B,    DE_N,   DE_R,    DE_S,    DE_G,   LT(1,KC_ENT) ,
-    MT(MOD_LSFT,KC_ESC), DE_F,    DE_V,    DE_UDIA, DE_ADIA, DE_ODIA, DE_Y,    DE_Z,   DE_COMM, DE_DOT,  DE_K,   KC_LSFT      ,
-    KC_LCTL,             KC_LALT, KC_LGUI, MO(2),   KC_SPC,  XXXXXXX, XXXXXXX, KC_ENT, MO(4),   KC_RALT, KC_ESC, KC_RCTL
-),
-
-/* M1 Special Characters
-*  very ergonomic placement for coding
-* ,-----------------------------------------------------------------------------------.
-* | °    |   @  |   _  |   [  |   ]  |   ^  |   !  |   <  |   >  |   =  |   &  |  €   |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  M1  |   \  |   /  |   {  |   }  |   *  |   ?  |   (  |   )  |   -  |   :  |  @   |  //hold for M1, tap for Enter
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|   #  |   $  |   |  |   ~  |   `  |   +  |   %  |   "  |   '  |   ;  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M2  |    Space    |  M2  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[1] = LAYOUT_ortho_4x12(
-     DE_DEG,  DE_AT,   DE_UNDS, DE_LBRC, DE_RBRC, DE_CIRC, DE_EXLM, DE_LABK, DE_RABK, DE_EQL,  DE_AMPR, DE_EURO ,
-     _______, DE_BSLS, DE_SLSH, DE_LCBR, DE_RCBR, DE_ASTR, DE_QUES, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, DE_AT   ,
-     _______, DE_HASH, DE_DLR,  DE_PIPE, DE_TILD, DE_GRV, DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, DE_SCLN, _______ ,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* M2 Navigation & Number Blocks
-*  very easy to get used to & intuituve placement
-* ,-----------------------------------------------------------------------------------.
-* |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |   7  |   8  |   9  |      | Ins  |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Tab | Home |  Lft | Down | Right| End  |      |   4  |   5  |   6  |   .  | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      |  Tab |      | Enter|      |   0  |   1  |   2  |   3  |   ,  |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M3  |  M2  |    Space    |  M2  |  M3  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[2] = LAYOUT_ortho_4x12(
-     XXXXXXX, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, XXXXXXX, DE_7,    DE_8,  DE_9,    XXXXXXX, KC_INS  ,
-     KC_TAB,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, DE_4,    DE_5,  DE_6,    DE_DOT,  KC_ENT  ,
-     _______, XXXXXXX, KC_TAB,  XXXXXXX, KC_ENT,  XXXXXXX, DE_0,    DE_1,    DE_2,  DE_3,    DE_COMM, _______ ,
-     _______, _______, _______, MO(3),   _______, _______, _______, _______, MO(3), _______, _______, _______
-),
-
-/* M3 Switched Navigation & Number Blocks for one handed use
-*  accessed by sliding from M2 to M3 with thumb
-* ,-----------------------------------------------------------------------------------.
-* |  Ins |      |  7   |  8   |  9   |      | PgUp | Bksp |  Up  |  DEL | PgDn |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* |  Tab |      |  4   |  5   |  6   |   .  | Home | Left | Down | Right| End  | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|  0   |  1   |  2   |  3   |   ,  |      | Tab  |      | Enter|      |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M3  |      |    Space    |      |  M3  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-
-[3] = LAYOUT_ortho_4x12(
-     KC_INS,  XXXXXXX, DE_7,    DE_8,    DE_9,    XXXXXXX, KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,  KC_PGDN, XXXXXXX ,
-     _______, XXXXXXX, DE_4,    DE_5,    DE_6,    DE_DOT,  KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______ ,
-     _______, DE_0,    DE_1,    DE_2,    DE_3,    DE_COMM, XXXXXXX, KC_TAB,  XXXXXXX, KC_ENT,  XXXXXXX, _______ ,
-     _______, _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______, _______
-),
-
-
-/* M4 Function & Media Keys
-* ,-----------------------------------------------------------------------------------.
-* |      |      | Print|Scroll|Pause |      |      |  F7  |  F8  |  F9  |  F12 |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Tab  |      | Mute | Vol- | Vol+ |      |   ³  |  F4  |  F5  |  F6  |  F11 | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|      | Prev | Play | Next |      |   ²  |  F1  |  F2  |  F3  |  F10 |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |  M4  |  M5  |    Space    |  M5  |  M4  | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[4] = LAYOUT_ortho_4x12(
-     XXXXXXX, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX, KC_F7, KC_F8,   KC_F9,   KC_F12,  XXXXXXX ,
-     KC_TAB,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, DE_SUP3, KC_F4, KC_F5,   KC_F6,   KC_F11,  KC_ENT  ,
-     _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, DE_SUP2, KC_F1, KC_F2,   KC_F3,   KC_F10,  _______ ,
-     _______, _______, _______, _______, MO(5),   _______, _______, MO(5), _______, _______, _______, _______
-),
-
-
-/* M5 Switched Function & Media Keys|
-*  accessed by sliding from M4 to M5 with thumb
-* ,-----------------------------------------------------------------------------------.
-* |      |      |  F7  |  F8  |  F9  |  F12 |      | Print|Scroll| Pause|      |      |
-* |------+------+------+------+------+-------------+------+------+------+------+------|
-* | Tab  |  ³   |  F4  |  F5  |  F6  |  F11 |      | Mute | Vol- | Vol+ |      | Enter|
-* |------+------+------+------+------+------|------+------+------+------+------+------|
-* | Shift|  ²   |  F1  |  F2  |  F3  |  F10 |      | Prev | Play | Next |      |Shift |
-* |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Ctrl | GUI  | Alt  |      |  M5  |    Space    |  M5  |      | Alt  | Esc  | Ctrl |
-* `-----------------------------------------------------------------------------------'
-*/
-[5] = LAYOUT_ortho_4x12(
-     XXXXXXX, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F12,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX ,
-     _______, DE_SUP3, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______ ,
-     _______, DE_SUP2, KC_F1,   KC_F2,   KC_F3,   KC_F10,  XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, _______ ,
-     _______, _______, _______, XXXXXXX, _______, _______, _______, _______, XXXXXXX, _______, _______, _______
-),
-[6] = LAYOUT_ortho_4x12(
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2, MS_BTN3, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-};

geeboard_firmware/qmk/keyboard.json

@@ -23,7 +23,7 @@
         "vid": "0xFEED"
     },
     "layouts": {
-        "LAYOUT_ortho_4x12": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -66,8 +66,6 @@
                 {"matrix": [3, 2], "x": 2, "y": 3},
                 {"matrix": [3, 3], "x": 3, "y": 3},
                 {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
                 {"matrix": [3, 7], "x": 7, "y": 3},
                 {"matrix": [3, 8], "x": 8, "y": 3},
                 {"matrix": [3, 9], "x": 9, "y": 3},

geeboard_firmware/qmk/keymaps/default/keymap.c

@@ -11,14 +11,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ K │ L │
      * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
      * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ K │ L │
-     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * ├───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┤
-     * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ K │ L │
+     * │ A │ B │ C │ D │ E │       │ H │ I │ J │ K │ L │
-     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     * └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
      */
-    [0] = LAYOUT_ortho_4x12(
+    [0] = LAYOUT(
         KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,    KC_K,    KC_L,
         KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,    KC_K,    KC_L,
         KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,    KC_K,    KC_L,
-        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,    KC_F,    KC_G,    KC_H,    KC_I,    KC_J,    KC_K,    KC_L
+        KC_A,    KC_B,    KC_C,    KC_D,    KC_E,                      KC_H,    KC_I,    KC_J,    KC_K,    KC_L
     )
 };

geeboard_firmware/rules.mk

@@ -1,3 +0,0 @@
-POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = analog_joystick
-