diff options
| author | peepeetee <43021794+peepeetee@users.noreply.github.com> | 2022-01-11 07:03:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 15:03:15 -0800 |
| commit | e6e6529b4a85e9bdcb2708216b5434c52d5be15e (patch) | |
| tree | 4fb399d03eee1f810c6603e1053936fee3b1fa6e /keyboards/naked64 | |
| parent | 4cff18a70594f2bb1143a19cbe1109e9c458f618 (diff) | |
[Keyboard] move Salicylic-acid3's keyboards to salicylic-acid3/ (#15791)
Diffstat (limited to 'keyboards/naked64')
27 files changed, 0 insertions, 1506 deletions
diff --git a/keyboards/naked64/.noci b/keyboards/naked64/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/naked64/.noci +++ /dev/null diff --git a/keyboards/naked64/config.h b/keyboards/naked64/config.h deleted file mode 100644 index cfb6bf4ffc..0000000000 --- a/keyboards/naked64/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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/>. -*/ - -#pragma once - -#include "config_common.h" diff --git a/keyboards/naked64/info.json b/keyboards/naked64/info.json deleted file mode 100644 index 887f43b087..0000000000 --- a/keyboards/naked64/info.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "keyboard_name": "Naked64", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"pgup", "x":0.25, "y":0}, - {"label":"ESC", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":4, "y":0}, - {"label":"3", "x":5, "y":0}, - {"label":"4", "x":6, "y":0}, - {"label":"5", "x":7, "y":0}, - {"label":"6", "x":9.25, "y":0}, - {"label":"7", "x":10.25, "y":0}, - {"label":"8", "x":11.25, "y":0}, - {"label":"9", "x":12.25, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"-", "x":14.5, "y":0}, - {"label":"Back Space", "x":15.5, "y":0}, - {"label":"pgdn", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.5, "y":1}, - {"label":"[", "x":14.5, "y":1}, - {"label":"]", "x":15.5, "y":1}, - {"label":"Control", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Return", "x":15.5, "y":2}, - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":4, "y":3}, - {"label":"C", "x":5, "y":3}, - {"label":"V", "x":6, "y":3}, - {"label":"B", "x":7, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":",", "x":11.25, "y":3}, - {"label":".", "x":12.25, "y":3}, - {"label":"/", "x":13.5, "y":3}, - {"label":"↑", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3}, - {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, - {"label":"Alt", "x":3.75, "y":4.25}, - {"x":4.75, "y":4.25, "w":2.25}, - {"label":"⇓", "x":7, "y":4.25}, - {"label":"⇑", "x":9.25, "y":4.25}, - {"x":10.25, "y":4.25, "w":2}, - {"label":"GUI", "x":12.25, "y":4.25}, - {"label":"←", "x":13.5, "y":4}, - {"label":"↓", "x":14.5, "y":4}, - {"label":"→", "x":15.5, "y":4} - ] - }, - "LAYOUT_with_setta21": { - "layout": [ - {"label":"pgup", "x":0.25, "y":0}, - {"label":"ESC", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":4, "y":0}, - {"label":"3", "x":5, "y":0}, - {"label":"4", "x":6, "y":0}, - {"label":"5", "x":7, "y":0}, - {"label":"6", "x":9.25, "y":0}, - {"label":"7", "x":10.25, "y":0}, - {"label":"8", "x":11.25, "y":0}, - {"label":"9", "x":12.25, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"-", "x":14.5, "y":0}, - {"label":"Back Space", "x":15.5, "y":0}, - - {"label":"Esc", "x": 17.5, "y":0}, - {"label":"F2", "x": 18.5, "y":0}, - {"label":"=", "x": 19.5, "y":0}, - {"label":"Delete", "x": 20.5, "y":0}, - - {"label":"pgdn", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.5, "y":1}, - {"label":"[", "x":14.5, "y":1}, - {"label":"]", "x":15.5, "y":1}, - - {"label":"Num Lock", "x": 17.5, "y":1.25}, - {"label":"/", "x": 18.5, "y":1.25}, - {"label":"*", "x": 19.5, "y":1.25}, - {"label":"-", "x": 20.5, "y":1.25}, - - {"label":"Control", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Return", "x":15.5, "y":2}, - - {"label":"7", "x": 17.5, "y":2.25}, - {"label":"8", "x": 18.5, "y":2.25}, - {"label":"9", "x": 19.5, "y":2.25}, - - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":4, "y":3}, - {"label":"C", "x":5, "y":3}, - {"label":"V", "x":6, "y":3}, - {"label":"B", "x":7, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":",", "x":11.25, "y":3}, - {"label":".", "x":12.25, "y":3}, - {"label":"/", "x":13.5, "y":3}, - {"label":"↑", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3}, - - {"label":"4", "x": 17.5, "y":3.25}, - {"label":"5", "x": 18.5, "y":3.25}, - {"label":"6", "x": 19.5, "y":3.25}, - {"label":"+", "x": 20.5, "y":2.25, "h":2}, - - {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, - {"label":"Alt", "x":3.75, "y":4.25}, - {"x":4.75, "y":4.25, "w":2.25}, - {"label":"⇓", "x":7, "y":4.25}, - {"label":"⇑", "x":9.25, "y":4.25}, - {"x":10.25, "y":4.25, "w":2}, - {"label":"GUI", "x":12.25, "y":4.25}, - {"label":"←", "x":13.5, "y":4}, - {"label":"↓", "x":14.5, "y":4}, - {"label":"→", "x":15.5, "y":4}, - - {"label":"1", "x": 17.5, "y":4.25}, - {"label":"2", "x": 18.5, "y":4.25}, - {"label":"3", "x": 19.5, "y":4.25}, - - {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2}, - {"label":"Raise / .", "x": 19.5, "y":5.25}, - {"label":"Enter", "x": 20.5, "y":4.25, "h":2} - ] - } - } -} diff --git a/keyboards/naked64/keymaps/default/config.h b/keyboards/naked64/keymaps/default/config.h deleted file mode 100644 index 8c4e1f5129..0000000000 --- a/keyboards/naked64/keymaps/default/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Salicylic_acid3 - * - * 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/>. - */ - -#pragma once - -/* Select hand configuration */ - -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM 180 - - diff --git a/keyboards/naked64/keymaps/default/keymap.c b/keyboards/naked64/keymaps/default/keymap.c deleted file mode 100644 index b26044507e..0000000000 --- a/keyboards/naked64/keymaps/default/keymap.c +++ /dev/null @@ -1,152 +0,0 @@ -#include QMK_KEYBOARD_H - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif - -extern uint8_t is_master; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -enum layer_number { - _QWERTY = 0, - _FLOCK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - RGB_RST = SAFE_RANGE -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( - //,--------------------------------------------------------------| |--------------------------------------------------------------. - KC_PGUP, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_PGDN, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCBR, KC_RCBR, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - MO(_ADJUST), KC_LALT, KC_SPC,MO(_LOWER), MO(_RAISE), KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN,KC_RIGHT - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_FLOCK] = LAYOUT( - //,--------------------------------------------------------------| |--------------------------------------------------------------. - TG(_FLOCK), KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_LOWER] = LAYOUT( - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, 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_VOLU,_______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_RAISE] = LAYOUT( - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, 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, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_ADJUST] = LAYOUT( /* Base */ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - TG(_FLOCK), RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ) -}; - - -//A description for expressing the layer position in LED mode. -layer_state_t layer_state_set_user(layer_state_t state) { -#ifdef RGBLIGHT_ENABLE - switch (get_highest_layer(state)) { - case _FLOCK: - rgblight_sethsv_range(HSV_YELLOW, 0, 2); - break; - case _LOWER: - rgblight_sethsv_range(HSV_BLUE, 0, 2); - break; - case _RAISE: - rgblight_sethsv_range(HSV_RED, 0, 2); - break; - case _ADJUST: - rgblight_sethsv_range(HSV_PURPLE, 0, 2); - break; - default: // for any other layers, or the default layer - rgblight_sethsv_range( 0, 0, 0, 0, 2); - break; - } - rgblight_set_effect_range( 2, 6); -#endif -return state; -} - -int RGB_current_mode; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - bool result = false; - switch (keycode) { - #ifdef RGBLIGHT_ENABLE - case RGB_MOD: - if (record->event.pressed) { - rgblight_mode(RGB_current_mode); - rgblight_step(); - RGB_current_mode = rgblight_config.mode; - } - break; - case RGB_RST: - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_mode = rgblight_config.mode; - } - break; - #endif - default: - result = true; - break; - } - - return result; -} diff --git a/keyboards/naked64/keymaps/default/readme.md b/keyboards/naked64/keymaps/default/readme.md deleted file mode 100644 index 66bb965b29..0000000000 --- a/keyboards/naked64/keymaps/default/readme.md +++ /dev/null @@ -1,56 +0,0 @@ -# The default keymap for naked64 - -## Default -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| BSPC| -| PgDn | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| -| | Control | A| S| D| F| G| H| J| K| L| ;| '| ENT| -| | Shift | Z| X| C| V| B| N| M| ,| .| /| Up| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| Left| Down| Right| - - - -## FLock -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| -| | Control | A| S| D| F| G| H| J| K| L| ;| '| ENT| -| | Shift | Z| X| C| V| B| N| M| ,| .| /| Up| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| Left| Down| Right| - - - -## Lower -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | !| @| #| $| %| ^| &| *| (| )| DEL| ]| -| | Control | F1| F2| F3| F4| F5| F6| _| +| {| }| PIPE| ENT| -| | Shift | F7| F8| F9| F10| F11| F12| SNUHS| SNUBS| ,| .| VoUp| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | ,| MNxt| VoDn| Mply| - - - -## Raise -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp | ESC | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| BSPC| -| | Control | F1| F2| F3| F4| F5| F6| -| =| (| )| \| ENT| -| | Shift | F7| F8| F9| F10| F11| F12| NUHS| NUBS| .| /| VoUp| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| MNxt| VoDn| Mply| - - - -## Adjust -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp | RST | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| LRST| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| -| | Control | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| LTOG| LMOD| XXXXX| C+A+D|Alt+PSCR|PSCR| XXXXX| -| | Shift | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| LVAD| LVAI| LHUD| LHUI| LSAD| LSAI| XXXXX| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| MNxt| VoDn| Mply| - - diff --git a/keyboards/naked64/keymaps/default/rules.mk b/keyboards/naked64/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/naked64/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/naked64/keymaps/default_with_setta21/config.h b/keyboards/naked64/keymaps/default_with_setta21/config.h deleted file mode 100644 index c88277da20..0000000000 --- a/keyboards/naked64/keymaps/default_with_setta21/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2018 Salicylic_acid3 - * - * 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/>. - */ - -#pragma once - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS -#define USE_SERIAL_PD2 - -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM 180 - -#define RGBLED_NUM 12 // Number of LEDs -#define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 } - diff --git a/keyboards/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/naked64/keymaps/default_with_setta21/keymap.c deleted file mode 100644 index 01039aaecc..0000000000 --- a/keyboards/naked64/keymaps/default_with_setta21/keymap.c +++ /dev/null @@ -1,181 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keymap_jp.h" - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif - -extern uint8_t is_master; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -enum layer_number { - _QWERTY = 0, - _FLOCK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - RGB_RST = SAFE_RANGE, - SEND_SUM, - SEND_AVE, - SEND_CIF, - SEND_MAX, - SEND_MIN -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) -#define LWR_P0 LT(_LOWER, KC_P0) -#define RSE_DOT LT(_RAISE, KC_PDOT) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ,---. ,-----------------------. ,---------------------------. ,---------------. - * |PUp| |Esc| 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |Bsp| |Esc|F2 | = |Del| - * |---| ,-------------------------| |---------------------------| |---------------| - * |PDn| | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | |NLk| / | * | - | - * `---' ,--------------------------| |---------------------------| |---------------| - * | Caps | A | S | D | F | G | | H | J | K | L | ; | ' |Ent| | 7 | 8 | 9 | | - * ,---------------------------| |---------------------------| |-----------| + | - * | Shift | Z | X | C | V | B | | N | M | , | . | / |Up |Sft| | 4 | 5 | 6 | | - * `---------------------------| |---------------------------| |---------------| - * |Adjust| |Alt | Space |Lwr| |Rse| Space |Win|Lft|Dwn|Rgt| | 1 | 2 | 3 | | - * `------' `---------------' `---------------------------' |-----------|Ent| - * | 0 | . | | - * `---------------' - */ - [_QWERTY] = LAYOUT_with_setta21( - KC_PGUP, KC_ESC , KC_1 , KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, KC_ESC, KC_F2, KC_EQL, KC_DEL, - KC_PGDN, KC_TAB , KC_Q , KC_W , KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCBR, KC_RCBR, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_LCTL, KC_A , KC_S , KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P7, KC_P8, KC_P9, - KC_LSFT, KC_Z , KC_X , KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, KC_P4, KC_P5, KC_P6, KC_PPLS, - ADJUST , KC_LALT, KC_SPC, LOWER, RAISE, KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, - LWR_P0, RSE_DOT, KC_PENT - ), - - [_FLOCK] = LAYOUT_with_setta21( - TG(_FLOCK), KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______ - ), - - [_LOWER] = LAYOUT_with_setta21( - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC, KC_F2, KC_EQL, KC_DEL, - _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, _______, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, XXXXXXX, KC_UP, XXXXXXX, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, - _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY, XXXXXXX, KC_DOWN, XXXXXXX, - LOWER, RAISE, KC_PENT - ), - - [_RAISE] = LAYOUT_with_setta21( - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC, KC_F2, KC_EQL, KC_DEL, - _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC, SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE, - _______, 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_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, KC_F4, KC_F5, KC_F6, SEND_SUM, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_F3, - _______, _______, KC_RPRN - ), - - [_ADJUST] = LAYOUT_with_setta21( /* Base */ - TG(_FLOCK), RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, XXXXXXX, - _______, _______, RGB_MOD - ) -}; - -layer_state_t layer_state_set_user(layer_state_t state) { -#ifdef RGBLIGHT_ENABLE - switch (get_highest_layer(state)) { - case _FLOCK: - rgblight_sethsv_range(HSV_YELLOW, 0, 2); - break; - case _LOWER: - rgblight_sethsv_range(HSV_BLUE, 0, 2); - break; - case _RAISE: - rgblight_sethsv_range(HSV_RED, 0, 2); - break; - case _ADJUST: - rgblight_sethsv_range(HSV_PURPLE, 0, 2); - break; - default: // for any other layers, or the default layer - rgblight_sethsv_range( 0, 0, 0, 0, 2); - break; - } - rgblight_set_effect_range( 2, 6); -#endif -return state; -} - -int RGB_current_mode; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - bool result = false; - switch (keycode) { - case SEND_SUM: - if (record->event.pressed) { - SEND_STRING("=SUM("); - } - break; - case SEND_AVE: - if (record->event.pressed) { - SEND_STRING("=AVERAGE("); - } - break; - case SEND_CIF: - if (record->event.pressed) { - SEND_STRING("=COUNTIF("); - } - break; - case SEND_MAX: - if (record->event.pressed) { - SEND_STRING("=MAX("); - } - break; - case SEND_MIN: - if (record->event.pressed) { - SEND_STRING("=MIN("); - } - break; - #ifdef RGBLIGHT_ENABLE - case RGB_MOD: - if (record->event.pressed) { - rgblight_mode(RGB_current_mode); - rgblight_step(); - RGB_current_mode = rgblight_config.mode; - } - break; - case RGB_RST: - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_mode = rgblight_config.mode; - } - break; - #endif - default: - result = true; - break; - } - - return result; -} - -void matrix_init_user(void) { - -} diff --git a/keyboards/naked64/keymaps/default_with_setta21/readme.md b/keyboards/naked64/keymaps/default_with_setta21/readme.md deleted file mode 100644 index 6196d68fe0..0000000000 --- a/keyboards/naked64/keymaps/default_with_setta21/readme.md +++ /dev/null @@ -1,44 +0,0 @@ -# The default_with_setta21 keymap for naked64 - -Add Setta21 maps to the default layout. - -## Default -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -|Ad+Num| /| *| -| -| 7| 8| 9| | -| 4| 5| 6| +| -| 1| 2| 3| | -| Rai+0| | LOW + .| ENT| - -## Lower -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(| -| F7| F8| F9| | -| F4| F5| F6| =SUM(| -| F11| F12| F3| | -| RAISE| | LOWER| )| - -## Raise -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -| XXXXX| /| *| -| -| XXXXX| UP| XXXXX| | -| LEFT| DOWN| RIGHT| +| -| XXXXX| DOWN| XXXXX| | -| RAISE| | LOWER| ENT| - -## Adjust -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -|ADJUST| XXXXX| XXXXX| -| -|LED_SAD|LED_SAI| XXXXX| | -|LED_HUD|LED_HUI| XXXXX| +| -|LED_VAD|LED_VAI| XXXXX| | -|LED_ON/Off| | XXXXX|LED_MOD| - diff --git a/keyboards/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/naked64/keymaps/default_with_setta21/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/naked64/keymaps/default_with_setta21/rules.mk +++ /dev/null diff --git a/keyboards/naked64/keymaps/salicylic/config.h b/keyboards/naked64/keymaps/salicylic/config.h deleted file mode 100644 index 4b3496d856..0000000000 --- a/keyboards/naked64/keymaps/salicylic/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2018 Salicylic_acid3 - * - * 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/>. - */ - -#pragma once - -/* Select hand configuration */ - -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM 180 diff --git a/keyboards/naked64/keymaps/salicylic/keymap.c b/keyboards/naked64/keymaps/salicylic/keymap.c deleted file mode 100644 index 40e92393da..0000000000 --- a/keyboards/naked64/keymaps/salicylic/keymap.c +++ /dev/null @@ -1,203 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keymap_jp.h" - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif - -extern uint8_t is_master; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -enum layer_number { - _QWERTY = 0, - _MOUSE, - _BROWSER, - _FLOCK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - RGB_RST = SAFE_RANGE -}; - -enum tapdances{ - TD_ESFL = 0, - TD_ESQW, -}; - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK), - [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY), -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - TG(_MOUSE),TD(TD_ESFL), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, KC_BSPC, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - TG(_BROWSER), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, JP_RBRC, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_BSLS, KC_ENT, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, KC_UP, KC_RSFT, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_ZKHK, LGUI_T(KC_MHEN),LT(_LOWER,KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE,KC_SPC),ALT_T(KC_HENK),KC_LEFT,KC_DOWN,KC_RIGHT \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_MOUSE] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - TG(_MOUSE), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_BROWSER] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - TG(_BROWSER), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_UP,LCTL(KC_W), \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_TAB)),KC_DOWN,LCTL(KC_TAB) \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_FLOCK] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______,TD(TD_ESQW),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_LOWER] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_P6, KC_P7, KC_P8, KC_P9, JP_ASTR, JP_SLSH, XXXXXXX, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_P4, KC_P5, KC_P6, JP_MINS, JP_EQL, KC_ENT, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_P0, KC_P1, KC_P2, KC_P3, JP_PLUS, KC_UP, KC_RSFT, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_ZKHK, _______, MO(_LOWER), _______, _______, MO(_RAISE), JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_RAISE] = LAYOUT( \ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - LCTL_T(KC_F11), XXXXXXX, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ), - - [_ADJUST] = LAYOUT( /* Base */ - //,--------------------------------------------------------------| |--------------------------------------------------------------. - _______, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, \ - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - //`-----------------------------------------------------------------------------------------------------------------------------------' - ) -}; - -//A description for expressing the layer position in LED mode. -layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); -#ifdef RGBLIGHT_ENABLE - switch (get_highest_layer(state)) { - case _MOUSE: - rgblight_sethsv_at(HSV_RED, 0); - break; - case _BROWSER: - rgblight_sethsv_at(HSV_RED, 1); - break; - case _FLOCK: - rgblight_sethsv_range(HSV_YELLOW, 0, 2); - break; - case _LOWER: - rgblight_sethsv_range(HSV_BLUE, 0, 2); - break; - case _RAISE: - rgblight_sethsv_range(HSV_RED, 0, 2); - break; - case _ADJUST: - rgblight_sethsv_range(HSV_PURPLE, 0, 2); - break; - default: // for any other layers, or the default layer - rgblight_sethsv_range( 0, 0, 0, 0, 2); - break; - } - rgblight_set_effect_range( 2, 6); -#endif -return state; -} - -int RGB_current_mode; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - bool result = false; - switch (keycode) { - #ifdef RGBLIGHT_ENABLE - case RGB_MOD: - if (record->event.pressed) { - rgblight_mode(RGB_current_mode); - rgblight_step(); - RGB_current_mode = rgblight_config.mode; - } - break; - case RGB_RST: - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_mode = rgblight_config.mode; - } - break; - #endif - default: - result = true; - break; - } - - return result; -} - -void matrix_init_user(void) { - -} diff --git a/keyboards/naked64/keymaps/salicylic/readme.md b/keyboards/naked64/keymaps/salicylic/readme.md deleted file mode 100644 index 8b2d812ea4..0000000000 --- a/keyboards/naked64/keymaps/salicylic/readme.md +++ /dev/null @@ -1,56 +0,0 @@ -# The salicylic keymap for naked64 - -## Default -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| BSPC| -| PgDn | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| -| | Control | A| S| D| F| G| H| J| K| L| -| \| ENT| -| | Shift | Z| X| C| V| B| N| M| ,| .| /| Up| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| Left| Down| Right| - - - -## FLock -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| -| | Control | A| S| D| F| G| H| J| K| L| ;| '| ENT| -| | Shift | Z| X| C| V| B| N| M| ,| .| /| Up| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| Left| Down| Right| - - - -## Lower -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp |ESC(Flock)| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | !| @| #| $| %| ^| &| *| (| )| DEL| ]| -| | Control | F1| F2| F3| F4| F5| F6| _| +| {| }| PIPE| ENT| -| | Shift | F7| F8| F9| F10| F11| F12| SNUHS| SNUBS| ,| .| VoUp| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | ,| MNxt| VoDn| Mply| - - - -## Raise -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp | ESC | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| BSPC| -| | Control | F1| F2| F3| F4| F5| F6| -| =| (| )| \| ENT| -| | Shift | F7| F8| F9| F10| F11| F12| NUHS| NUBS| .| /| VoUp| Shift| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| MNxt| VoDn| Mply| - - - -## Adjust -| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -|:----:|:--------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:| -| PgUp | RST | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12| -| PgDn | Tab | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| -| | Control | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| LTOG| LMOD| XXXXX| C+A+D|Alt+PSCR|PSCR| XXXXX| -| | Shift | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| LVAD| LVAI| LHUD| LHUI| LSAD| LSAI| XXXXX| -| | ADJUST| | LALT| | SPC| LOWER| RAISE| SPC| | LGUI| MNxt| VoDn| Mply| - - diff --git a/keyboards/naked64/keymaps/salicylic/rules.mk b/keyboards/naked64/keymaps/salicylic/rules.mk deleted file mode 100644 index e5ddcae8d9..0000000000 --- a/keyboards/naked64/keymaps/salicylic/rules.mk +++ /dev/null @@ -1 +0,0 @@ -TAP_DANCE_ENABLE = yes diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/naked64/keymaps/salicylic_with_setta21/config.h deleted file mode 100644 index 0761e5b6d3..0000000000 --- a/keyboards/naked64/keymaps/salicylic_with_setta21/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2018 Salicylic_acid3 - * - * 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/>. - */ - -#pragma once - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS -#define USE_SERIAL_PD2 - -#define TAPPING_FORCE_HOLD -#define TAPPING_TERM 180 diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c deleted file mode 100644 index df80e0772b..0000000000 --- a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c +++ /dev/null @@ -1,256 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keymap_jp.h" - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif - -extern uint8_t is_master; - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. -enum layer_number { - _QWERTY = 0, - _MOUSE, - _BROWSER, - _FLOCK, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - RGB_RST = SAFE_RANGE, - SEND_SUM, - SEND_AVE, - SEND_CIF, - SEND_MAX, - SEND_MIN -}; - -enum tapdances{ - TD_ESFL = 0, - TD_ESQW, -}; - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK), - [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY), -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) -#define LWR_ENT LT(_LOWER,KC_ENT) -#define RSE_SPC LT(_RAISE,KC_SPC) -#define LWR_P0 LT(_LOWER, KC_P0) -#define RSE_DOT LT(_RAISE, KC_PDOT) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------. - TG(_MOUSE),TD(TD_ESFL), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, JP_MINS, KC_BSPC, KC_ESC, KC_F2, KC_EQL, KC_DEL, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - TG(_BROWSER), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, JP_RBRC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_BSLS, KC_ENT, KC_P7, KC_P8, KC_P9, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| | - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, KC_UP, KC_RSFT, KC_P4, KC_P5, KC_P6, KC_PPLS, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - KC_ZKHK, LGUI_T(KC_MHEN), LWR_ENT, KC_BSPC, KC_DEL ,RSE_SPC, ALT_T(KC_HENK), KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, - //`---------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| | - LWR_P0, RSE_DOT, KC_PENT - // `-----------------------------------' - ), - - [_MOUSE] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------. - TG(_MOUSE), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| | - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, - //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| | - _______, _______, _______ - // `-----------------------------------' - ), - - [_BROWSER] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |---------------------------------------------------------------------. ,-----------------------------------. - XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------------+----------| |--------+--------+--------+--------| - TG(_BROWSER), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------------+----------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+-------------+--------+----------| |--------+--------+--------| | - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_T)), KC_UP , C(KC_W), _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+----------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, C(S(KC_TAB)), KC_DOWN, C(KC_TAB), _______, _______, _______, - //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| | - _______, _______, _______ - // `-----------------------------------' - ), - - [_FLOCK] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------. - _______,TD(TD_ESQW),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| | - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| | - _______, _______, _______ - // `-----------------------------------' - ), - - [_LOWER] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |--------------------------------------------------------------. ,-----------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC, KC_F2, KC_EQL, KC_DEL, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_P6, KC_P7, KC_P8, KC_P9, JP_ASTR, JP_SLSH, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - JP_QUOT, JP_HASH, JP_DQUO, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_P4, KC_P5, KC_P6, JP_MINS, JP_EQL, KC_ENT, XXXXXXX, KC_UP, XXXXXXX, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| | - JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_P0, KC_P1, KC_P2, KC_P3, JP_PLUS, KC_UP, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| - KC_ZKHK, _______, LOWER, _______, _______, RAISE, JP_DOT, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_DOWN, XXXXXXX, - //`-----------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------| | - LOWER, RAISE, KC_PENT - // `-----------------------------------' - ), - - [_RAISE] = LAYOUT_with_setta21( - //,--------------------------------------------------------------| |--------------------------------------------------------------. ,---------------------------------------. - _______, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC, KC_F2, KC_EQL, KC_DEL, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------| - _______, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------| - LCTL_T(KC_F11), XXXXXXX, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______, KC_F7, KC_F8, KC_F9, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------| | - SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______, KC_F4, KC_F5, KC_F6, SEND_SUM, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| |---------+---------+---------+---------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_F3, - //`-----------------------------------------------------------------------------------------------------------------------------------' |-------------------+---------| | - _______, _______, KC_RPRN - // `---------------------------------------' - ), - - - [_ADJUST] = LAYOUT_with_setta21( /* Base */ - //,--------------------------------------------------------------| |------------------------------------------------------------------------. ,-----------------------------------. - _______, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------| - _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX, RGB_SAD, RGB_SAI, XXXXXXX, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX, RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG, - // |--------+--------+--------+--------+--------+--------| |--------+--------+--------+------------+--------------+--------+--------| |--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, XXXXXXX, - //`---------------------------------------------------------------------------------------------------------------------------------------------' |-----------------+--------+--------| - _______, _______, RGB_MOD - // `-----------------------------------' - ) -}; - -//A description for expressing the layer position in LED mode. -layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); -#ifdef RGBLIGHT_ENABLE - switch (get_highest_layer(state)) { - case _MOUSE: - rgblight_sethsv_at(HSV_RED, 0); - break; - case _BROWSER: - rgblight_sethsv_at(HSV_RED, 1); - break; - case _FLOCK: - rgblight_sethsv_range(HSV_YELLOW, 0, 2); - break; - case _LOWER: - rgblight_sethsv_range(HSV_BLUE, 0, 2); - break; - case _RAISE: - rgblight_sethsv_range(HSV_RED, 0, 2); - break; - case _ADJUST: - rgblight_sethsv_range(HSV_PURPLE, 0, 2); - break; - default: // for any other layers, or the default layer - rgblight_sethsv_range( 0, 0, 0, 0, 2); - break; - } - rgblight_set_effect_range( 2, 6); -#endif -return state; -} - -int RGB_current_mode; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - - bool result = false; - switch (keycode) { - case SEND_SUM: - if (record->event.pressed) { - SEND_STRING("=SUM("); - } - break; - case SEND_AVE: - if (record->event.pressed) { - SEND_STRING("=AVERAGE("); - } - break; - case SEND_CIF: - if (record->event.pressed) { - SEND_STRING("=COUNTIF("); - } - break; - case SEND_MAX: - if (record->event.pressed) { - SEND_STRING("=MAX("); - } - break; - case SEND_MIN: - if (record->event.pressed) { - SEND_STRING("=MIN("); - } - break; - #ifdef RGBLIGHT_ENABLE - case RGB_MOD: - if (record->event.pressed) { - rgblight_mode(RGB_current_mode); - rgblight_step(); - RGB_current_mode = rgblight_config.mode; - } - break; - case RGB_RST: - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_mode = rgblight_config.mode; - } - break; - #endif - default: - result = true; - break; - } - - return result; -} - -void matrix_init_user(void) { - -} diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/readme.md b/keyboards/naked64/keymaps/salicylic_with_setta21/readme.md deleted file mode 100644 index cf09c1a74c..0000000000 --- a/keyboards/naked64/keymaps/salicylic_with_setta21/readme.md +++ /dev/null @@ -1,44 +0,0 @@ -# The salicylic_with_setta21 keymap for naked64 - -Add Setta21 maps to the salicylic layout. - -## Default -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -|Ad+Num| /| *| -| -| 7| 8| 9| | -| 4| 5| 6| +| -| 1| 2| 3| | -| Rai+0| | LOW + .| ENT| - -## Lower -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(| -| F7| F8| F9| | -| F4| F5| F6| =SUM(| -| F11| F12| F3| | -| RAISE| | LOWER| )| - -## Raise -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -| XXXXX| /| *| -| -| XXXXX| UP| XXXXX| | -| LEFT| DOWN| RIGHT| +| -| XXXXX| DOWN| XXXXX| | -| RAISE| | LOWER| ENT| - -## Adjust -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -|ADJUST| XXXXX| XXXXX| -| -|LED_SAD|LED_SAI| XXXXX| | -|LED_HUD|LED_HUI| XXXXX| +| -|LED_VAD|LED_VAI| XXXXX| | -|LED_ON/Off| | XXXXX|LED_MOD| - diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk b/keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk deleted file mode 100644 index e5ddcae8d9..0000000000 --- a/keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk +++ /dev/null @@ -1 +0,0 @@ -TAP_DANCE_ENABLE = yes diff --git a/keyboards/naked64/naked64.c b/keyboards/naked64/naked64.c deleted file mode 100644 index a2863f0477..0000000000 --- a/keyboards/naked64/naked64.c +++ /dev/null @@ -1 +0,0 @@ -#include "naked64.h" diff --git a/keyboards/naked64/naked64.h b/keyboards/naked64/naked64.h deleted file mode 100644 index a131440118..0000000000 --- a/keyboards/naked64/naked64.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_naked64_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/naked64/readme.md b/keyboards/naked64/readme.md deleted file mode 100644 index 403e5cf4ae..0000000000 --- a/keyboards/naked64/readme.md +++ /dev/null @@ -1,18 +0,0 @@ -# naked64 - - - -This is 64 keys modification Ortholinear keyboard. - -Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3) -Hardware Supported: Naked64SF PCB, Pro Micro -Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_Data), [Booth Shop](https://salicylic-acid3.booth.pm/items/1418693) - -Make example for this keyboard (after setting up your build environment): - - make naked64:default:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). - -[Build guide](https://salicylic-acid3.hatenablog.com/entry/naked64SF-build-guide) -[Firmware](https://github.com/Salicylic-acid3/qmk_firmware/tree/master/keyboards/naked64) diff --git a/keyboards/naked64/rev1/config.h b/keyboards/naked64/rev1/config.h deleted file mode 100644 index b4699a9ca2..0000000000 --- a/keyboards/naked64/rev1/config.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0003 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked64 - -/* key matrix size */ -#define MATRIX_ROWS 16 -#define MATRIX_COLS 8 - -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4, B5, B2, B2 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D2 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -#define RGB_DI_PIN B6 - -#define RGBLED_NUM 12 // Number of LEDs -#define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 } - -#ifndef IOS_DEVICE_ENABLE - #define RGBLIGHT_LIMIT_VAL 180 - #define RGBLIGHT_VAL_STEP 17 -#else - #define RGBLIGHT_LIMIT_VAL 50 - #define RGBLIGHT_VAL_STEP 4 -#endif -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 - -// Selection of RGBLIGHT MODE to use. -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_SNAKE - -#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) -// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard -// 120 RGBoff, OLEDoff -// 120 OLED -// 330 RGB 6 -// 300 RGB 32 -// 310 OLED & RGB 32 - #define USB_MAX_POWER_CONSUMPTION 400 -#else - // fix iPhone and iPad power adapter issue - // iOS device need lessthan 100 - #define USB_MAX_POWER_CONSUMPTION 100 -#endif diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/naked64/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/naked64/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/naked64/rev1/rev1.h b/keyboards/naked64/rev1/rev1.h deleted file mode 100644 index 0ac804ee0f..0000000000 --- a/keyboards/naked64/rev1/rev1.h +++ /dev/null @@ -1,79 +0,0 @@ -#pragma once - -#include "naked64.h" - - -////////////////////////////////////////////////////////////////////////////// -// When only use Naked64. -////////////////////////////////////////////////////////////////////////////// -/* - * ,------------------------------------------ -----------------------------------------. - * | L00 | L20 | L70 | L31 | L02 | L52 | L13 | | L63 | L34 | L05 | L45 | L16 | L66 | L37 | - * |------------------------------------------ ------------------------------------------+ - * | L10 | L30 | L01 | L41 | L12 | L62 | L23 | | L73 | L44 | L15 | L55 | L26 | L76 | L47 | - * |------------------------------------------ ------------------------------------------+ - * | L40 | L11 | L51 | L22 | L72 | L33 | | L04 | L54 | L25 | L65 | L36 | L07 | L57 | - * |------------------------------------ ------------------------------------------+ - * | L50 | L21 | L61 | L32 | L03 | L43 | | L14 | L64 | L35 | L75 | L46 | L17 | L67 | - * |------------------------------------ ------------------------------------------+ - * | L60 | | L71 | L42 | | L53 | | L24 | L74 | | L06 | L56 | L27 | L77 | - * |------------------------------------ ------------------------------------------' - */ - -#define LAYOUT( \ - L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, \ - L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, \ - L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, \ - L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, \ - L60, L71, L42, L53, L24, L74, L06, L56, L27, L77 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { L50, L51, L52, L53, L54, L55, L56, L57 }, \ - { L60, L61, L62, L63, L64, L65, L66, L67 }, \ - { L70, L71, L72, L73, L74, L75, L76, L77 }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \ - } - -////////////////////////////////////////////////////////////////////////////// -// When connecting Setta21 to Naked64. -////////////////////////////////////////////////////////////////////////////// - -#define LAYOUT_with_setta21( \ - L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R05, R15, R25, R35, \ - L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R04, R14, R24, R34, \ - L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R03, R13, R23, \ - L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R02, R12, R22, R32, \ - L60, L71, L42, L53, L24, L74, L06, L56, L27, L77, R01, R11, R21, \ - R00, R20, R30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { L50, L51, L52, L53, L54, L55, L56, L57 }, \ - { L60, L61, L62, L63, L64, L65, L66, L67 }, \ - { L70, L71, L72, L73, L74, L75, L76, L77 }, \ - { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO }, \ - {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO }, \ - { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO }, \ - { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \ - } - diff --git a/keyboards/naked64/rev1/rules.mk b/keyboards/naked64/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/naked64/rev1/rules.mk +++ /dev/null diff --git a/keyboards/naked64/rules.mk b/keyboards/naked64/rules.mk deleted file mode 100644 index 7de80383e1..0000000000 --- a/keyboards/naked64/rules.mk +++ /dev/null @@ -1,24 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no -USE_I2C = no - -SPLIT_KEYBOARD = yes - -DEFAULT_FOLDER = naked64/rev1 |