From e6e6529b4a85e9bdcb2708216b5434c52d5be15e Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Tue, 11 Jan 2022 07:03:15 +0800 Subject: [Keyboard] move Salicylic-acid3's keyboards to salicylic-acid3/ (#15791) --- .../naked48/keymaps/default_with_setta21/config.h | 35 ------ .../naked48/keymaps/default_with_setta21/keymap.c | 138 --------------------- .../naked48/keymaps/default_with_setta21/readme.md | 44 ------- 3 files changed, 217 deletions(-) delete mode 100644 keyboards/naked48/keymaps/default_with_setta21/config.h delete mode 100644 keyboards/naked48/keymaps/default_with_setta21/keymap.c delete mode 100644 keyboards/naked48/keymaps/default_with_setta21/readme.md (limited to 'keyboards/naked48/keymaps/default_with_setta21') diff --git a/keyboards/naked48/keymaps/default_with_setta21/config.h b/keyboards/naked48/keymaps/default_with_setta21/config.h deleted file mode 100644 index 2ad4d0adeb..0000000000 --- a/keyboards/naked48/keymaps/default_with_setta21/config.h +++ /dev/null @@ -1,35 +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 . - */ - -#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 - -#ifdef RGBLED_NUM - #undef RGBLED_NUM -#endif - -#define RGBLED_NUM 69 // Number of LEDs -#define RGBLIGHT_SPLIT -#define RGBLED_SPLIT { 48, 21 } diff --git a/keyboards/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/naked48/keymaps/default_with_setta21/keymap.c deleted file mode 100644 index f6e460588c..0000000000 --- a/keyboards/naked48/keymaps/default_with_setta21/keymap.c +++ /dev/null @@ -1,138 +0,0 @@ -#include QMK_KEYBOARD_H - -extern keymap_config_t keymap_config; - -#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, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - RGB_RST = SAFE_RANGE, - SEND_SUM, - SEND_AVE, - SEND_CIF, - SEND_MAX, - SEND_MIN -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_with_setta21( - //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------| - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL, - //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| - MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL - //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| - ), - - [_LOWER] = LAYOUT_with_setta21( - //,-----------------------------------------------------| |-----------------------------------------------------. |------------------------------------------------| - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN, KC_DEL, MO(_LOWER),XXXXXXX,KC_LEFT, XXXXXXX,XXXXXXX, KC_ESC, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------| - 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_DOWN,KC_DOWN, KC_UP,KC_PSLS, KC_F2, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------| - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL, - //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+----------------+-------+-------| - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL - //`------------------------------------------------------------------------------------------------------------' |------------------------------------------------| - ), - - - [_RAISE] = LAYOUT_with_setta21( - //,-----------------------------------------------------| |-----------------------------------------------------. |------------------------------------------------| - KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, KC_F11, KC_F4, KC_F7,SEND_MIN, KC_ESC, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F12, KC_F5, KC_F8,SEND_MAX, KC_F2, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+--------+-------| - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, KC_F3, KC_F6, KC_F9,SEND_CIF, KC_EQL, - //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+--------+-------| - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RPRN, SEND_SUM,SEND_AVE, KC_DEL - //`------------------------------------------------------------------------------------------------------------' |------------------------------------------------| - ), - - [_ADJUST] = LAYOUT_with_setta21( /* Base */ - //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, - //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| - _______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, _______, RGB_MOD, RGB_TOG,_______,_______ - //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| - ) -}; - -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/naked48/keymaps/default_with_setta21/readme.md b/keyboards/naked48/keymaps/default_with_setta21/readme.md deleted file mode 100644 index 6e2a3441d2..0000000000 --- a/keyboards/naked48/keymaps/default_with_setta21/readme.md +++ /dev/null @@ -1,44 +0,0 @@ -# The default_with_setta21 keymap for naked48 - -Add Setta21 maps to the default layout. - -## Default -| 1 | 2 | 3 | 4 | -|:----:|:----:|:----:|:----:| -| ESC| F2| =| DEL| -| 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| -| XXXXX| XXXXX| XXXXX| -| -|LED_SAD|LED_SAI| XXXXX| | -|LED_HUD|LED_HUI| XXXXX| +| -|LED_VAD|LED_VAI| XXXXX| | -|LED_ON/Off| | XXXXX|LED_MOD| - -- cgit v1.2.3