summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcmadhatter <mcmadhatter@hotmail.com>2018-11-09 19:16:08 +0000
committerDrashna Jaelre <drashna@live.com>2018-11-09 11:16:08 -0800
commit519ce723fb5e8e7272ee08f611d2c15e40bb2969 (patch)
treefa6cfddfc13b3cd1f1e8a6a2c05a2ccb4770f128
parent6ae409dd55133e25e103aa974080ce127790357f (diff)
Added support for backlight on diverge3 , and added a UK iso layout (#4392)
* 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 * Update keyboards/diverge3/keymaps/isoUK/keymap.c Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/isoUK/keymap.c Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Simplified the lower layer Simplified the lower layer * dir rename to snake case dir rename to snake case * changed dir case changed dir case * Update keyboards/diverge3/rules.mk Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/keymap.c Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * Update keyboards/diverge3/keymaps/iso_uk/config.h Co-Authored-By: mcmadhatter <mcmadhatter@hotmail.com> * aligned and tidyied up aligned and tidyied up
-rw-r--r--keyboards/diverge3/config.h14
-rwxr-xr-xkeyboards/diverge3/keymaps/iso_uk/config.h24
-rw-r--r--keyboards/diverge3/keymaps/iso_uk/keymap.c45
-rwxr-xr-xkeyboards/diverge3/keymaps/iso_uk/readme.md1
-rwxr-xr-xkeyboards/diverge3/keymaps/iso_uk/rules.mk1
-rw-r--r--keyboards/diverge3/rules.mk10
6 files changed, 79 insertions, 16 deletions
diff --git a/keyboards/diverge3/config.h b/keyboards/diverge3/config.h
index f3ed06739a..262be7b757 100644
--- a/keyboards/diverge3/config.h
+++ b/keyboards/diverge3/config.h
@@ -31,10 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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
@@ -73,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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/iso_uk/config.h b/keyboards/diverge3/keymaps/iso_uk/config.h
new file mode 100755
index 0000000000..83f65979c7
--- /dev/null
+++ b/keyboards/diverge3/keymaps/iso_uk/config.h
@@ -0,0 +1,24 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+
+// place overrides here
+#define MASTER_LEFT
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM 150
+
diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/diverge3/keymaps/iso_uk/keymap.c
new file mode 100644
index 0000000000..8043347850
--- /dev/null
+++ b/keyboards/diverge3/keymaps/iso_uk/keymap.c
@@ -0,0 +1,45 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+enum layers {
+ _QWERTY,
+ _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_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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+
+};
diff --git a/keyboards/diverge3/keymaps/iso_uk/readme.md b/keyboards/diverge3/keymaps/iso_uk/readme.md
new file mode 100755
index 0000000000..ff4971754a
--- /dev/null
+++ b/keyboards/diverge3/keymaps/iso_uk/readme.md
@@ -0,0 +1 @@
+# My UK based diverge 3 layout
diff --git a/keyboards/diverge3/keymaps/iso_uk/rules.mk b/keyboards/diverge3/keymaps/iso_uk/rules.mk
new file mode 100755
index 0000000000..c9383ab8db
--- /dev/null
+++ b/keyboards/diverge3/keymaps/iso_uk/rules.mk
@@ -0,0 +1 @@
+AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/diverge3/rules.mk b/keyboards/diverge3/rules.mk
index 38f3ee4e6a..36e8ccb471 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.
+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