diff options
Diffstat (limited to 'keyboards/ktec')
-rw-r--r-- | keyboards/ktec/daisy/config.h | 43 | ||||
-rw-r--r-- | keyboards/ktec/daisy/info.json | 2 | ||||
-rw-r--r-- | keyboards/ktec/daisy/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/ktec/ergodone/keymaps/vega/keymap.c | 2 | ||||
-rwxr-xr-x | keyboards/ktec/staryu/config.h | 15 | ||||
-rw-r--r-- | keyboards/ktec/staryu/info.json | 8 | ||||
-rw-r--r-- | keyboards/ktec/staryu/keymaps/krusli/keymap.c | 24 | ||||
-rwxr-xr-x | keyboards/ktec/staryu/rules.mk | 6 |
8 files changed, 23 insertions, 83 deletions
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h index ae2f012676..3f256af5ca 100644 --- a/keyboards/ktec/daisy/config.h +++ b/keyboards/ktec/daisy/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 @@ -39,16 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * 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 LED_CAPS_LOCK_PIN C6 #define LED_PIN_ON_STATE 0 #define BACKLIGHT_PIN D0 -// #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 6 #define RGB_DI_PIN C7 @@ -77,43 +70,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* 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 -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -129,7 +90,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json index f9c7b3e382..832f5021f1 100644 --- a/keyboards/ktec/daisy/info.json +++ b/keyboards/ktec/daisy/info.json @@ -8,6 +8,8 @@ "pid": "0xD7DC", "device_version": "5.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ktec/daisy/rules.mk b/keyboards/ktec/daisy/rules.mk index c483c98ee3..8a6e2c7b71 100644 --- a/keyboards/ktec/daisy/rules.mk +++ b/keyboards/ktec/daisy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c index eafbdda513..8e460d7b4c 100644 --- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c +++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c @@ -320,7 +320,7 @@ enum unicode_names { nullpic, // Null picture - ␀ }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { // MATH [neq] = 0x2260, //≠ [intgrl] = 0x222B, //∫ diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h index b8abd983c5..1826763cbf 100755 --- a/keyboards/ktec/staryu/config.h +++ b/keyboards/ktec/staryu/config.h @@ -16,18 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -/* key matrix pins */ -#define DIRECT_PINS { \ - { NO_PIN, D0, D1 }, \ - { D4, D3, D2 }, \ -} - #define RGB_DI_PIN C6 #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING @@ -54,9 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LED_COUNT 5 #define BACKLIGHT_LEVELS 10 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 8971ec7021..e222923a23 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -8,6 +8,14 @@ "pid": "0x2328", "device_version": "2.0.5" }, + "processor": "atmega32u2", + "bootloader": "lufa-dfu", + "matrix_pins": { + "direct": [ + [null, "D0", "D1"], + ["D4", "D3", "D2"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}] diff --git a/keyboards/ktec/staryu/keymaps/krusli/keymap.c b/keyboards/ktec/staryu/keymaps/krusli/keymap.c index 1db6857348..3fe539106d 100644 --- a/keyboards/ktec/staryu/keymaps/krusli/keymap.c +++ b/keyboards/ktec/staryu/keymaps/krusli/keymap.c @@ -59,21 +59,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_LAYER0] = LAYOUT( \ - KC_ESC, TO(_LAYER1), \ - KC_Z, KC_X, KC_ENT \ + [_LAYER0] = LAYOUT( + KC_ESC, TO(_LAYER1), + KC_Z, KC_X, KC_ENT ), - [_LAYER1] = LAYOUT( \ - MUTE, TO(_LAYER2), \ - GIT_ADD, GIT_COMMIT, GIT_PUSH \ + [_LAYER1] = LAYOUT( + MUTE, TO(_LAYER2), + GIT_ADD, GIT_COMMIT, GIT_PUSH ), - [_LAYER2] = LAYOUT( \ - RGB_MOD, TO(_LAYER3), \ - RGB_TOG, RGB_HUD, RGB_HUI \ + [_LAYER2] = LAYOUT( + RGB_MOD, TO(_LAYER3), + RGB_TOG, RGB_HUD, RGB_HUI ), - [_LAYER3] = LAYOUT( \ - RGB_VAI, TO(_LAYER0), \ - RGB_SAD, RGB_VAD, RGB_SAI \ + [_LAYER3] = LAYOUT( + RGB_VAI, TO(_LAYER0), + RGB_SAD, RGB_VAD, RGB_SAI ) }; diff --git a/keyboards/ktec/staryu/rules.mk b/keyboards/ktec/staryu/rules.mk index 73b1a47953..8a6e2c7b71 100755 --- a/keyboards/ktec/staryu/rules.mk +++ b/keyboards/ktec/staryu/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = lufa-dfu - # Build Options # change yes to no to disable # |