From 9b3256089041931265c5970f12385f3c0034a078 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 25 Nov 2019 17:25:44 -0600 Subject: [PATCH] Remove the broken boi =( --- bleghboard/qmk_firmware | 1 - bleghboard/readme.md | 53 --------- ergodox-infinity/Dockerfile | 4 - ergodox-infinity/Makefile | 33 ------ ergodox-infinity/keymap.c | 227 ------------------------------------ ergodox-infinity/readme.md | 30 ----- 6 files changed, 348 deletions(-) delete mode 160000 bleghboard/qmk_firmware delete mode 100644 bleghboard/readme.md delete mode 100644 ergodox-infinity/Dockerfile delete mode 100644 ergodox-infinity/Makefile delete mode 100644 ergodox-infinity/keymap.c delete mode 100644 ergodox-infinity/readme.md diff --git a/bleghboard/qmk_firmware b/bleghboard/qmk_firmware deleted file mode 160000 index 251b4fb..0000000 --- a/bleghboard/qmk_firmware +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 251b4fb79d558f550a481cad448000c1622d58f9 diff --git a/bleghboard/readme.md b/bleghboard/readme.md deleted file mode 100644 index 046b0f0..0000000 --- a/bleghboard/readme.md +++ /dev/null @@ -1,53 +0,0 @@ -# bleghboard - -The bleghboard is a WIP handwired ortholinear split keyboard that is BLE-capable -due to the [Adafruit Feather M0 Bluefruit LE][controller]. - -# Goals - -+ Modular & Easy-to-Repair - + I break stuff pretty frequently. I'm not sure if that's due to my rough - nature or kids or cats or clumsiness, but I need a keyboard that is kind - to my hands *and* simple to repair -+ Sturdy -+ USB-C -+ Bluetooth for wireless and portable use -+ Split hands -+ Ortholinear -+ Reprogrammability -+ Cheap & Salvageable parts - -# Parts - -+ Wire (duh) -+ [Adafruit Feather M0 Bluefruit LE][controller] -+ Some 18650 cell I tore out of a laptop battery -+ Some salvaged keyboard switches -+ A fat pack of [diodes][diodes] -+ 2x TRRS Jack Terminal Blocks ([Link][trrs-jack]) -+ **TODO**: TRRS-friendly IO expander - + [MCP23018][MCP23018] as seen on ErgoDox? -+ **TODO**: Male Mini-USB to Female USB-C (because I only want one or zero - cables for all the things) - + https://www.amazon.com/Adapter-ARKTEK-Charging-Digital-Samsung/dp/B072J5B3BR -+ **TODO**: Some means of indicating battery power, preferably in time remaining? - -## Tools - -+ Soldering Iron (I have a trash Radio Shack one) -+ Rosin-Core Solder (Mine is 0.22" Diameter Silver Bearing 62/36/2 also - from Radio Shack) -+ Computer capable of flashing the firmware - -And since I've done all the extremely difficult work, you won't need: - -+ Breadboard -+ Jumpers galore -+ Header pins for controller <-> breadboard -+ A head full of ways to write terrible C/'duino code - - -[controller]: https://www.adafruit.com/product/2995 -[trrs-jack]: https://www.adafruit.com/product/2915 -[MCP23018]: https://www.adafruit.com/product/732 -[diodes]: https://www.amazon.com/gp/product/B06XB1R2NK diff --git a/ergodox-infinity/Dockerfile b/ergodox-infinity/Dockerfile deleted file mode 100644 index e45ebd3..0000000 --- a/ergodox-infinity/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM edasque/qmk_firmware - -RUN apt-get update -RUN apt-get install gcc-arm* diff --git a/ergodox-infinity/Makefile b/ergodox-infinity/Makefile deleted file mode 100644 index e3deb71..0000000 --- a/ergodox-infinity/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -QMK_REPO_DIR ?= ${HOME}/.local/share/qmk_firmware -KB_DIR ?= ${QMK_REPO_DIR}/keyboards/ergodox_infinity/keymaps/lytedev - -default: flash-left-then-right - -${QMK_REPO_DIR}: - @git clone https://github.com/lytedev/qmk_firmware.git "${QMK_REPO_DIR}" - @cd "${QMK_REPO_DIR}" && make git-submodule - -repo_keymap_files: - @rm -rf "${KB_DIR}" - @mkdir -p "${KB_DIR}" - @cp keymap.c "${KB_DIR}/" - -flash-left: ${QMK_REPO_DIR} repo_keymap_files - @cd "${QMK_REPO_DIR}" && sudo make ergodox_infinity:lytedev:dfu-util - -flash-right: ${QMK_REPO_DIR} repo_keymap_files - @cd "${QMK_REPO_DIR}" && sudo make ergodox_infinity:lytedev:dfu-util MASTER=right - -build-and-flash-left: ${QMK_REPO_DIR} repo_keymap_files - @cd "${QMK_REPO_DIR}" && sudo make ergodox_infinity:lytedev - -build-and-flash-right: ${QMK_REPO_DIR} repo_keymap_files - @cd "${QMK_REPO_DIR}" && sudo make ergodox_infinity:lytedev MASTER=right - -flash-left-then-right: flash-left flash-right - -build-left: ${QMK_REPO_DIR} repo_keymap_files - @docker run -e keymap=lytedev -e keyboard=ergodox_infinity --rm -v "${QMK_REPO_DIR}":/qmk:rw edasque/qmk_firmware - -build-right: ${QMK_REPO_DIR} repo_keymap_files - @docker run -e keymap=lytedev -e MASTER=right -e keyboard=ergodox_infinity --rm -v "${QMK_REPO_DIR}":/qmk:rw edasque/qmk_firmware diff --git a/ergodox-infinity/keymap.c b/ergodox-infinity/keymap.c deleted file mode 100644 index 236d88a..0000000 --- a/ergodox-infinity/keymap.c +++ /dev/null @@ -1,227 +0,0 @@ -#include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h" -#include "version.h" - -#define BASE 0 // default layer -#define SYM1 1 // symbols 1 -#define SYM2 2 // symbols 2 -#define MOUS 3 // mouse - -#define ESC_CTL LCTL_T(KC_ESC) - -enum custom_keycodes { - PLACEHOLDER = SAFE_RANGE, // can always be here - EPRM, - VRSN, - RGB_SLD -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Layer 0: Basic - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | F11 | | F12 | 6 | 7 | 8 | 9 | 0 | Back | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | Back | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * |Esc/Ctl | A | S | D | F | G |------| |------| H | J | K | L | ; | ' | - * |--------+------+------+------+------+------| ( | | ) |------+------+------+------+------+--------| - * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | Enter | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | Ctrl | Ctrl | Alt | Meta | L2 | | L1 | Left | Down | Up | Right | - * `----------------------------------' `------------------------------------' - * ,-------------. ,-------------. - * | Vol- | Menu | | Ins | Vol+ | - * ,------+------+------| |------+------+------. - * | | | Home | | End | | | - * | Spce | Back |------| |------| Enter| Spce | - * | | | NmLk | | Prnt | | | - * `--------------------' `--------------------' - */ - - [BASE] = KEYMAP( - // Left Hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F11, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, - ESC_CTL, KC_A, KC_S, KC_D, KC_F, KC_G, /* ^^ */ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LPRN, - KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, MO(SYM2), - - // Thumb Cluster - KC_VOLD, KC_APP, - /* vv */ /* vv */ KC_HOME, - KC_SPC, KC_BSPC, KC_NLCK, - - // Right Hand - KC_F12, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - /* ^^ */ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_RPRN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - MO(SYM1),KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, - - // Thumb Cluster - KC_INS, KC_VOLU, - KC_END, /* vv */ /* vv */ - KC_PSCR, KC_ENT, KC_SPC - ), - - /* Layer 1: Symbols1 - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ~ | ! | @ | # | $ | % | F11 | | F12 | ^ | & | * | ( | ) | Del | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | ` | 1 | 2 | 3 | 4 | 5 | { | | } | 6 | 7 | 8 | 9 | 0 | Del | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * |Esc/Ctl | F1 | F2 | F3 | F4 | F5 |------| |------| F6 | - | = | [ | ] | \ | - * |--------+------+------+------+------+------| < | | > |------+------+------+------+------+--------| - * | LShift | F7 | F8 | F9 | F10 | F11 | | | | F12 | Ins | , | . | / | Enter | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | Ctrl | Ctrl | Alt | Meta | () | | () | Left | Down | Up | Right | - * `----------------------------------' `------------------------------------' - * ,-------------. ,-------------. - * | Vol- | Menu | | Ins | Vol+ | - * ,------+------+------| |------+------+------. - * | | | Home | | End | | | - * | Spce | Back |------| |------| Enter| Spce | - * | | | FLSH | | FLSH | | | - * `--------------------' `--------------------' - */ - - [SYM1] = KEYMAP( - // Left Hand - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_F11, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCBR, - ESC_CTL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, /* ^^ */ - KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_LABK, - KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, - - // Thumb Cluster - KC_VOLD, KC_APP, - /* vv */ /* vv */ KC_HOME, - KC_SPC, KC_BSPC, RESET, - - // Right Hand - KC_F12, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, - KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - /* ^^ */ KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_RABK, KC_F12, KC_INS, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, - - // Thumb Cluster - KC_INS, KC_VOLU, - KC_END, /* vv */ /* vv */ - RESET, KC_ENT, KC_SPC - ), - - /* Layer 2: Symbols2 - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ` | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | Back | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | ~ | ! | @ | # | $ | % | { | | } | ^ | & | * | ( | ) | Back | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * |Esc/Ctl | F1 | F2 | F3 | F4 | F5 |------| |------| F6 | _ | + | { | } | | | - * |--------+------+------+------+------+------| < | | > |------+------+------+------+------+--------| - * | LShift | F7 | F8 | F9 | F10 | F11 | | | | F12 | Ins | < | > | / | Enter | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | Ctrl | Ctrl | Alt | Meta | () | | () | Home | PgDn | PgUp | End | - * `----------------------------------' `------------------------------------' - * ,-------------. ,-------------. - * | Vol- | Menu | | Ins | Vol+ | - * ,------+------+------| |------+------+------. - * | | | Home | | End | | | - * | Spce | Back |------| |------| Enter| Spce | - * | | | FLSH | | FLSH | | | - * `--------------------' `--------------------' - */ - - [SYM2] = KEYMAP( - // Left Hand - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LCBR, - ESC_CTL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, /* ^^ */ - KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_LABK, - KC_LCTL, KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, - - // Thumb Cluster - KC_VOLD, KC_APP, - /* vv */ /* vv */ KC_HOME, - KC_SPC, KC_BSPC, RESET, - - // Right Hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_RCBR, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, - /* ^^ */ KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS, - KC_RABK, KC_F12, KC_INS, KC_LABK, KC_RABK, KC_QUES, KC_ENT, - KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, - - // Thumb Cluster - KC_INS, KC_VOLU, - KC_END, /* vv */ /* vv */ - RESET, KC_ENT, KC_SPC - ), -}; - -/* const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(SYM1), // FN1 - Momentary Layer 1 (Symbols1) - [2] = ACTION_LAYER_TAP_TOGGLE(SYM2) // FN2 - Momentary Layer 2 (Symbols2) -}; */ - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - break; - case 1: - if (record->event.pressed) { // For resetting EEPROM - eeconfig_init(); - } - break; - } - return MACRO_NONE; -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case EPRM: - if (record->event.pressed) { - eeconfig_init(); - } - return false; - break; - - case VRSN: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - return false; - break; - - case RGB_SLD: - #ifdef RGBLIGHT_ENABLE - if (record->event.pressed) { - rgblight_mode(1); - } - #endif - return false; - break; - } - return true; -} - -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - -}; diff --git a/ergodox-infinity/readme.md b/ergodox-infinity/readme.md deleted file mode 100644 index a82effe..0000000 --- a/ergodox-infinity/readme.md +++ /dev/null @@ -1,30 +0,0 @@ -# Ergodox Infinity -================== - -This contains my `qmk_firmware`-compatible Infinity Ergodox keymap. - -## Dependencies -=============== - -* Docker -* `arm-none-eabi-gcc` and `arm-none-eabi-newlib` -* See the `qmk_firmware` repo for details. - -## Flashing -=========== - -Run `make flash-left` to build the firmware and flash the left hand. -`s/left/right` for the right hand. - -**Note**: You may need to run the commands as root. - -**Tip**: If you don't have an extra keyboard to send the command, just prepend -`sleep 10 &&` to it to give yourself 10 seconds to hit the flash button. - -That should be it! Your Ergodox Infinity keyboard should now be flashed with -this layout. - -## Modifying -============ - -Just modify `keymap.c` and repeat the steps above for flashing! Easy.