aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/kinesis
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kinesis')
-rw-r--r--keyboards/kinesis/keymaps/default/keymap.c16
-rw-r--r--keyboards/kinesis/keymaps/default_pretty/keymap.c16
-rw-r--r--keyboards/kinesis/keymaps/tw1t611/keymap.c36
-rw-r--r--keyboards/kinesis/keymaps/tw1t611/readme.md2
-rw-r--r--keyboards/kinesis/rules.mk3
5 files changed, 20 insertions, 53 deletions
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index 98de455e5..dd85cdbe2 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -52,22 +52,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-
void matrix_init_user(void) {
}
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
index cb4cb6f26..3d2a538a2 100644
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c
@@ -45,22 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-
void matrix_init_user(void) {
}
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index ceb9d5e7d..afeaf7711 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -8,38 +8,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[QWERTZ] = LAYOUT(
_______,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
_______,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
- KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
- KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
- DE_HASH,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
- DE_TILD,DE_PIPE,DE_BSLS,DE_GRV,
+ KC_ESC ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
+ KC_TAB ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
+ DE_PIPE,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
+ _______,_______,_______,_______,
KC_RCTL,KC_LALT,
KC_HOME,
- KC_LSFT,MO(MOD),KC_BSPC ,
+ KC_SPC ,KC_LSFT,KC_BSPC ,
KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_FN0 ,RESET,
- KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_AUDIO_MUTE,
- KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_EQL ,
- KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_QUOT,
- KC_N ,KC_M ,DE_COMM,DE_DOT ,DE_MINS,DE_PLUS,
- DE_AE ,DE_OE, DE_UE, DE_SS,
+ KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,DE_SS ,
+ KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_AE ,
+ KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_OE ,
+ KC_N ,KC_M ,DE_COMM,DE_DOT ,DE_MINS,DE_UE ,
+ _______,_______,_______,_______,
KC_LGUI,KC_LCTL,
KC_END ,
- KC_DEL,KC_ENTER ,KC_SPC
+ KC_DEL,MO(MOD),KC_ENTER
),
[MOD] = LAYOUT(
_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,
- _______,DE_AT ,DE_EURO,DE_LBRC,DE_RBRC,_______,
- _______,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,_______,
- _______,DE_CIRC,DE_AMPR,DE_LCBR,DE_RCBR,_______,
- _______,_______,DE_LESS,DE_MORE,
+ DE_CIRC,DE_QUOT,DE_DQOT,DE_LCBR,DE_RCBR,DE_GRV ,
+ DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR,
+ DE_BSLS,DE_HASH,DE_LESS,DE_LBRC,DE_RBRC,DE_MORE,
+ _______,_______,_______,_______,
_______,_______,
_______,
_______,_______,_______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,
- _______,KC_PGDOWN,KC_PGUP,_______,_______,DE_PERC,
- KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,DE_QST ,DE_DQOT,
- _______,_______,DE_SCLN,DE_COLN,DE_UNDS,DE_ASTR,
+ KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC,
+ KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,DE_QST ,DE_ASTR,
+ DE_AT ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,
_______,_______,_______,_______,
_______,_______,
_______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/readme.md b/keyboards/kinesis/keymaps/tw1t611/readme.md
index da033be1e..41b0caa7e 100644
--- a/keyboards/kinesis/keymaps/tw1t611/readme.md
+++ b/keyboards/kinesis/keymaps/tw1t611/readme.md
@@ -1 +1 @@
-# The default keymap for kinesis-advantage
+This is a german keymap for the Kinesis Advantage.
diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk
index c8646449b..b3a6b84d6 100644
--- a/keyboards/kinesis/rules.mk
+++ b/keyboards/kinesis/rules.mk
@@ -5,7 +5,6 @@ SRC= matrix.c
# MCU name
MCU = at90usb1286
-#MCU = atmega32u4
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
@@ -72,4 +71,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming
CUSTOM_MATRIX=yes # need to do our own thing with the matrix
-DEFAULT_FOLDER = kinesis/alvicstep \ No newline at end of file
+DEFAULT_FOLDER = kinesis/alvicstep