From 8c91e90381fff838554c979da416341393e0630c Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Mon, 18 Apr 2022 03:28:28 -0600 Subject: [PATCH] [Keyboard] sandbox - fix keymaps (#16873) --- keyboards/dailycraft/sandbox/rev1/config.h | 2 +- .../sandbox/rev1/keymaps/oled/keymap.c | 42 ------------------ .../sandbox/rev1/keymaps/oled/readme.md | 1 - .../sandbox/rev1/keymaps/oled/rules.mk | 2 - .../sandbox/rev1/keymaps/via/keymap.c | 15 ++----- .../sandbox/rev2/keymaps/oled/keymap.c | 43 ------------------- .../sandbox/rev2/keymaps/oled/readme.md | 1 - .../sandbox/rev2/keymaps/oled/rules.mk | 2 - .../sandbox/rev2/keymaps/via/keymap.c | 15 ++----- keyboards/dailycraft/sandbox/rules.mk | 1 + 10 files changed, 10 insertions(+), 114 deletions(-) delete mode 100644 keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c delete mode 100644 keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk delete mode 100644 keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c delete mode 100644 keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md delete mode 100644 keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h index 102b8247db..2bd405d2aa 100644 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ b/keyboards/dailycraft/sandbox/rev1/config.h @@ -50,7 +50,7 @@ along with this program. If not, see . /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c b/keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c deleted file mode 100644 index 25910ef919..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 yfuku - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -enum layer_names { - _0, - _1, - _2, - _3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_0] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, - KC_6, KC_7, KC_8, KC_9, KC_0 - ), - [_1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md b/keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md deleted file mode 100644 index 7fe2318a44..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for sandbox diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk b/keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk deleted file mode 100644 index ab9d5c6ac2..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c b/keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c index 047eabf513..39a9f1d153 100644 --- a/keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c +++ b/keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c @@ -15,27 +15,20 @@ */ #include QMK_KEYBOARD_H -enum layer_names { - _1, - _2, - _3, - _4 -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_0] = LAYOUT( + [0] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 ), - [_1] = LAYOUT( + [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [_2] = LAYOUT( + [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [_3] = LAYOUT( + [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c b/keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c deleted file mode 100644 index c72b85c79a..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 yfuku - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -enum layer_names { - _0, - _1, - _2, - _3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_0] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, KC_A, KC_B, KC_C, KC_D, KC_E, - KC_6, KC_7, KC_8, KC_9, KC_0, KC_F, KC_G, KC_H, KC_I, KC_J - ), - [_1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md b/keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md deleted file mode 100644 index c0c3cb6eec..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The oled keymap for sandbox diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk b/keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk deleted file mode 100644 index ab9d5c6ac2..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c index c202284292..8796e0443d 100644 --- a/keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c +++ b/keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c @@ -15,27 +15,20 @@ */ #include QMK_KEYBOARD_H -enum layer_names { - _0, - _1, - _2, - _3 -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_0] = LAYOUT( + [0] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_A, KC_B, KC_C, KC_D, KC_E, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F, KC_G, KC_H, KC_I, KC_J ), - [_1] = LAYOUT( + [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [_2] = LAYOUT( + [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [_3] = LAYOUT( + [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk index b3386ed771..f33c50e352 100644 --- a/keyboards/dailycraft/sandbox/rules.mk +++ b/keyboards/dailycraft/sandbox/rules.mk @@ -16,5 +16,6 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +OLED_ENABLE = yes DEFAULT_FOLDER = dailycraft/sandbox/rev2