diff options
Diffstat (limited to 'keyboards/salicylic_acid3/7skb')
-rw-r--r-- | keyboards/salicylic_acid3/7skb/config.h | 21 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/keymaps/default/config.h | 2 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h | 2 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/rev1/config.h | 9 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/7skb/rules.mk | 6 |
7 files changed, 8 insertions, 39 deletions
diff --git a/keyboards/salicylic_acid3/7skb/config.h b/keyboards/salicylic_acid3/7skb/config.h deleted file mode 100644 index cfb6bf4ffc..0000000000 --- a/keyboards/salicylic_acid3/7skb/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/salicylic_acid3/7skb/keymaps/default/config.h b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h index 4b3496d856..c2844a6775 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/default/config.h +++ b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h @@ -18,5 +18,5 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h index cc4a3d4426..09bf50b6ab 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h +++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h @@ -18,6 +18,6 @@ /* Select hand configuration */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 180 //#define MASTER_RIGHT diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c index 690476e1ef..58f6fb408a 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c @@ -31,7 +31,7 @@ enum tapdances{ TD_ESQW, }; -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_ESFL] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _FLOCK), [TD_ESQW] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _QWERTY), }; diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index 0e884adfe7..b85eee3da2 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,21 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - // wiring of each half #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 } #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 #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index 7bd508ed7f..242135b16c 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "split": { + "soft_serial_pin": "D2" + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index dc0a7dfb49..171b119b34 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |