~ruther/qmk_firmware

886b257c3f6807616b75a24f45d791a91fa32723 — QMK Bot 3 years ago dce3dc3 + 8c91e90
Merge remote-tracking branch 'origin/master' into develop
10 files changed, 10 insertions(+), 114 deletions(-)

M keyboards/dailycraft/sandbox/rev1/config.h
D keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c
D keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md
D keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk
M keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c
D keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c
D keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md
D keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk
M keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c
M keyboards/dailycraft/sandbox/rules.mk
M keyboards/dailycraft/sandbox/rev1/config.h => keyboards/dailycraft/sandbox/rev1/config.h +1 -1
@@ 50,7 50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
/*
 * 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

D keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c => keyboards/dailycraft/sandbox/rev1/keymaps/oled/keymap.c +0 -42
@@ 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 <http://www.gnu.org/licenses/>.
 */
#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
    )
};

D keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md => keyboards/dailycraft/sandbox/rev1/keymaps/oled/readme.md +0 -1
@@ 1,1 0,0 @@
# The default keymap for sandbox

D keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk => keyboards/dailycraft/sandbox/rev1/keymaps/oled/rules.mk +0 -2
@@ 1,2 0,0 @@
VIA_ENABLE = yes
OLED_ENABLE = yes

M keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c => keyboards/dailycraft/sandbox/rev1/keymaps/via/keymap.c +4 -11
@@ 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
    )

D keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c => keyboards/dailycraft/sandbox/rev2/keymaps/oled/keymap.c +0 -43
@@ 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 <http://www.gnu.org/licenses/>.
 */
#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
    )
};


D keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md => keyboards/dailycraft/sandbox/rev2/keymaps/oled/readme.md +0 -1
@@ 1,1 0,0 @@
# The oled keymap for sandbox

D keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk => keyboards/dailycraft/sandbox/rev2/keymaps/oled/rules.mk +0 -2
@@ 1,2 0,0 @@
VIA_ENABLE = yes
OLED_ENABLE = yes

M keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c => keyboards/dailycraft/sandbox/rev2/keymaps/via/keymap.c +4 -11
@@ 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
    )

M keyboards/dailycraft/sandbox/rules.mk => keyboards/dailycraft/sandbox/rules.mk +1 -0
@@ 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