From 9f148dbcb6b47b04d23c96f53eccdf5d7db54842 Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Thu, 8 Nov 2018 22:01:54 +0000 Subject: [PATCH 01/17] Added support for backlight , and a UK iso layout Added support for backlight , and a UK iso layout. Now uses the SPLIT_KEYBOARD #define rather than relying on lets split --- keyboards/diverge3/config.h | 16 +++-- keyboards/diverge3/keymaps/isoUK/config.h | 27 ++++++++ keyboards/diverge3/keymaps/isoUK/keymap.c | 73 ++++++++++++++++++++++ keyboards/diverge3/keymaps/isoUK/readme.md | 1 + keyboards/diverge3/keymaps/isoUK/rules.mk | 1 + keyboards/diverge3/rules.mk | 10 +-- 6 files changed, 112 insertions(+), 16 deletions(-) create mode 100755 keyboards/diverge3/keymaps/isoUK/config.h create mode 100644 keyboards/diverge3/keymaps/isoUK/keymap.c create mode 100755 keyboards/diverge3/keymaps/isoUK/readme.md create mode 100755 keyboards/diverge3/keymaps/isoUK/rules.mk diff --git a/keyboards/diverge3/config.h b/keyboards/diverge3/config.h index f3ed06739a8e..16086fd9605b 100644 --- a/keyboards/diverge3/config.h +++ b/keyboards/diverge3/config.h @@ -31,10 +31,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 -// Only SERIAL is currently supported -// By converting this to use I2C, backlight -// would/should be fully functional as well -#define USE_SERIAL + /* * Keyboard Matrix Assignments @@ -53,9 +50,9 @@ along with this program. If not, see . /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION ROW2COL -// #define BACKLIGHT_PIN C6 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 +#define BACKLIGHT_PIN C6 +#define BACKLIGHT_BREATHING +#define BACKLIGHT_LEVELS 5 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ @@ -63,7 +60,8 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST - + +/* number of backlight levels */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -73,7 +71,7 @@ along with this program. If not, see . /* 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 + #define GRAVE_ESC_CTRL_OVERRIDE /* * Force NKRO diff --git a/keyboards/diverge3/keymaps/isoUK/config.h b/keyboards/diverge3/keymaps/isoUK/config.h new file mode 100755 index 000000000000..583c24b3b963 --- /dev/null +++ b/keyboards/diverge3/keymaps/isoUK/config.h @@ -0,0 +1,27 @@ +/* Copyright 2017 IslandMan93 + * + * 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 . + */ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +// place overrides here +#define MASTER_LEFT +#define PERMISSIVE_HOLD +#define TAPPING_TERM 150 + +#endif diff --git a/keyboards/diverge3/keymaps/isoUK/keymap.c b/keyboards/diverge3/keymaps/isoUK/keymap.c new file mode 100644 index 000000000000..c3384a447a7f --- /dev/null +++ b/keyboards/diverge3/keymaps/isoUK/keymap.c @@ -0,0 +1,73 @@ +/* Copyright 2017 IslandMan93 + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// KEYMAP +extern keymap_config_t keymap_config; + + +#define _QWERTY 0 +#define _LOWER 1 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, +}; + +// Make layer undefined do nothing +#define _______ KC_TRNS + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_CAPS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PSCR, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_INS, KC_PGDN, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_ENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_HOME, KC_END, KC_SPC, KC_SPC, LOWER, KC_QUOT, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_SLASH + ), + + [_LOWER] = LAYOUT( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + BL_TOGG, KC_ASTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_INC, KC_ASUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_DEC, KC_ASDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_ASRP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + } else { + layer_off(_LOWER); + } + return false; + break; + } + return true; +}; diff --git a/keyboards/diverge3/keymaps/isoUK/readme.md b/keyboards/diverge3/keymaps/isoUK/readme.md new file mode 100755 index 000000000000..ff4971754ae9 --- /dev/null +++ b/keyboards/diverge3/keymaps/isoUK/readme.md @@ -0,0 +1 @@ +# My UK based diverge 3 layout diff --git a/keyboards/diverge3/keymaps/isoUK/rules.mk b/keyboards/diverge3/keymaps/isoUK/rules.mk new file mode 100755 index 000000000000..c9383ab8db88 --- /dev/null +++ b/keyboards/diverge3/keymaps/isoUK/rules.mk @@ -0,0 +1 @@ +AUTO_SHIFT_ENABLE = yes diff --git a/keyboards/diverge3/rules.mk b/keyboards/diverge3/rules.mk index 38f3ee4e6a9e..173fa836f10e 100644 --- a/keyboards/diverge3/rules.mk +++ b/keyboards/diverge3/rules.mk @@ -1,6 +1,3 @@ -SRC += ../lets_split/matrix.c \ - ../lets_split/serial.c \ - ../lets_split/split_util.c # MCU name #MCU = at90usb1286 @@ -61,13 +58,12 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SPLIT_KEYBOARD = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -CUSTOM_MATRIX = yes From dfa6878589bc99134dad74b23b4495d938fb7c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 07:04:22 +0000 Subject: [PATCH 02/17] Update keyboards/diverge3/keymaps/isoUK/keymap.c Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/isoUK/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/isoUK/keymap.c b/keyboards/diverge3/keymaps/isoUK/keymap.c index c3384a447a7f..9d75bcba0cf5 100644 --- a/keyboards/diverge3/keymaps/isoUK/keymap.c +++ b/keyboards/diverge3/keymaps/isoUK/keymap.c @@ -16,7 +16,6 @@ #include QMK_KEYBOARD_H // KEYMAP -extern keymap_config_t keymap_config; #define _QWERTY 0 From c7ea657c2829773e2924cd6c7061501bdd5268e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 07:04:46 +0000 Subject: [PATCH 03/17] Update keyboards/diverge3/keymaps/isoUK/keymap.c Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/isoUK/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/isoUK/keymap.c b/keyboards/diverge3/keymaps/isoUK/keymap.c index 9d75bcba0cf5..8442a9bd630d 100644 --- a/keyboards/diverge3/keymaps/isoUK/keymap.c +++ b/keyboards/diverge3/keymaps/isoUK/keymap.c @@ -27,7 +27,6 @@ enum custom_keycodes { }; // Make layer undefined do nothing -#define _______ KC_TRNS From 1ef1daaf985f741a0e209771dc2ea1f78c44fb97 Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Fri, 9 Nov 2018 07:17:57 +0000 Subject: [PATCH 04/17] Simplified the lower layer Simplified the lower layer --- keyboards/diverge3/keymaps/isoUK/keymap.c | 29 ++++------------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/keyboards/diverge3/keymaps/isoUK/keymap.c b/keyboards/diverge3/keymaps/isoUK/keymap.c index 8442a9bd630d..6316dbaa5afa 100644 --- a/keyboards/diverge3/keymaps/isoUK/keymap.c +++ b/keyboards/diverge3/keymaps/isoUK/keymap.c @@ -17,16 +17,17 @@ // KEYMAP - -#define _QWERTY 0 -#define _LOWER 1 +enum layers { + _QWERTY, + _LOWER, +}; enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, }; -// Make layer undefined do nothing +#define LOWER MO(_LOWER) @@ -49,23 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - } else { - layer_off(_LOWER); - } - return false; - break; - } - return true; -}; From be146ed60dde359acf31350d0a08bd70c820d637 Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Fri, 9 Nov 2018 07:19:13 +0000 Subject: [PATCH 05/17] dir rename to snake case dir rename to snake case --- keyboards/diverge3/keymaps/{isoUK => iso_UK}/config.h | 0 keyboards/diverge3/keymaps/{isoUK => iso_UK}/keymap.c | 0 keyboards/diverge3/keymaps/{isoUK => iso_UK}/readme.md | 0 keyboards/diverge3/keymaps/{isoUK => iso_UK}/rules.mk | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/diverge3/keymaps/{isoUK => iso_UK}/config.h (100%) rename keyboards/diverge3/keymaps/{isoUK => iso_UK}/keymap.c (100%) rename keyboards/diverge3/keymaps/{isoUK => iso_UK}/readme.md (100%) rename keyboards/diverge3/keymaps/{isoUK => iso_UK}/rules.mk (100%) diff --git a/keyboards/diverge3/keymaps/isoUK/config.h b/keyboards/diverge3/keymaps/iso_UK/config.h similarity index 100% rename from keyboards/diverge3/keymaps/isoUK/config.h rename to keyboards/diverge3/keymaps/iso_UK/config.h diff --git a/keyboards/diverge3/keymaps/isoUK/keymap.c b/keyboards/diverge3/keymaps/iso_UK/keymap.c similarity index 100% rename from keyboards/diverge3/keymaps/isoUK/keymap.c rename to keyboards/diverge3/keymaps/iso_UK/keymap.c diff --git a/keyboards/diverge3/keymaps/isoUK/readme.md b/keyboards/diverge3/keymaps/iso_UK/readme.md similarity index 100% rename from keyboards/diverge3/keymaps/isoUK/readme.md rename to keyboards/diverge3/keymaps/iso_UK/readme.md diff --git a/keyboards/diverge3/keymaps/isoUK/rules.mk b/keyboards/diverge3/keymaps/iso_UK/rules.mk similarity index 100% rename from keyboards/diverge3/keymaps/isoUK/rules.mk rename to keyboards/diverge3/keymaps/iso_UK/rules.mk From 8aa24104f88936cc96bc628a7c4101167efa3bfb Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Fri, 9 Nov 2018 07:21:53 +0000 Subject: [PATCH 06/17] changed dir case changed dir case --- keyboards/diverge3/keymaps/{iso_UK => iso_uk}/config.h | 0 keyboards/diverge3/keymaps/{iso_UK => iso_uk}/keymap.c | 0 keyboards/diverge3/keymaps/{iso_UK => iso_uk}/readme.md | 0 keyboards/diverge3/keymaps/{iso_UK => iso_uk}/rules.mk | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/diverge3/keymaps/{iso_UK => iso_uk}/config.h (100%) rename keyboards/diverge3/keymaps/{iso_UK => iso_uk}/keymap.c (100%) rename keyboards/diverge3/keymaps/{iso_UK => iso_uk}/readme.md (100%) rename keyboards/diverge3/keymaps/{iso_UK => iso_uk}/rules.mk (100%) diff --git a/keyboards/diverge3/keymaps/iso_UK/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h similarity index 100% rename from keyboards/diverge3/keymaps/iso_UK/config.h rename to keyboards/diverge3/keymaps/iso_uk/config.h diff --git a/keyboards/diverge3/keymaps/iso_UK/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c similarity index 100% rename from keyboards/diverge3/keymaps/iso_UK/keymap.c rename to keyboards/diverge3/keymaps/iso_uk/keymap.c diff --git a/keyboards/diverge3/keymaps/iso_UK/readme.md b/keyboards/diverge3/keymaps/iso_uk/readme.md similarity index 100% rename from keyboards/diverge3/keymaps/iso_UK/readme.md rename to keyboards/diverge3/keymaps/iso_uk/readme.md diff --git a/keyboards/diverge3/keymaps/iso_UK/rules.mk b/keyboards/diverge3/keymaps/iso_uk/rules.mk similarity index 100% rename from keyboards/diverge3/keymaps/iso_UK/rules.mk rename to keyboards/diverge3/keymaps/iso_uk/rules.mk From af3dca2bd1501626f8d3cfa5f5164675a1f554c2 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 9 Nov 2018 09:26:22 +0000 Subject: [PATCH 07/17] Update keyboards/diverge3/rules.mk Co-Authored-By: mcmadhatter --- keyboards/diverge3/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/diverge3/rules.mk b/keyboards/diverge3/rules.mk index 173fa836f10e..36e8ccb471af 100644 --- a/keyboards/diverge3/rules.mk +++ b/keyboards/diverge3/rules.mk @@ -63,7 +63,7 @@ MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend From 7ec0f7d737de5362543841176d3f83edb0ff5624 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 9 Nov 2018 09:28:06 +0000 Subject: [PATCH 08/17] Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h index 583c24b3b963..5ae1fe663c49 100755 --- a/keyboards/diverge3/keymaps/iso_uk/config.h +++ b/keyboards/diverge3/keymaps/iso_uk/config.h @@ -17,7 +17,6 @@ #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "config_common.h" // place overrides here #define MASTER_LEFT From 9f2239b61f9f3d75177129283447fdf42f61472d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 10:29:41 +0000 Subject: [PATCH 09/17] Update keyboards/diverge3/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/config.h b/keyboards/diverge3/config.h index 16086fd9605b..6a90e97168aa 100644 --- a/keyboards/diverge3/config.h +++ b/keyboards/diverge3/config.h @@ -61,7 +61,6 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From a796e1b50ddcf8abb33af2363253ec66eb0bcac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 10:29:48 +0000 Subject: [PATCH 10/17] Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c index 6316dbaa5afa..9cdaa22de9e2 100644 --- a/keyboards/diverge3/keymaps/iso_uk/keymap.c +++ b/keyboards/diverge3/keymaps/iso_uk/keymap.c @@ -15,7 +15,6 @@ */ #include QMK_KEYBOARD_H -// KEYMAP enum layers { _QWERTY, From 5d884aa6f87e6ad3a24b19b850ac55f418465150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 10:30:57 +0000 Subject: [PATCH 11/17] Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c index 9cdaa22de9e2..111fee438b87 100644 --- a/keyboards/diverge3/keymaps/iso_uk/keymap.c +++ b/keyboards/diverge3/keymaps/iso_uk/keymap.c @@ -32,7 +32,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( + [_QWERTY] = LAYOUT( \ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_CAPS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PSCR, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NUHS, From 6cc887940d15e4e1c933a287967e3dfafe6baa4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 10:31:07 +0000 Subject: [PATCH 12/17] Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c index 111fee438b87..3846ba2c208d 100644 --- a/keyboards/diverge3/keymaps/iso_uk/keymap.c +++ b/keyboards/diverge3/keymaps/iso_uk/keymap.c @@ -29,7 +29,6 @@ enum custom_keycodes { #define LOWER MO(_LOWER) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( \ From 1cb53436a984b0aab45929f2b17e855a30ab503f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Fri, 9 Nov 2018 10:31:18 +0000 Subject: [PATCH 13/17] Update keyboards/diverge3/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/config.h b/keyboards/diverge3/config.h index 6a90e97168aa..262be7b7573f 100644 --- a/keyboards/diverge3/config.h +++ b/keyboards/diverge3/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . #define MATRIX_ROWS 10 #define MATRIX_COLS 8 - /* * Keyboard Matrix Assignments * From 9ac95c2fc27557d76b45261ff2142ac67420da66 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:31:42 +0000 Subject: [PATCH 14/17] Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h index 5ae1fe663c49..49d999040e50 100755 --- a/keyboards/diverge3/keymaps/iso_uk/config.h +++ b/keyboards/diverge3/keymaps/iso_uk/config.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#ifndef CONFIG_USER_H +#pragma once #define CONFIG_USER_H From 2bb6f5373e537e0451a65c6caf5615fe541f7c71 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:31:58 +0000 Subject: [PATCH 15/17] Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h index 49d999040e50..0be60b074b8a 100755 --- a/keyboards/diverge3/keymaps/iso_uk/config.h +++ b/keyboards/diverge3/keymaps/iso_uk/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define CONFIG_USER_H // place overrides here From 0b5097d00b6ee22d746c32c5a727af4fbbdd6cc5 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:32:04 +0000 Subject: [PATCH 16/17] Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter --- keyboards/diverge3/keymaps/iso_uk/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h index 0be60b074b8a..83f65979c7ea 100755 --- a/keyboards/diverge3/keymaps/iso_uk/config.h +++ b/keyboards/diverge3/keymaps/iso_uk/config.h @@ -22,4 +22,3 @@ #define PERMISSIVE_HOLD #define TAPPING_TERM 150 -#endif From 20a3035fb347a90b9fd7b5bc2adb0bcc46fa7c5a Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Fri, 9 Nov 2018 10:37:59 +0000 Subject: [PATCH 17/17] aligned and tidyied up aligned and tidyied up --- keyboards/diverge3/keymaps/iso_uk/keymap.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c index 3846ba2c208d..804334785084 100644 --- a/keyboards/diverge3/keymaps/iso_uk/keymap.c +++ b/keyboards/diverge3/keymaps/iso_uk/keymap.c @@ -21,29 +21,24 @@ enum layers { _LOWER, }; -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, -}; - #define LOWER MO(_LOWER) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( \ - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_CAPS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCBR, KC_RCBR, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PSCR, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_INS, KC_PGDN, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_ENT, - KC_LCTL, KC_LGUI, KC_LALT, KC_HOME, KC_END, KC_SPC, KC_SPC, LOWER, KC_QUOT, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_SLASH + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PSCR, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_INS, KC_PGDN, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_ENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_HOME, KC_END, KC_SPC, KC_SPC, LOWER, KC_QUOT, KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_SLASH ), [_LOWER] = LAYOUT( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - BL_TOGG, KC_ASTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_INC, KC_ASUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_DEC, KC_ASDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + BL_TOGG, KC_ASTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_INC, KC_ASUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_DEC, KC_ASDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ASRP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ )