From 2e6e922e5fa3f1d64df4ff7f9800faeedce4f5da Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Thu, 12 Aug 2021 21:14:28 +0300 Subject: [PATCH] remove references to planck --- keyboards/handwired/brass_planck/readme.md | 6 ------ .../{brass_planck => ortho_brass}/config.h | 6 +++--- .../keymaps/default/keymap.c | 18 +++++++++--------- .../keymaps/default/readme.md | 2 +- .../ortho_brass.c} | 2 +- .../ortho_brass.h} | 4 +--- keyboards/handwired/ortho_brass/readme.md | 6 ++++++ .../{brass_planck => ortho_brass}/rules.mk | 2 +- .../community/ortho_4x12/bifbofii/readme.md | 4 ++-- 9 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 keyboards/handwired/brass_planck/readme.md rename keyboards/handwired/{brass_planck => ortho_brass}/config.h (92%) rename keyboards/handwired/{brass_planck => ortho_brass}/keymaps/default/keymap.c (97%) rename keyboards/handwired/{brass_planck => ortho_brass}/keymaps/default/readme.md (76%) rename keyboards/handwired/{brass_planck/brass_planck.c => ortho_brass/ortho_brass.c} (95%) rename keyboards/handwired/{brass_planck/brass_planck.h => ortho_brass/ortho_brass.h} (90%) create mode 100644 keyboards/handwired/ortho_brass/readme.md rename keyboards/handwired/{brass_planck => ortho_brass}/rules.mk (97%) diff --git a/keyboards/handwired/brass_planck/readme.md b/keyboards/handwired/brass_planck/readme.md deleted file mode 100644 index c0302335652..00000000000 --- a/keyboards/handwired/brass_planck/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# Personal Planck Layout of BifbofII - -![BifbofII Planck Layout](https://i.imgur.com/hHSexjE.jpeg) - -A handwired planck clone. -A compact 40% (12x4) ortholinear keyboard. diff --git a/keyboards/handwired/brass_planck/config.h b/keyboards/handwired/ortho_brass/config.h similarity index 92% rename from keyboards/handwired/brass_planck/config.h rename to keyboards/handwired/ortho_brass/config.h index 7a72b6489b7..0c72dec5644 100644 --- a/keyboards/handwired/brass_planck/config.h +++ b/keyboards/handwired/ortho_brass/config.h @@ -23,14 +23,14 @@ #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 #define MANUFACTURER BifbofII -#define PRODUCT Planck -#define DESCRIPTION Handwired Planck +#define PRODUCT "Ortho Brass" +#define DESCRIPTION "Handwired Ortho 4x12 Keyboard" /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 -/* Planck PCB default pin-out */ +/* Handwired pin-out */ #define MATRIX_ROW_PINS \ { D3, D2, D1, D0 } #define MATRIX_COL_PINS \ diff --git a/keyboards/handwired/brass_planck/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c similarity index 97% rename from keyboards/handwired/brass_planck/keymaps/default/keymap.c rename to keyboards/handwired/ortho_brass/keymaps/default/keymap.c index c2381ecee1d..e0fac65ae35 100644 --- a/keyboards/handwired/brass_planck/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H -enum planck_layers { +enum ortho_brass_layers { _QWERTY, _COLEMAK, _DVORAK, @@ -26,7 +26,7 @@ enum planck_layers { _ADJUST }; -enum planck_keycodes { +enum ortho_brass_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_QWERTY] = LAYOUT_planck_mit( +[_QWERTY] = LAYOUT_ortho_4x12_1x2uC( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_COLEMAK] = LAYOUT_planck_mit( +[_COLEMAK] = LAYOUT_ortho_4x12_1x2uC( KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_DVORAK] = LAYOUT_planck_mit( +[_DVORAK] = LAYOUT_ortho_4x12_1x2uC( KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ -[_LOWER] = LAYOUT_planck_mit( +[_LOWER] = LAYOUT_ortho_4x12_1x2uC( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ -[_RAISE] = LAYOUT_planck_mit( +[_RAISE] = LAYOUT_ortho_4x12_1x2uC( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, @@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Exit | | | A | O | | E | U | | | | * `-----------------------------------------------------------------------------------' */ -[_PLOVER] = LAYOUT_planck_mit( +[_PLOVER] = LAYOUT_ortho_4x12_1x2uC( KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, @@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_ADJUST] = LAYOUT_planck_mit( +[_ADJUST] = LAYOUT_ortho_4x12_1x2uC( _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______, diff --git a/keyboards/handwired/brass_planck/keymaps/default/readme.md b/keyboards/handwired/ortho_brass/keymaps/default/readme.md similarity index 76% rename from keyboards/handwired/brass_planck/keymaps/default/readme.md rename to keyboards/handwired/ortho_brass/keymaps/default/readme.md index c08dd4ae063..ca6c4a71d4c 100644 --- a/keyboards/handwired/brass_planck/keymaps/default/readme.md +++ b/keyboards/handwired/ortho_brass/keymaps/default/readme.md @@ -1,4 +1,4 @@ -# The Default Planck Layout +# The Default Ortho 4x12 Planck-like Layout ![Planck Default Layout](https://i.imgur.com/axdWbdH.jpeg) diff --git a/keyboards/handwired/brass_planck/brass_planck.c b/keyboards/handwired/ortho_brass/ortho_brass.c similarity index 95% rename from keyboards/handwired/brass_planck/brass_planck.c rename to keyboards/handwired/ortho_brass/ortho_brass.c index 575b3a29bcc..9ffc6d0463a 100644 --- a/keyboards/handwired/brass_planck/brass_planck.c +++ b/keyboards/handwired/ortho_brass/ortho_brass.c @@ -1,4 +1,4 @@ -#include "brass_planck.h" +#include "ortho_brass.h" #ifdef SWAP_HANDS_ENABLE __attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/handwired/brass_planck/brass_planck.h b/keyboards/handwired/ortho_brass/ortho_brass.h similarity index 90% rename from keyboards/handwired/brass_planck/brass_planck.h rename to keyboards/handwired/ortho_brass/ortho_brass.h index b0b98afe700..1b25db5b841 100644 --- a/keyboards/handwired/brass_planck/brass_planck.h +++ b/keyboards/handwired/ortho_brass/ortho_brass.h @@ -2,7 +2,7 @@ #include "quantum.h" -#define LAYOUT_planck_1x2uC( \ +#define LAYOUT_ortho_4x12_1x2uC( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ @@ -29,5 +29,3 @@ } #define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/handwired/ortho_brass/readme.md b/keyboards/handwired/ortho_brass/readme.md new file mode 100644 index 00000000000..0b531dac105 --- /dev/null +++ b/keyboards/handwired/ortho_brass/readme.md @@ -0,0 +1,6 @@ +# Ortho Brass Handwired Keyboard + +A handwired keyboard with brass backplate and planck-like ortho 4x12 layout. +A compact 40% (12x4) ortholinear keyboard. + +![BifbofII Ortho 4x12 Layout](https://i.imgur.com/hHSexjE.jpeg) diff --git a/keyboards/handwired/brass_planck/rules.mk b/keyboards/handwired/ortho_brass/rules.mk similarity index 97% rename from keyboards/handwired/brass_planck/rules.mk rename to keyboards/handwired/ortho_brass/rules.mk index 4e800c64cbb..3a640afdb4a 100644 --- a/keyboards/handwired/brass_planck/rules.mk +++ b/keyboards/handwired/ortho_brass/rules.mk @@ -23,5 +23,5 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -LAYOUTS = ortho_4x12 planck_mit +LAYOUTS = ortho_4x12 LAYOUTS_HAS_RGB = no diff --git a/layouts/community/ortho_4x12/bifbofii/readme.md b/layouts/community/ortho_4x12/bifbofii/readme.md index b766531147d..e077ffba289 100644 --- a/layouts/community/ortho_4x12/bifbofii/readme.md +++ b/layouts/community/ortho_4x12/bifbofii/readme.md @@ -1,6 +1,6 @@ -# Personal Planck Layout of BifbofII +# Personal Ortho 4x12 Layout of BifbofII -![BifbofII Planck Layout](https://i.imgur.com/hHSexjE.jpeg) +![BifbofII Ortho 4x12 Layout](https://i.imgur.com/hHSexjE.jpeg) ## QWERTY Layer