[Keymap] Update nshanpetrosyan keymap (#6683 )

* Update keymap.c Additional functionality added to layers. * Error fix Fixed missing key in layer 5, fixed brightness keys with universal codes, made code more readable. * fix missing commas fixed missing commas on line 19 and line 23 * fix Indicator LED sticking on RGB off toggle. fixes issue: LED indicators stay on when toggling RGB off
Add 328P to mcu_selection.mk (#6682 )
2026-07-08 09:54:28 -04:00 · 2019-09-07 08:25:25 -07:00 · 2019-09-07 08:24:19 -07:00 · 2019-09-07 08:18:05 -07:00 · 2019-09-07 08:12:46 -07:00 · 2019-09-07 08:06:30 -07:00
61 changed files with 999 additions and 1346 deletions
@@ -94,4 +94,10 @@ else:
        exit(1)

 if __name__ == '__main__':
-    milc.cli()
+    return_code = milc.cli()
+    if return_code is False:
+        exit(1)
+    elif return_code is not True and isinstance(return_code, int) and return_code < 256:
+        exit(return_code)
+    else:
+        exit(0)
@@ -91,8 +91,10 @@ This is a C header file that is one of the first things included, and will persi
  * tries to keep switch state consistent with keyboard LED state
 * `#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)`
  * key combination that allows the use of magic commands (useful for debugging)
-* `#define USB_MAX_POWER_CONSUMPTION`
+* `#define USB_MAX_POWER_CONSUMPTION 500`
  * sets the maximum power (in mA) over USB for the device (default: 500)
+* `#define USB_POLLING_INTERVAL_MS 10`
+  * sets the USB polling rate in milliseconds for the keyboard, mouse, and shared (NKRO/media keys) interfaces
 * `#define F_SCL 100000L`
  * sets the I2C clock rate speed for keyboards using I2C. The default is `400000L`, except for keyboards using `split_common`, where the default is `100000L`.

@@ -8,42 +8,42 @@
 #define _LAYER6 6
 #define _LAYER7 7
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_LAYER0] = LAYOUT( /* Base */
-		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC, \
-		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLASH, \
-		CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,         KC_QUOT,           KC_ENT, \
-		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL), \
-		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RALT,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
+	[_LAYER0] = LAYOUT( /* MAC */
+		KC_GESC,  KC_1, 	KC_2, 	  KC_3,  KC_4,  KC_5,  KC_6,	KC_7,  KC_8,	KC_9,	  KC_0,			   KC_MINS,  KC_EQL,  KC_BSPC,
+		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,			   KC_LBRC,  KC_RBRC, KC_BSLS,
+		CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,         KC_QUOT,           KC_ENT,
+		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
+		KC_LCTL,  KC_LALT,  KC_LGUI,                KC_SPC,                KC_RGUI,  MO(1)  , KC_LEFT,         KC_DOWN,           KC_RGHT),
 	[_LAYER1] = LAYOUT( /* FN */
-		TO(3),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL , \
-		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET  , \
-		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDOWN, KC_VOLU,            KC_MUTE, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                      TO(4),                        KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_VOLD,            KC_MNXT),
+		TO(3),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  LGUI(LSFT(KC_5)),   KC_SLCK,  KC_PAUS,  _______,  _______,   RESET,
+		_______,  KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_EJCT,  _______,  KC_ASTR,  KC_PSLS,  KC_HOME,  KC_PGUP,  _______,  _______,  _______,  _______,
+		_______,  _______,  _______,  _______,  _______,  KC_PPLS,  KC_PMNS,  KC_END,   KC_PGDN,  MO(5),              KC_MPLY,            _______,
+		_______,  _______,  _______,                      TO(4),                        _______,  _______, KC_MPRV,   KC_MSTP,            KC_MFFD),
 	[_LAYER2] = LAYOUT( /* LIGHT */
-		KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL , \
-		KC_TRNS,  RGB_TOG,  KC_TRNS,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET  , \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPI,  RGB_SPD,  KC_TRNS,  KC_TRNS,            KC_TRNS, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
+    RGB_TOG,    RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_M_X,  RGB_M_G,  _______,    _______,    _______,    _______,    _______,
+		_______,    RGB_HUD,  RGB_HUI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
+		_______,    RGB_SAD,  RGB_SAI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,
+		_______,    RGB_VAD,  RGB_VAI,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    RGB_MOD,                _______,
+		_______,    _______,  _______,                          _______,                            _______,    _______,    RGB_SPD,    RGB_RMOD,               RGB_SPI),
 	[_LAYER3] = LAYOUT( /* NUMPAD */
-		KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  KC_TRNS, \
-		KC_TRNS,  KC_P7,    KC_P8,    KC_P9,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_P7,    KC_P8,    KC_P9,    KC_TRNS,  KC_TRNS,  TO(0), \
-		KC_TRNS,  KC_P4,    KC_P5,    KC_P6,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_P4,    KC_P5,    KC_P6,    KC_TRNS,            KC_PENT, \
-		KC_TRNS,  KC_P1,    KC_P2,    KC_P3,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_P1,    KC_P2,    KC_P3,    KC_TRNS,            KC_TRNS, \
-		KC_TRNS,  KC_P0,    KC_PDOT,                      KC_PENT,                      KC_P0,    KC_PDOT,  KC_TRNS,  KC_TRNS,            KC_TRNS),
-	[_LAYER4] = LAYOUT( /* MAC */
-		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC, \
-		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLASH, \
-		CTL_T(KC_CAPS),  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,         KC_QUOT,           KC_ENT, \
-		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL), \
+		KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,      _______,    _______,    _______,    _______,    KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PPLS,  _______,
+		_______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    _______,    _______,    KC_P7,    KC_P8,    KC_P9,    _______,    _______,    TO(0),
+		_______,    KC_P4,    KC_P5,    KC_P6,    _______,    _______,    _______,    _______,    KC_P4,    KC_P5,    KC_P6,    _______,              KC_PENT,
+		_______,    KC_P1,    KC_P2,    KC_P3,    _______,    _______,    _______,    _______,    KC_P1,    KC_P2,    KC_P3,    _______,              _______,
+		_______,    KC_P0,    KC_PDOT,                        KC_ENT,                             KC_P0,    KC_PDOT,  _______,  _______,              _______),
+	[_LAYER4] = LAYOUT( /* WIN */
+		KC_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,            KC_MINS,  KC_EQL,  KC_BSPC,
+		KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,            KC_LBRC,  KC_RBRC, KC_BSLASH,
+		CTL_T(KC_CAPS),     KC_A,     KC_S,  KC_D,  KC_F,  KC_G,    KC_H,  KC_J,    KC_K,     KC_L,  KC_SCLN,  KC_QUOT,           KC_ENT,
+		KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   RSFT_T(KC_SLSH), KC_UP,             LT(2, KC_DEL),
 		KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,  MO(5)  , KC_LEFT,         KC_DOWN,           KC_RIGHT),
 	[_LAYER5] = LAYOUT( /* FN */
-		TO(3),    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL , \
-		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET  , \
-		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDOWN, KC_VOLU,            KC_MUTE, \
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                      TO(0),                        KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_VOLD,            KC_MNXT),
+		_______,  KC_BRID,  KC_BRIU, LCTL(KC_UP), LSFT(KC_F12),     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,
+		_______,  _______,  KC_UP,    _______,  _______,  _______,  KC_CALC,  _______,  KC_INS,   _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
+		_______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,            _______,
+		_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDOWN, KC_VOLU,           KC_MUTE,
+		_______,  _______,  _______,                      TO(0),                        _______,  _______,  KC_MPRV,  KC_VOLD,            KC_MNXT),
 }
 ;

@@ -61,7 +61,7 @@ void rgb_matrix_indicators_user(void)
 {
 	uint8_t this_led = host_keyboard_leds();

-	if (!g_suspend_state) {
+	if (!g_suspend_state && rgb_matrix_config.enable) {
 		switch (biton32(layer_state)) {
 		case _LAYER1:
 			rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
@@ -1,14 +1,11 @@
-#ifndef CONFIG_H_
-#define CONFIG_H_
-
-#include "../../config.h"
+#pragma once

 #undef TAPPING_TERM
 #define TAPPING_TERM 150

 // Combos not working yet
-// #define COMBO_TERM 20
-// #define COMBO_COUNT 1
+#define COMBO_TERM 20
+#define COMBO_COUNT 1
 // #define COMBO_ALLOW_ACTION_KEYS

 #define IGNORE_MOD_TAP_INTERRUPT
@@ -16,5 +13,3 @@

 #undef MOUSEKEY_DELAY
 #define MOUSEKEY_DELAY 100
-
-#endif
@@ -1,93 +1,55 @@
 #include QMK_KEYBOARD_H
-// #include "debug.h"
-#include "action_layer.h"
+#include "narze.h"
 #include "version.h"
-#include "eeconfig.h"
-#include "eeprom.h"
 #include "keymap_colemak.h"

 extern keymap_config_t keymap_config;

 enum ergodox_layers {
-  _QWERTY,
-  _COLEMAK,
-  _QWOC,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-// Intermediate layers for SuperDuper (Combo keys does not work on Infinity yet)
-  _SUPER,
-  _DUPER,
-  _SUPERDUPER,
-  _MOUSE,
-  _ADJUST,
-  _MDIA,
-  _SYMB,
+    _QWERTY,
+    _COLEMAK,
+    _QWOC,
+    _LOWER,
+    _RAISE,
+    _PLOVER,
+    // Intermediate layers for SuperDuper (Combo keys does not work on Infinity yet)
+    _SUPERDUPER,
+    _MOUSE,
+    _ADJUST,
+    _MDIA,
+    _SYMB,
 };

 enum ergodox_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  QWOC,
-  PLOVER,
-  SUPER,
-  DUPER,
-  SUPERDUPER,
-  MOUSE,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  SDTOGG, // Toggle SuperDuper
-  EPRM,
-  VRSN,
-  RGB_SLD
+    QWERTY = SAFE_RANGE,
+    COLEMAK,
+    QWOC,
+    LOWER,
+    RAISE,
+    PLOVER,
+    SUPERDUPER,
+    MOUSE,
+    BACKLIT,
+    EXT_PLV,
+    SDTOGG, // Toggle SuperDuper
+    EPRM,
+    VRSN,
+    RGB_SLD,
+    GUI_UNDS,
+    LSFT_LPRN,
+    RSFT_RPRN,
 };

-enum functions {
-  M_GUI_UNDS, // Simulate GUI_T(KC_UNDS)
-  M_SFT_PO, // SFT_T(KC_LPRN)
-  M_SFT_PC, // SFT_T(KC_RPRN)
-};
-
-// Timer for custom mod tap
-static uint16_t m_gui_unds_timer;
-static uint16_t m_sft_po_timer;
-static uint16_t m_sft_pc_timer;
-
 // Narze : Custom Macros
 #define HPR_ESC ALL_T(KC_ESC)
 #define SFT_ENT SFT_T(KC_ENT)
-#define SFT_PO F(M_SFT_PO)
-#define SFT_PC F(M_SFT_PC)
+#define SFT_PO LSFT_LPRN
+#define SFT_PC RSFT_RPRN
 #define GUI_MINS GUI_T(KC_MINS)
-#define GUI_UNDS F(M_GUI_UNDS)

-// Combo : SuperDuper layer from S+D (R+S in Colemak)
-// #define COMBO_COUNT 1
-// #define SUPERDUPER_COMBO_COUNT 3
-// #define EECONFIG_SUPERDUPER_INDEX (uint8_t *) 19
-
-// enum process_combo_event {
-//   CB_SUPERDUPER,
-// };
-
-// const uint16_t PROGMEM superduper_combos[SUPERDUPER_COMBO_COUNT][3] = {
-//   [_QWERTY] = {KC_S, KC_D, COMBO_END},
-//   [_COLEMAK] = {KC_R, KC_S, COMBO_END},
-//   [_QWOC] = {CM_S, CM_D, COMBO_END},
-// };
-
-// combo_t PROGMEM key_combos[COMBO_COUNT] = {
-//   [CB_SUPERDUPER] = COMBO_ACTION(superduper_combos[_QWERTY]),
-// };
-
-// volatile bool superduper_enabled = true;
-
-// const uint16_t empty_combo[] = {COMBO_END};
-
-// void set_superduper_key_combos(void);
-// void clear_superduper_key_combos(void);
+enum process_combo_event {
+    CB_SUPERDUPER,
+};

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Qwerty
@@ -115,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
        KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   LT(_SYMB, KC_NO),
-        HPR_ESC,        KC_A,         LT(_SUPER, KC_S),   LT(_DUPER, KC_D),   KC_F,   KC_G,
+        HPR_ESC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
        SFT_PO,         LT(_MOUSE, KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
        LT(_RAISE, KC_LBRC),KC_LCTL,   KC_LALT,  GUI_UNDS, LOWER,
                                              KC_ENT,  KC_LGUI,
@@ -156,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
        KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   LT(_SYMB, KC_NO),
-        HPR_ESC,        KC_A,         LT(_SUPER,KC_R),   LT(_DUPER,KC_S),   KC_T,   KC_D,
+        HPR_ESC,        KC_A,         KC_R,   KC_S,   KC_T,   KC_D,
        SFT_PO,         LT(_MOUSE, KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
        LT(_RAISE, KC_LBRC),KC_LCTL,   KC_LALT,  GUI_UNDS, LOWER,
                                              KC_ENT,  KC_LGUI,
@@ -177,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
        KC_TAB,         CM_Q,         CM_W,   CM_E,   CM_R,   CM_T,   LT(_SYMB, KC_NO),
-        HPR_ESC,        CM_A,         LT(_SUPER,CM_S),   LT(_DUPER,CM_D),   CM_F,   CM_G,
+        HPR_ESC,        CM_A,         CM_S,   CM_D,   CM_F,   CM_G,
        SFT_PO,         LT(_MOUSE, CM_Z),  CM_X,   CM_C,   CM_V,   CM_B,   ALL_T(KC_NO),
        LT(_RAISE, KC_LBRC),KC_LCTL,   KC_LALT,  GUI_UNDS, LOWER,
                                              KC_ENT,  KC_LGUI,
@@ -357,47 +319,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,
             _______,_______, KC_LSFT
    ),
-// Intermediate keymaps for SuperDuper (Combo keys does not work on Infinity yet)
-[_SUPER] = LAYOUT_ergodox(
-        // left hand
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  _______,   DUPER,     _______,   _______,
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  _______,   _______,   _______,
-                                                    _______,  _______,
-                                                              _______,
-                                               _______,_______,_______,
-        // right hand
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-                      _______,  _______,   _______,  _______,   _______,    _______,
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-                                _______,   _______,  _______,   _______,   _______,
-             _______,        _______,
-             _______,
-             _______,_______, _______
-    ),
-[_DUPER] = LAYOUT_ergodox(
-        // left hand
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  SUPER,     _______,   _______,   _______,
-        _______, _______,  _______,   _______,   _______,   _______,   _______,
-        _______, _______,  _______,   _______,   _______,
-                                                    _______,  _______,
-                                                              _______,
-                                               _______,_______,_______,
-        // right hand
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-                      _______,  _______,   _______,  _______,   _______,    _______,
-             _______, _______,  _______,   _______,  _______,   _______,   _______,
-                                _______,   _______,  _______,   _______,   _______,
-             _______,        _______,
-             _______,
-             _______,_______, _______
-    ),

 /* Mouse
 *
@@ -452,7 +373,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |        |      |      |      |      |      |      |           |      |SDTogg|      |      |      |      |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
+ *   |      |      |      |      |      |                                       |      |      |      |      | BACKLIT|
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        |      |      |       |      |        |
@@ -477,7 +398,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______, _______,  _______,   _______,  _______,   _______,   KC_DEL,
                      AG_SWAP,  QWERTY,    COLEMAK,  QWOC,      PLOVER,    _______,
             _______, SDTOGG,   _______,   _______,  _______,   _______,   _______,
-                                _______,   _______,  _______,   _______,   _______,
+                                _______,   _______,  _______,   _______,   BACKLIT,
             _______,        _______,
             _______,
             _______,_______, _______
@@ -569,146 +490,123 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };

-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWERTY);
+    switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);

-        // key_combos[CB_SUPERDUPER].keys = superduper_combos[_QWERTY];
-        // eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_COLEMAK);
+                set_superduper_key_combo_layer(_QWERTY);
+            }
+            return false;

-        // key_combos[CB_SUPERDUPER].keys = superduper_combos[_COLEMAK];
-        // eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _COLEMAK);
-      }
-      return false;
-      break;
-    case QWOC:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWOC);
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK);

-        // key_combos[CB_SUPERDUPER].keys = superduper_combos[_QWOC];
-        // eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _QWOC);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case SUPER:
-      if (record->event.pressed) {
-        layer_on(_SUPER);
-        update_tri_layer(_SUPER, _DUPER, _SUPERDUPER);
-      } else {
-        layer_off(_SUPER);
-        update_tri_layer(_SUPER, _DUPER, _SUPERDUPER);
-      }
-      return false;
-      break;
-    case DUPER:
-      if (record->event.pressed) {
-        layer_on(_DUPER);
-        update_tri_layer(_SUPER, _DUPER, _SUPERDUPER);
-      } else {
-        layer_off(_DUPER);
-        update_tri_layer(_SUPER, _DUPER, _SUPERDUPER);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case SDTOGG:
-      if (record->event.pressed) {
-        // superduper_enabled = !superduper_enabled;
+                set_superduper_key_combo_layer(_COLEMAK);
+            }
+            return false;

-        // if (superduper_enabled) {
-        //   set_superduper_key_combos();
-        // } else {
-        //   clear_superduper_key_combos();
-        // }
-      }
-      return false;
-      break;
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
+        case QWOC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWOC);
+
+                set_superduper_key_combo_layer(_QWOC);
+            }
+            return false;
+
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+
+        case BACKLIT:
+            if (record->event.pressed) {
+                register_code(KC_RSFT);
+                #ifdef BACKLIGHT_ENABLE
+                    backlight_step();
+                #endif
+            } else {
+                unregister_code(KC_RSFT);
+            }
+            return false;
+
+        case PLOVER:
+            if (record->event.pressed) {
+                layer_off(_RAISE);
+                layer_off(_LOWER);
+                layer_off(_ADJUST);
+                layer_on(_PLOVER);
+                if (!eeconfig_is_enabled()) {
+                    eeconfig_init();
+                }
+                keymap_config.raw = eeconfig_read_keymap();
+                keymap_config.nkro = 1;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+
+        case EXT_PLV:
+            if (record->event.pressed) {
+                layer_off(_PLOVER);
+            }
+            return false;
+
+        case SDTOGG:
+            if (record->event.pressed) {
+                toggle_superduper_mode();
+            }
+            return false;
+
+        case VRSN:
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+            }
+            return false;
+
+        case RGB_SLD:
+            if (record->event.pressed) {
+                #ifdef RGBLIGHT_ENABLE
+                    rgblight_mode(1);
+                #endif
+            }
+            return false;
+
+        // Macros
+
+        // 1. Hold for LGUI, tap for Underscore
+        case GUI_UNDS:
+            perform_space_cadet(record, KC_LGUI, KC_LSFT, KC_MINS);
+            return false;
+
+        // 2. Hold for LSHIFT, tap for Parens open
+        case LSFT_LPRN:
+            perform_space_cadet(record, KC_LSFT, KC_LSFT, KC_9);
+            return false;
+
+        // 3. Hold for RSHIFT, tap for Parens close
+        case RSFT_RPRN:
+            perform_space_cadet(record, KC_RSFT, KC_RSFT, KC_0);
+            return false;
+
+    }
+    return true;
 }

 void matrix_init_user(void) {
@@ -716,25 +614,9 @@ void matrix_init_user(void) {
 }

 void matrix_setup(void) {
-  // set_superduper_key_combos();
+    set_superduper_key_combos();
 }

-// void set_superduper_key_combos(void) {
-//   uint8_t layer = eeprom_read_byte(EECONFIG_SUPERDUPER_INDEX);
-
-//   switch (layer) {
-//     case _QWERTY:
-//     case _COLEMAK:
-//     case _QWOC:
-//       key_combos[CB_SUPERDUPER].keys = superduper_combos[layer];
-//       break;
-//   }
-// }
-
-// void clear_superduper_key_combos(void) {
-//   key_combos[CB_SUPERDUPER].keys = empty_combo;
-// }
-
 void matrix_scan_user(void) {
  // uint8_t layer = biton32(layer_state);

@@ -758,91 +640,17 @@ void matrix_scan_user(void) {

 // Combos

-// void process_combo_event(uint8_t combo_index, bool pressed) {
-//   if (pressed) {
-//     switch(combo_index) {
-//       case CB_SUPERDUPER:
-//         layer_on(_SUPERDUPER);
-//         ergodox_board_led_on();
-//         break;
-//     }
-//   } else {
-//     layer_off(_SUPERDUPER);
-//     ergodox_board_led_off();
-//     unregister_mods(MOD_BIT(KC_LGUI) | MOD_BIT(KC_LCTL) | MOD_BIT(KC_LALT)); // Sometimes mods are held, unregister them
-//   }
-// }
-
-// Macros
-
-const uint16_t PROGMEM fn_actions[] = {
-  [M_GUI_UNDS] = ACTION_MACRO_TAP(M_GUI_UNDS),
-  [M_SFT_PO] = ACTION_MACRO_TAP(M_SFT_PO),
-  [M_SFT_PC] = ACTION_MACRO_TAP(M_SFT_PC),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  bool tap_not_interrupted = record->tap.count > 0 && !record->tap.interrupted;
-
-  switch(id) {
-    // Hold for LGUI, tap for Underscore
-    case M_GUI_UNDS:
-      if (record->event.pressed) {
-        m_gui_unds_timer = timer_read();
-
-        if (!tap_not_interrupted) {
-          register_mods(MOD_BIT(KC_LGUI));
+void process_combo_event(uint8_t combo_index, bool pressed) {
+    if (pressed) {
+        switch(combo_index) {
+            case CB_SUPERDUPER:
+                layer_on(_SUPERDUPER);
+                ergodox_board_led_on();
+                break;
        }
-      } else {
-        if (tap_not_interrupted && timer_elapsed(m_gui_unds_timer) < TAPPING_TERM) {
-
-          add_weak_mods(MOD_BIT(KC_LSFT));
-          send_keyboard_report();
-          register_code(KC_MINS);
-          unregister_code(KC_MINS);
-          del_weak_mods(MOD_BIT(KC_LSFT));
-          send_keyboard_report();
-          record->tap.count = 0;  // ad hoc: cancel tap
-        } else {
-          unregister_mods(MOD_BIT(KC_LGUI));
-        }
-      }
-      break;
-    // Hold for LSHIFT, tap for Parens open
-    case M_SFT_PO:
-      if (record->event.pressed) {
-        m_sft_po_timer = timer_read();
-
-        if (!tap_not_interrupted) {
-          register_mods(MOD_BIT(KC_LSFT));
-        }
-      } else {
-        if (tap_not_interrupted && timer_elapsed(m_sft_po_timer) < TAPPING_TERM) {
-          record->tap.count = 0;
-          return MACRO(D(RSFT), T(9), U(RSFT), END);
-        } else {
-          unregister_mods(MOD_BIT(KC_LSFT));
-        }
-      }
-      break;
-    // Hold for RSHIFT, tap for Parens close
-    case M_SFT_PC:
-      if (record->event.pressed) {
-        m_sft_pc_timer = timer_read();
-
-        if (!tap_not_interrupted) {
-          register_mods(MOD_BIT(KC_RSFT));
-        }
-      } else {
-        if (tap_not_interrupted && timer_elapsed(m_sft_pc_timer) < TAPPING_TERM) {
-          record->tap.count = 0;
-          return MACRO(D(LSFT), T(0), U(LSFT), END);
-        } else {
-          unregister_mods(MOD_BIT(KC_RSFT));
-        }
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
+    } else {
+        layer_off(_SUPERDUPER);
+        ergodox_board_led_off();
+        unregister_mods(MOD_BIT(KC_LGUI) | MOD_BIT(KC_LCTL) | MOD_BIT(KC_LALT)); // Sometimes mods are held, unregister them
+    }
+}
@@ -25,21 +25,22 @@ Press `S+D` simultaneously and hold, then...
 - It can be activated by holding `/` as well, but it's slower since `LT()` uses `TAPPING_TERM` of 200ms but `S+D` uses `COMBO_TERM` of only 20ms (Can be changed within config.h)

 ## Build instructions
- `cd /path/to/qmk_firmware`
+If your environment is ready to build with `make`, don't use docker since it takes 5m+ to compile.
+Use the instructions in Ergodox Infinity's readme.

-#### Left side
- ```
-docker run -e keymap=narze -e subproject=infinity -e keyboard=ergodox --rm -v $('pwd'):/qmk:rw edasque/qmk_firmware
+#### Left side (Docker)
+```
+cd /path/to/qmk_firmware
+util/docker_build.sh ergodox_infinity:narze
 avr-objcopy -Iihex -Obinary .build/ergodox_infinity_narze.hex .build/ergodox_infinity_narze_left.bin
 dfu-util --device 1c11:b007 -D .build/ergodox_infinity_narze_left.bin
 ```

-#### Right side
+#### Right side (Docker)
+You have to override `usb_args` in order to pass `MASTER=right` to docker using provided build script.
 ```
-docker run -e keymap=narze -e subproject=infinity -e keyboard=ergodox -e MASTER=right --rm -v $('pwd'):/qmk:rw edasque/qmk_firmware
+cd /path/to/qmk_firmware
+usb_args="-e MASTER=right" util/docker_build.sh ergodox_infinity:narze
 avr-objcopy -Iihex -Obinary .build/ergodox_infinity_narze.hex .build/ergodox_infinity_narze_right.bin
 dfu-util --device 1c11:b007 -D .build/ergodox_infinity_narze_right.bin
 ```
-
-## TODO
- [ ] Make SuperDuper mode fully-compatible in Windows by swapping GUI with Ctrl
@@ -15,10 +15,9 @@ 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 SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-# Combos not working yet
-COMBO_ENABLE = no
+COMBO_ENABLE = yes
@@ -3,42 +3,6 @@ SRC = matrix.c \

 # MCU name
 MCU = atmega328p
-PROTOCOL = VUSB
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT

 # Bootloader selection
 #   Teensy       halfkay
@@ -51,14 +15,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # This uses usbaspbootloader
 BOOTLOADER = USBasp

-# If you don't know the bootloader type, then you can specify the
-# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
-#   Teensy halfKay      512
-#   Teensy++ halfKay    1024
-#   Atmel DFU loader    4096
-#   LUFA bootloader     4096
-#   USBaspLoader        2048
-
 # Flash program via avrdude, but default command is not suitable.
 # You can use plaid:default:program
 PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex
@@ -87,7 +43,4 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)

-# unsupported features for now
-NO_UART = yes
-NO_SUSPEND_POWER_DOWN = yes
 CUSTOM_MATRIX           = yes
@@ -1,42 +1,5 @@
 # MCU name
 MCU = atmega328p
-PROTOCOL = VUSB
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT

 BOOTLOADER = bootloadHID

@@ -69,5 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
-NO_UART = yes
-NO_SUSPEND_POWER_DOWN = yes
@@ -0,0 +1,23 @@
+/* Copyright 2019
+ *
+ * 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"
+
+#define MATRIX_COL_PINS { A3 }
+#define MATRIX_ROW_PINS { A2 }
+#define UNUSED_PINS
@@ -0,0 +1,3 @@
+# PyTest onekey
+
+This is used by the python test framework. It's probably not useful otherwise.
@@ -0,0 +1,2 @@
+# MCU name
+MCU = STM32F303
@@ -0,0 +1 @@
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};
@@ -6,8 +6,10 @@
    #include "rev1_led.h"
 #elif KEYBOARD_keebio_iris_rev2
    #include "rev2.h"
-#else
+#elif KEYBOARD_keebio_iris_rev3
    #include "rev3.h"
+#elif KEYBOARD_keebio_iris_rev4
+    #include "rev4.h"
 #endif

 #include "quantum.h"
@@ -112,3 +112,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+}
@@ -0,0 +1,95 @@
+/*
+Copyright 2019 Danny Nguyen <danny@keeb.io>
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCB10
+#define PRODUCT_ID      0x1256
+#define DEVICE_VER      0x0400
+#define MANUFACTURER    Keebio
+#define PRODUCT         Iris Keyboard
+#define DESCRIPTION     Split 50 percent ergonomic keyboard
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
+#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
+#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
+#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
+#define SPLIT_HAND_PIN D5
+#define QMK_ESC_OUTPUT F1
+#define QMK_ESC_INPUT B1
+#define QMK_LED B0
+#define QMK_SPEAKER C6
+
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+#define ENCODERS_PAD_A_RIGHT { F7 }
+#define ENCODERS_PAD_B_RIGHT { F6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+// #define BACKLIGHT_LEVELS 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* 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
+
+#define BACKLIGHT_PIN B5
+#define BACKLIGHT_LEVELS 5
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D6
+#define RGBLED_NUM 12    // Number of LEDs
+#define RGBLED_SPLIT { 6, 6 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+// EEPROM usage
+
+// TODO: refactor with new user EEPROM code (coming soon)
+#define EEPROM_MAGIC 0x451F
+#define EEPROM_MAGIC_ADDR 34
+// Bump this every time we change what we store
+// This will automatically reset the EEPROM with defaults
+// and avoid loading invalid data from the EEPROM
+#define EEPROM_VERSION 0x08
+#define EEPROM_VERSION_ADDR 36
+
+// Dynamic keymap starts after EEPROM version
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 37
+// Dynamic macro starts after dynamic keymaps (37+(4*10*6*2)) = (37+480)
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 517
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 507    // 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16
@@ -0,0 +1 @@
+#include "rev4.h"
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "iris.h"
+#include "quantum.h"
+
+
+#ifdef USE_I2C
+#include <stddef.h>
+#ifdef __AVR__
+    #include <avr/io.h>
+    #include <avr/interrupt.h>
+#endif
+#endif
+
+#define LAYOUT( \
+    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
+    LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \
+    LC1, LC2, LC3, LC4, LC5, LC6,           RC6, RC5, RC4, RC3, RC2, RC1, \
+    LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \
+                        LE3, LE4, LE5, RE5, RE4, RE3 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6 }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6 }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6 }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6 }, \
+        { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6 }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6 }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6 }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6 }, \
+        { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \
+    }
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = yes
+ENCODER_ENABLE = yes
@@ -9,6 +9,8 @@ F_USB = $(F_CPU)
 #     automatically (+60). See bootloader.mk for all options.
 ifneq (, $(findstring rev3, $(KEYBOARD)))
    BOOTLOADER = qmk-dfu
+else ifneq (, $(findstring rev4, $(KEYBOARD)))
+    BOOTLOADER = qmk-dfu
 else
    BOOTLOADER = caterina
 endif
@@ -24,8 +26,8 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = no         # 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 = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
@@ -1,43 +1,5 @@
 # MCU name
 MCU = atmega328p
-PROTOCOL = VUSB
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-

 # Bootloader selection
 #   Teensy       halfkay
@@ -91,10 +53,5 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)

-# unsupported features for now
-NO_UART = yes
-NO_SUSPEND_POWER_DOWN = yes
-
-
 LAYOUTS = ortho_4x12 planck_mit
 LAYOUTS_HAS_RGB = no
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * ,-----------------------------------------------------------------------------------
 * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -1,7 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once

 /*
 * MIDI options
@@ -26,7 +23,8 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2

-#define TAPPING_TERM 200
+#undef TAPPING_TERM
+#define TAPPING_TERM 100

 #define COMBO_TERM 20
 #define COMBO_COUNT 1
@@ -38,4 +36,11 @@

 #define MOUSEKEY_DELAY 100

+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
 #endif
@@ -1,89 +1,49 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
-
-#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
-#include "planck.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
+#include "narze.h"
 #ifdef AUDIO_ENABLE
-  #include "audio.h"
+    #include "audio.h"
 #endif
-#include "eeconfig.h"
 #include "keymap_colemak.h"

 extern keymap_config_t keymap_config;

-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
 enum planck_layers {
-  _QWERTY,
-  _COLEMAK,
-  _QWOC,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _SUPERDUPER,
-  _MOUSE,
-  _ADJUST
+    _QWERTY,
+    _COLEMAK,
+    _QWOC,
+    _LOWER,
+    _RAISE,
+    _PLOVER,
+    _SUPERDUPER,
+    _MOUSE,
+    _ADJUST
 };

 enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  QWOC,
-  PLOVER,
-  SUPERDUPER,
-  MOUSE,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV,
-  SDTOGG, // Toggle SuperDuper
+    QWERTY = SAFE_RANGE,
+    COLEMAK,
+    QWOC,
+    PLOVER,
+    SUPERDUPER,
+    MOUSE,
+    LOWER,
+    RAISE,
+    BACKLIT,
+    EXT_PLV,
+    SDTOGG, // Toggle SuperDuper
+    GUI_UNDS,
+    LSFT_LPRN,
 };

-enum functions {
-  M_GUI_UNDS, // Simulate GUI_T(KC_UNDS)
-  M_SFT_PO, // SFT_T(KC_LPRN)
-};
-
-// Timer for custom mod tap
-static uint16_t m_gui_unds_timer;
-static uint16_t m_sft_po_timer;
-
 // Narze : Custom Macros
 #define HPR_ESC ALL_T(KC_ESC)
 #define SFT_ENT SFT_T(KC_ENT)
-#define SFT_PO F(M_SFT_PO)
 #define GUI_MINS GUI_T(KC_MINS)
-#define GUI_UNDS F(M_GUI_UNDS)
-
-// Combo : SuperDuper layer from S+D (R+S in Colemak)
-#define SUPERDUPER_COMBO_COUNT 3
-#define EECONFIG_SUPERDUPER_INDEX (uint8_t *) 19

 enum process_combo_event {
-  CB_SUPERDUPER,
+    CB_SUPERDUPER,
 };

-const uint16_t PROGMEM superduper_combos[SUPERDUPER_COMBO_COUNT][3] = {
-  [_QWERTY] = {KC_S, KC_D, COMBO_END},
-  [_COLEMAK] = {KC_R, KC_S, COMBO_END},
-  [_QWOC] = {CM_S, CM_D, COMBO_END},
-};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [CB_SUPERDUPER] = COMBO_ACTION(superduper_combos[_QWERTY]),
-};
-
-volatile bool superduper_enabled = true;
-
-const uint16_t empty_combo[] = {COMBO_END};
-
-void set_superduper_key_combos(void);
-void clear_superduper_key_combos(void);
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 /* Qwerty
@@ -97,12 +57,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * | Rse/[| Ctrl | Alt  | GUI/_|Lower |    Space    |Raise | GUI/-| Alt  | Ctrl | Low/]|
 * `-----------------------------------------------------------------------------------'
 */
-[_QWERTY] = {
-  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
-  {HPR_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-  {SFT_PO, LT(_MOUSE, KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  LT(_SUPERDUPER, KC_SLSH), SFT_ENT},
-  {LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)}
-},
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    HPR_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    LSFT_LPRN, LT(_MOUSE, KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  LT(_SUPERDUPER, KC_SLSH), SFT_ENT,
+    LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)
+),

 /* Colemak
 * ,-----------------------------------------------------------------------------------.
@@ -115,20 +75,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * | Brite| Ctrl | Alt  | GUI/_|Lower |    Space    |Raise | GUI/-| Alt  | Ctrl | Low/]|
 * `-----------------------------------------------------------------------------------'
 */
-[_COLEMAK] = {
-  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,    KC_BSPC},
-  {HPR_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,       KC_QUOT},
-  {SFT_PO, LT(_MOUSE, KC_Z),  KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  LT(_SUPERDUPER, KC_SLSH), SFT_ENT},
-  {LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)}
-},
+[_COLEMAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,    KC_BSPC,
+    HPR_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,       KC_QUOT,
+    LSFT_LPRN, LT(_MOUSE, KC_Z),  KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  LT(_SUPERDUPER, KC_SLSH), SFT_ENT,
+    LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)
+),

 /* Qwerty on software Colemak : Useful for gaming with qwerty keymaps! */
-[_QWOC] = {
-  {KC_TAB,  CM_Q,    CM_W,    CM_E,    CM_R,    CM_T,    CM_Y,    CM_U,    CM_I,    CM_O,    CM_P,    KC_BSPC},
-  {HPR_ESC, CM_A,    CM_S,    CM_D,    CM_F,    CM_G,    CM_H,    CM_J,    CM_K,    CM_L,    CM_SCLN, KC_QUOT},
-  {SFT_PO, LT(_MOUSE, CM_Z),    CM_X,    CM_C,    CM_V,    CM_B,    CM_N,    CM_M,    CM_COMM, CM_DOT,  LT(_SUPERDUPER, CM_SLSH), SFT_ENT},
-  {LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)}
-},
+[_QWOC] = LAYOUT_planck_grid(
+    KC_TAB,  CM_Q,    CM_W,    CM_E,    CM_R,    CM_T,    CM_Y,    CM_U,    CM_I,    CM_O,    CM_P,    KC_BSPC,
+    HPR_ESC, CM_A,    CM_S,    CM_D,    CM_F,    CM_G,    CM_H,    CM_J,    CM_K,    CM_L,    CM_SCLN, KC_QUOT,
+    LSFT_LPRN, LT(_MOUSE, CM_Z),    CM_X,    CM_C,    CM_V,    CM_B,    CM_N,    CM_M,    CM_COMM, CM_DOT,  LT(_SUPERDUPER, CM_SLSH), SFT_ENT,
+    LT(_RAISE, KC_LBRC), KC_LCTL, KC_LALT, GUI_UNDS, LOWER,   KC_SPC,  KC_SPC,  RAISE,   GUI_MINS, KC_RALT, KC_RCTL,   LT(_LOWER, KC_RBRC)
+),

 /* Lower
 * ,-----------------------------------------------------------------------------------.
@@ -136,17 +96,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |     |Sft/Ent|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |      |      |     |Sft/Ent|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 * `-----------------------------------------------------------------------------------'
 */
-[_LOWER] = {
-  {KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
-  {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
-  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
-},
+[_LOWER] = LAYOUT_planck_grid(
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),_______,_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),

 /* Raise
 * ,-----------------------------------------------------------------------------------.
@@ -154,17 +114,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |     |Sft/Ent|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |      |      |     |Sft/Ent|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 * `-----------------------------------------------------------------------------------'
 */
-[_RAISE] = {
-  {KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
-  {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
-  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
-},
+[_RAISE] = LAYOUT_planck_grid(
+    KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),

 /* Plover layer (http://opensteno.org)
 * ,-----------------------------------------------------------------------------------.
@@ -178,12 +138,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */

-[_PLOVER] = {
-  {KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   },
-  {XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC},
-  {XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
-  {EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX}
-},
+[_PLOVER] = LAYOUT_planck_grid(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),

 /* SuperDuper : https://gist.github.com/narze/861e2167784842d38771
 * /-----------------------------------------------------------------------------------\
@@ -196,12 +156,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |      |   Shift     |      |      |      |      |      |
 * \-----------------------------------------------------------------------------------/
 */
-[_SUPERDUPER] = {
-  {_______, _______, _______, _______, _______, _______, _______, _______, S(LGUI(KC_LBRC)), S(LGUI(KC_RBRC)), _______, _______},
-  {_______, KC_LALT, _______, _______, KC_BSPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, KC_LSFT, KC_LSFT, _______, _______, _______, _______, _______}
-},
+[_SUPERDUPER] = LAYOUT_planck_grid(
+    _______, _______, _______, _______, _______, _______, _______, _______, S(LGUI(KC_LBRC)), S(LGUI(KC_RBRC)), _______, _______,
+    _______, KC_LALT, _______, _______, KC_BSPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, KC_LSFT, KC_LSFT, _______, _______, _______, _______, _______
+),

 /* Mouse
 * /-----------------------------------------------------------------------------------\
@@ -214,12 +174,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |  M2  |  LeftClick  |  M2  |      |      |      |      |
 * \-----------------------------------------------------------------------------------/
 */
-[_MOUSE] = {
-  {_______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______, _______, KC_WH_U, KC_WH_D, _______, _______},
-  {_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______},
-  {_______, _______, _______, _______, _______, KC_BTN3, KC_BTN3, _______, _______, _______, _______, _______},
-  {_______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, _______, _______, _______, _______}
-},
+[_MOUSE] = LAYOUT_planck_grid(
+    _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______, _______, KC_WH_U, KC_WH_D, _______, _______,
+    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
+    _______, _______, _______, _______, _______, KC_BTN3, KC_BTN3, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, _______, _______, _______, _______
+),

 /* Adjust (Lower + Raise)
 * ,-----------------------------------------------------------------------------------.
@@ -232,290 +192,161 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
-[_ADJUST] = {
-  {_______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
-  {_______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, QWOC,    PLOVER,  _______},
-  {_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  SDTOGG,  _______, _______, _______, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-}
+[_ADJUST] = LAYOUT_planck_grid(
+    _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, QWOC,    PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  SDTOGG,  _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BACKLIT
+)

 };

 #ifdef AUDIO_ENABLE
-  float tone_startup[][2]    = SONG(STARTUP_SOUND);
-  float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-  float tone_qwoc[][2]       = SONG(DVORAK_SOUND);
-  float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-  float tone_plover[][2]     = SONG(PLOVER_SOUND);
-  float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-  float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-  float tone_coin[][2]       = SONG(COIN_SOUND);
-  float tone_sonic_ring[][2] = SONG(SONIC_RING);
-
-  float tone_goodbye[][2]    = SONG(GOODBYE_SOUND);
-  float tone_superduper[][2] = SONG(SUPER_DUPER_SOUND);
+    float tone_plover[][2]     = SONG(PLOVER_SOUND);
+    float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+    float tone_coin[][2]       = SONG(VIOLIN_SOUND);
+    float tone_goodbye[][2]    = SONG(GOODBYE_SOUND);
 #endif

-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
+    switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);

-        key_combos[CB_SUPERDUPER].keys = superduper_combos[_QWERTY];
-        eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_COLEMAK);
+                set_superduper_key_combo_layer(_QWERTY);
+            }
+            return false;

-        key_combos[CB_SUPERDUPER].keys = superduper_combos[_COLEMAK];
-        eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _COLEMAK);
-      }
-      return false;
-      break;
-    case QWOC:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwoc, false, 0);
-        #endif
-        persistant_default_layer_set(1UL<<_QWOC);
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK);

-        key_combos[CB_SUPERDUPER].keys = superduper_combos[_QWOC];
-        eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, _QWOC);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_NOTE_ARRAY(tone_plover, false, 0);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_plover_gb, false, 0);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case SDTOGG:
-      if (record->event.pressed) {
-        superduper_enabled = !superduper_enabled;
+                set_superduper_key_combo_layer(_COLEMAK);
+            }
+            return false;

-        if (superduper_enabled) {
-          set_superduper_key_combos();
+        case QWOC:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWOC);

-          #ifdef AUDIO_ENABLE
-            PLAY_NOTE_ARRAY(tone_sonic_ring, false, 0);
-          #endif
-        } else {
-          clear_superduper_key_combos();
+                set_superduper_key_combo_layer(_QWOC);
+            }
+            return false;

-          #ifdef AUDIO_ENABLE
-            PLAY_NOTE_ARRAY(tone_coin, false, 0);
-          #endif
-        }
-      }
-      return false;
-      break;
-  }
-  return true;
+        case LOWER:
+            if (record->event.pressed) {
+                layer_on(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_LOWER);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+
+        case RAISE:
+            if (record->event.pressed) {
+                layer_on(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            } else {
+                layer_off(_RAISE);
+                update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            }
+            return false;
+
+        case BACKLIT:
+            if (record->event.pressed) {
+                register_code(KC_RSFT);
+                #ifdef BACKLIGHT_ENABLE
+                    backlight_step();
+                #endif
+            } else {
+                unregister_code(KC_RSFT);
+            }
+            return false;
+
+        case PLOVER:
+            if (record->event.pressed) {
+                #ifdef AUDIO_ENABLE
+                    stop_all_notes();
+                    PLAY_SONG(tone_plover);
+                #endif
+                layer_off(_RAISE);
+                layer_off(_LOWER);
+                layer_off(_ADJUST);
+                layer_on(_PLOVER);
+                if (!eeconfig_is_enabled()) {
+                        eeconfig_init();
+                }
+                keymap_config.raw = eeconfig_read_keymap();
+                keymap_config.nkro = 1;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+
+        case EXT_PLV:
+            if (record->event.pressed) {
+                #ifdef AUDIO_ENABLE
+                    PLAY_SONG(tone_plover_gb);
+                #endif
+                layer_off(_PLOVER);
+            }
+            return false;
+
+        case SDTOGG:
+            if (record->event.pressed) {
+                bool enabled = toggle_superduper_mode();
+
+                #ifdef AUDIO_ENABLE
+                    if (enabled) {
+                        PLAY_SONG(tone_coin);
+                    } else {
+                        PLAY_SONG(tone_goodbye);
+                    }
+                #endif
+            }
+            return false;
+
+        // Macros
+
+        // 1. Hold for LGUI, tap for Underscore
+        case GUI_UNDS:
+            perform_space_cadet(record, KC_LGUI, KC_LSFT, KC_MINS);
+            return false;
+
+        // 2. Hold for LSHIFT, tap for Parens open
+        case LSFT_LPRN:
+            perform_space_cadet(record, KC_LSFT, KC_LSFT, KC_9);
+            return false;
+
+        default:
+            return true;
+    }
+    return true;
 }

 void matrix_init_user(void) {
-  #ifdef AUDIO_ENABLE
-    startup_user();
-  #endif
+    #ifdef AUDIO_ENABLE
+        startup_user();
+    #endif
 }

 void matrix_setup(void) {
-  set_superduper_key_combos();
-}
-
-void set_superduper_key_combos(void) {
-  uint8_t layer = eeprom_read_byte(EECONFIG_SUPERDUPER_INDEX);
-
-  switch (layer) {
-    case _QWERTY:
-    case _COLEMAK:
-    case _QWOC:
-      key_combos[CB_SUPERDUPER].keys = superduper_combos[layer];
-      break;
-  }
-}
-
-void clear_superduper_key_combos(void) {
-  key_combos[CB_SUPERDUPER].keys = empty_combo;
+    set_superduper_key_combos();
 }

 void matrix_scan_user(void) {
 }

-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-    PLAY_NOTE_ARRAY(tone_startup, false, 0);
-}
-
-void shutdown_user()
-{
-    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_NOTE_ARRAY(music_scale, false, 0);
-}
-
-#endif
-
-// Combos
-
 void process_combo_event(uint8_t combo_index, bool pressed) {
-  if (pressed) {
-    switch(combo_index) {
-      case CB_SUPERDUPER:
-        layer_on(_SUPERDUPER);
-
-        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_superduper, false, 0);
-        #endif
-        break;
+    if (pressed) {
+        switch(combo_index) {
+            case CB_SUPERDUPER:
+                layer_on(_SUPERDUPER);
+                break;
+        }
+    } else {
+        layer_off(_SUPERDUPER);
+        unregister_mods(MOD_BIT(KC_LGUI) | MOD_BIT(KC_LCTL) | MOD_BIT(KC_LALT)); // Sometimes mods are held, unregister them
    }
-  } else {
-    layer_off(_SUPERDUPER);
-    unregister_mods(MOD_BIT(KC_LGUI) | MOD_BIT(KC_LCTL) | MOD_BIT(KC_LALT)); // Sometimes mods are held, unregister them
-  }
 }
-
-// Macros
-
-const uint16_t PROGMEM fn_actions[] = {
-  [M_GUI_UNDS] = ACTION_MACRO_TAP(M_GUI_UNDS),
-  [M_SFT_PO] = ACTION_MACRO_TAP(M_SFT_PO),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  bool tap_not_interrupted = record->tap.count > 0 && !record->tap.interrupted;
-
-  switch(id) {
-    // Hold for LGUI, tap for Underscore
-    case M_GUI_UNDS:
-      if (record->event.pressed) {
-        m_gui_unds_timer = timer_read();
-
-        if (!tap_not_interrupted) {
-          register_mods(MOD_BIT(KC_LGUI));
-        }
-      } else {
-        if (tap_not_interrupted && timer_elapsed(m_gui_unds_timer) < TAPPING_TERM) {
-          #ifdef AUDIO_ENABLE
-            PLAY_NOTE_ARRAY(tone_superduper, false, 0);
-          #endif
-
-          add_weak_mods(MOD_BIT(KC_LSFT));
-          send_keyboard_report();
-          register_code(KC_MINS);
-          unregister_code(KC_MINS);
-          del_weak_mods(MOD_BIT(KC_LSFT));
-          send_keyboard_report();
-          record->tap.count = 0;  // ad hoc: cancel tap
-        } else {
-          unregister_mods(MOD_BIT(KC_LGUI));
-        }
-      }
-      break;
-    // Hold for LSHIFT, tap for Parens open
-    case M_SFT_PO:
-      if (record->event.pressed) {
-        m_sft_po_timer = timer_read();
-
-        if (!tap_not_interrupted) {
-          register_mods(MOD_BIT(KC_LSFT));
-        }
-      } else {
-        if (tap_not_interrupted && timer_elapsed(m_sft_po_timer) < TAPPING_TERM) {
-          #ifdef AUDIO_ENABLE
-            PLAY_NOTE_ARRAY(tone_superduper, false, 0);
-          #endif
-
-          record->tap.count = 0;
-          return MACRO(D(RSFT), T(9), U(RSFT), END);
-        } else {
-          unregister_mods(MOD_BIT(KC_LSFT));
-        }
-      }
-      break;
-  }
-  return MACRO_NONE;
-};
@@ -22,10 +22,11 @@ Press `S+D` simultaneously and hold, then...

 ## Build instructions
 - `cd /path/to/qmk_firmware`
- `docker run -e keymap=narze -e subproject=rev4 -e keyboard=planck --rm -v $('pwd'):/qmk:rw edasque/qmk_firmware`
- `dfu-programmer atmega32u4 erase && dfu-programmer atmega32u4 flash .build/planck_rev4_narze.hex`
-
-## TODO
- [] Make SuperDuper mode fully-compatible in Windows by swapping GUI with Ctrl
-
-
+- Ensure latest libraries are loaded `make git-submodule`
+- Build with docker
+  - Planck Rev. 4 : `util/docker_build.sh planck/rev4:narze`
+  - Planck Light : `util/docker_build.sh planck/light:narze`
+- Flash hex file
+  - Using dfu-programmer `dfu-programmer atmega32u4 erase --force && dfu-programmer atmega32u4 flash .build/planck_rev4_narze.hex`
+    - For Planck Light change the target microcontroller `dfu-programmer at90usb1286 erase --force && dfu-programmer at90usb1286 flash .build/planck_light_narze.hex`
+  - Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases)
@@ -1,23 +1,25 @@


-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 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 = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 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.
+AUDIO_ENABLE = 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

 COMBO_ENABLE = yes
+
+ifeq ($(strip $(KEYBOARD)), planck/rev4)
+    MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+    MIDI_ENABLE = no
+else
+    MOUSEKEY_ENABLE = yes
+    MIDI_ENABLE = yes
+endif
@@ -1,30 +1,12 @@
 #include "ca66.h"
-#include "config.h"

-void bootmagic_lite(void)
-{
-	// The lite version of TMK's bootmagic.
-	// 100% less potential for accidentally making the
-	// keyboard do stupid things.
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    writePinHigh(D1);
+  } else {
+    writePinLow(D1);
+  }

-	// We need multiple scans because debouncing can't be turned off.
-	matrix_scan();
-	wait_ms(DEBOUNCE);
-	matrix_scan();
-
-	// If the Esc (matrix 0,0) is held down on power up,
-	// reset the EEPROM valid state and jump to bootloader.
-	if ( matrix_get_row(0) & (1<<0) )
-	{
-		// Set the TMK/QMK EEPROM state as invalid.
-		eeconfig_disable();
-		// Jump to bootloader.
-		bootloader_jump();
-	}
-}
-
-void matrix_init_kb(void)
-{
-	bootmagic_lite();
-	matrix_init_user();
+	led_set_user(usb_led);
 }
@@ -1,5 +1,4 @@
-#ifndef CA66_H
-#define CA66_H
+#pragma once

 #include "quantum.h"

@@ -16,5 +15,3 @@
  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
  { KC_NO, K401,  K402,  K403,  K404,  KC_NO, K406,  KC_NO, K408,  K409,  K410,  K411,  K412,  K413,  K414 }  \
 }
-
-#endif
@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once

 #include "config_common.h"

@@ -15,7 +14,7 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

-/* key matrix pins */
+/* key matrix pins         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 }
 #define UNUSED_PINS
@@ -45,5 +44,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
-#endif
@@ -16,21 +16,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_HUI,                  KC_END,  
    KC_LCTL,          KC_LGUI, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI),
 };
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRD |= (1 << 1); PORTD &= ~(1 << 1);
-	} else {
-		DDRD &= ~(1 << 1); PORTD &= ~(1 << 1);
-	}
-}
@@ -1,15 +1,16 @@
-CA66
-==
+# CA66

 Custom 65%

+This QMK firmware handles both PCBs from Round 1 and from Round 2. 
+
 Keyboard Maintainer: QMK Community   
-Hardware Supported: CA66   
-Hardware Availability: [Play Keyboard](http://play-keyboard.store/)
+Hardware Supported: CA66 R1/R2  
+Hardware Availability: [Play Keyboard](http://play-keyboard.store/)  


 Make example for this keyboard (after setting up your build environment):

    make playkbtw/ca66:default

-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -1,56 +1,18 @@
 # MCU name
 MCU = atmega32u4

-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Boot Section Size in *bytes*
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
+BOOTLOADER = atmel-dfu

 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no
-MOUSEKEY_ENABLE ?= yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
-CONSOLE_ENABLE ?= no	# Console for debug(+400)
-COMMAND_ENABLE ?= no    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE ?= no
-RGBLIGHT_ENABLE ?= yes
+BOOTMAGIC_ENABLE = lite
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = no	# Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = yes
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define USE_I2C

 /* Common USB Device descriptor parameters */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x1209
 #define PRODUCT_ID      0xBEE5
 #define MANUFACTURER    Duckle29
 #define PRODUCT         Vitamins included
@@ -1,20 +1,16 @@
 #include QMK_KEYBOARD_H
-#include "unicode.c"

 enum layers {
  _QWERTY,
-  _FN,
  _LOWER,
  _RAISE,
-  _UNICODE
+  _GAME
 };

-#define FN      MO(_FN)
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
-#define UNICODE MO(_UNICODE)
 #define TGLOWER TG(_LOWER)
-#define TGRAISE TG(_RAISE)
+#define TGGAME  TG(_GAME)

 static bool is_ctl_pressed;
 static bool is_esc_pressed;
@@ -26,33 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
     KC_ESC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , 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_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN, KC_ENT,
+     KC_TAB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM, KC_DOT, KC_UP ,KC_SLSH,
+    KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH, KC_ENT,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    KC_LCTL,KC_LGUI,KC_LALT,   FN  , LOWER , KC_SPC, KC_SPC, RAISE ,UNICODE,KC_LEFT,KC_DOWN,KC_RGHT
+    KC_LCTL,KC_LGUI,KC_LALT,KC_RALT, LOWER , KC_SPC, KC_SPC, RAISE ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ), 

-[_FN] = LAYOUT_ortho_4x12 (
-// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, KC_F9 , KC_F10, KC_F11, KC_F12,_______,_______,_______,_______,_______,KC_PGUP,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,TGLOWER,_______,_______,TGRAISE,_______,KC_HOME,KC_PGDN, KC_END
-// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
-),
-
 [_LOWER] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
+     KC_GRV,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_HOME,KC_PGUP,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,_______, TGGAME,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_MPRV,KC_MPLY,KC_MNXT, KC_END,KC_PGDN,KC_MINS, KC_EQL,_______,_______,_______,_______,
+    _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
@@ -60,25 +44,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 [_RAISE] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-     KC_GRV,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 , KC_DEL,
+    KC_TILD,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+    KC_CAPS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,KC_MINS, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,KC_MINS, KC_EQL,_______,_______,KC_VOLU,_______,
+    _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_MUTE
+    _______,_______,_______,_______,TGLOWER,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),

-[_UNICODE] = LAYOUT_ortho_4x12 (
+[_GAME] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-     UN_ESC, UN_Q  , UN_W  , UN_E  , UN_R  , UN_T  , UN_Y  , UN_U  , UN_I  , UN_O  , UN_P  ,UN_BSPC,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-     UN_TAB, UN_A  , UN_S  , UN_D  , UN_F  , UN_G  , UN_H  , UN_J  , UN_K  , UN_L  ,UN_SCLN, UN_ENT,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, UN_Z  , UN_X  , UN_C  , UN_V  , UN_B  , UN_N  , UN_M  ,UN_COMM, UN_DOT, UN_UP ,UN_SLSH,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_UP ,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    UC_M_LN,UC_M_WI,UC_M_OS,_______,_______,_______,_______,_______,_______,UN_DOWN, UN_UP ,UN_RGHT
+    _______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH,KC_LEFT,KC_DOWN,KC_RGHT
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),

@@ -95,7 +79,7 @@ uint32_t layer_state_set_user(uint32_t state) {
    writePinLow(JOTANCK_LED1);
    writePinHigh(JOTANCK_LED2);
    break;
-  case _FN:
+  case _GAME:
    writePinHigh(JOTANCK_LED1);
    writePinHigh(JOTANCK_LED2);
    break;
@@ -116,10 +100,6 @@ void led_set_user(uint8_t usb_led) {
 }
 */

-void keyboard_post_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case KC_LCTL:
@@ -1,7 +1,5 @@
 # Jotix ortho 4x12 keymap

-![keymap](https://i.imgur.com/hfCyDRD.png)
-
 Tested on:

 * Planck/rev4
@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes
@@ -1,200 +0,0 @@
-enum unicode_names {
-    A_ACUTE,
-    A_ACUTEC,
-    E_ACUTE,
-    E_ACUTEC,
-    I_ACUTE,
-    I_ACUTEC,
-    O_ACUTE,
-    O_ACUTEC,
-    U_ACUTE,
-    U_ACUTEC,
-    U_DIERESIS,
-    U_DIERESISC,
-    N_TILDE,
-    N_TILDEC,
-    OPEN_EXCML,
-    OPEN_QUEST,
-    EURO,
-    POUND,
-    LEFT_ARROW,
-    DOWN_ARROW,
-    UP_ARROW,
-    RIGHT_ARROW,
-    LEFT_DARROW,
-    DOWN_DARROW,
-    UP_DARROW,
-    RIGHT_DAROW,
-    LEFT_DQUOT,
-    RGHT_DQUOT,
-    DEGREE,
-    DEGREE_CELCIUS,
-    SUPER_1,
-    SUPER_2,
-    SUPER_3,
-    ONE_HALF,
-    PER_MILLE,
-    PER_THOUS,
-    PILCROW,
-    COPYRIGHT,
-    REGISTERED,
-    MICRO,
-    MIDDLE_DOT,
-    BOX_CORNER_1,
-    BOX_CORNER_2,
-    BOX_CORNER_3,
-    BOX_CORNER_4,
-    BOX_HORIZONTAL,
-    BOX_VERTICAL,
-    BOX_CROSS,
-    BOX_UNION_1,
-    BOX_UNION_2,
-    BOX_UNION_3,
-    BOX_UNION_4,
-    DBOX_CORNER_1,
-    DBOX_CORNER_2,
-    DBOX_CORNER_3,
-    DBOX_CORNER_4,
-    DBOX_HORIZONT,
-    DBOX_VERTICAL,
-    DBOX_CROSS,
-    DBOX_UNION_1,
-    DBOX_UNION_2,
-    DBOX_UNION_3,
-    DBOX_UNION_4,
-    LESS_EQUAL,
-    MORE_EQUAL,
-    DIVISION,
-    SQUARE_ROOT,
-    CUBE_ROOT,
-    SPADE_SUIT,
-    TREBOL_SUIT,
-    HEART_SUIT,
-    DIAMOND_SUIT,
-    NARRAY_SUM,
-    INFINIT_SYMBOL,
-    DIAMOND_BULLET,
-    CIRCLE_BULLET,
-    SMILE_FACE,
-    SAD_FACE
-};
-
-const uint32_t PROGMEM unicode_map[] = {
-    [A_ACUTE]       = 0x00E1,
-    [A_ACUTEC]      = 0x00C1,
-    [E_ACUTE]       = 0x00E9,
-    [E_ACUTEC]      = 0x00C9,
-    [I_ACUTE]       = 0x00ED,
-    [I_ACUTEC]      = 0x00CD,
-    [O_ACUTE]       = 0x00F3,
-    [O_ACUTEC]      = 0x00D3,
-    [U_ACUTE]       = 0x00FA,
-    [U_ACUTEC]      = 0x00DA,
-    [U_DIERESIS]    = 0x00FC,
-    [U_DIERESISC]   = 0x00DC,
-    [N_TILDE]       = 0x00F1,
-    [N_TILDEC]      = 0x00D1,
-    [OPEN_EXCML]    = 0x00A1,
-    [OPEN_QUEST]    = 0x00BF,
-    [EURO]          = 0x20AC,
-    [POUND]         = 0x00A3,
-    [LEFT_ARROW]    = 0x2190,
-    [DOWN_ARROW]    = 0x2193,
-    [UP_ARROW]      = 0x2191,
-    [RIGHT_ARROW]   = 0x2192,
-    [LEFT_DARROW]   = 0x21E6,
-    [DOWN_DARROW]   = 0x21D3,
-    [UP_DARROW]     = 0x21D1,
-    [RIGHT_DAROW]   = 0x21D2,
-    [LEFT_DQUOT]    = 0x00AB,
-    [RGHT_DQUOT]    = 0x00BB,
-    [DEGREE]        = 0x00B0,
-    [DEGREE_CELCIUS]= 0x2103,
-    [SUPER_1]       = 0x00B9,
-    [SUPER_2]       = 0x00B2,
-    [SUPER_3]       = 0x00B3,
-    [ONE_HALF]      = 0x00BD,
-    [PER_MILLE]     = 0x0609,
-    [PER_THOUS]     = 0x060A,
-    [PILCROW]       = 0x00B6,
-    [COPYRIGHT]     = 0x00A9,
-    [REGISTERED]    = 0x00AE,
-    [MICRO]         = 0x00B5,
-    [MIDDLE_DOT]    = 0x00B7,
-    [BOX_CORNER_1]  = 0x250C,
-    [BOX_CORNER_2]  = 0x2510,
-    [BOX_CORNER_3]  = 0x2514,
-    [BOX_CORNER_4]  = 0x2518,
-    [BOX_HORIZONTAL]= 0x2500,
-    [BOX_VERTICAL]  = 0x2502,
-    [BOX_CROSS]     = 0x253C,
-    [BOX_UNION_1]   = 0x2524,
-    [BOX_UNION_2]   = 0x252C,
-    [BOX_UNION_3]   = 0x2534,
-    [BOX_UNION_4]   = 0x251C,
-    [DBOX_CORNER_1] = 0x2554,
-    [DBOX_CORNER_2] = 0x2557,
-    [DBOX_CORNER_3] = 0x255A,
-    [DBOX_CORNER_4] = 0x255D,
-    [DBOX_HORIZONT] = 0x2550,
-    [DBOX_VERTICAL] = 0x2551,
-    [DBOX_CROSS]    = 0x256C,
-    [DBOX_UNION_1]  = 0x2563,
-    [DBOX_UNION_2]  = 0x2566,
-    [DBOX_UNION_3]  = 0x2569,
-    [DBOX_UNION_4]  = 0x2560,
-    [LESS_EQUAL]    = 0x2264,
-    [MORE_EQUAL]    = 0x2265,
-    [DIVISION]      = 0x00F7,
-    [SQUARE_ROOT]   = 0x221A,
-    [CUBE_ROOT]     = 0x221B,
-    [SPADE_SUIT]    = 0x2660,
-    [TREBOL_SUIT]   = 0x2663,
-    [HEART_SUIT]    = 0x2664,
-    [DIAMOND_SUIT]  = 0x2665,
-    [NARRAY_SUM]    = 0x2211,
-    [INFINIT_SYMBOL]= 0x221E,
-    [DIAMOND_BULLET]= 0x2B25,
-    [CIRCLE_BULLET] = 0x2981,
-    [SMILE_FACE]    = 0x263A,
-    [SAD_FACE]      = 0x2639
-};
-
-#define UN_ESC  XP(DEGREE, DEGREE_CELCIUS)
-#define UN_Q    XP(OPEN_EXCML, SUPER_1)
-#define UN_W    XP(SUPER_2, SUPER_3)
-#define UN_E    XP(E_ACUTE, E_ACUTEC)
-#define UN_R    XP(EURO, ONE_HALF)
-#define UN_T    XP(PER_MILLE, PER_THOUS)
-#define UN_Y    XP(U_DIERESIS, U_DIERESISC)
-#define UN_U    XP(U_ACUTE, U_ACUTEC)
-#define UN_I    XP(I_ACUTE, I_ACUTEC)
-#define UN_O    XP(O_ACUTE, O_ACUTEC)
-#define UN_P    XP(POUND, PILCROW)
-#define UN_BSPC XP(BOX_CROSS, DBOX_CROSS)
-#define UN_TAB  XP(DIAMOND_BULLET, CIRCLE_BULLET)
-#define UN_A    XP(A_ACUTE, A_ACUTEC)
-#define UN_S    XP(BOX_CORNER_1, DBOX_CORNER_1)
-#define UN_D    XP(BOX_CORNER_2, DBOX_CORNER_2)
-#define UN_F    XP(BOX_CORNER_3, DBOX_CORNER_3)
-#define UN_G    XP(BOX_CORNER_4, DBOX_CORNER_4)
-#define UN_H    XP(BOX_UNION_1, DBOX_UNION_1)
-#define UN_J    XP(BOX_UNION_2, DBOX_UNION_2)
-#define UN_K    XP(BOX_UNION_3, DBOX_UNION_3)
-#define UN_L    XP(BOX_UNION_4, DBOX_UNION_4)
-#define UN_SCLN XP(BOX_HORIZONTAL, DBOX_HORIZONT)
-#define UN_ENT  XP(BOX_VERTICAL, DBOX_VERTICAL)
-#define UN_Z    XP(NARRAY_SUM, INFINIT_SYMBOL)
-#define UN_X    XP(SMILE_FACE, SAD_FACE)
-#define UN_C    XP(COPYRIGHT, REGISTERED)
-#define UN_V    XP(SPADE_SUIT, TREBOL_SUIT)
-#define UN_B    XP(HEART_SUIT, DIAMOND_SUIT)
-#define UN_N    XP(N_TILDE, N_TILDEC)
-#define UN_M    XP(MICRO, MIDDLE_DOT)
-#define UN_COMM XP(LESS_EQUAL, LEFT_DQUOT)
-#define UN_DOT  XP(MORE_EQUAL, RGHT_DQUOT)
-#define UN_SLSH XP(OPEN_QUEST, DIVISION)
-#define UN_LEFT XP(LEFT_ARROW, LEFT_DARROW)
-#define UN_DOWN XP(DOWN_ARROW, DOWN_DARROW)
-#define UN_UP   XP(UP_ARROW, UP_DARROW)
-#define UN_RGHT XP(RIGHT_ARROW, RIGHT_DAROW) 
@@ -534,8 +534,7 @@ class MILC(object):
        if not self._inside_context_manager:
            # If they didn't use the context manager use it ourselves
            with self:
-                self.__call__()
-                return
+                return self.__call__()

        if not self._entrypoint:
            raise RuntimeError('No entrypoint provided!')
@@ -2,9 +2,11 @@

 Check up for QMK environment.
 """
-import shutil
-import platform
 import os
+import platform
+import shutil
+import subprocess
+from glob import glob

 from milc import cli

@@ -16,32 +18,60 @@ def main(cli):
    This is currently very simple, it just checks that all the expected binaries are on your system.

    TODO(unclaimed):
-        * [ ] Run the binaries to make sure they work
        * [ ] Compile a trivial program with each compiler
        * [ ] Check for udev entries on linux
    """
+    cli.log.info('QMK Doctor is checking your environment.')

+    # Make sure the basic CLI tools we need are available and can be executed.
    binaries = ['dfu-programmer', 'avrdude', 'dfu-util', 'avr-gcc', 'arm-none-eabi-gcc']
-
-    cli.log.info('QMK Doctor is Checking your environment')
-
+    binaries += glob('bin/qmk-*')
    ok = True
+
    for binary in binaries:
        res = shutil.which(binary)
        if res is None:
-            cli.log.error('{fg_red}QMK can\'t find ' + binary + ' in your path')
+            cli.log.error("{fg_red}QMK can't find %s in your path.", binary)
            ok = False
+        else:
+            try:
+                subprocess.run([binary, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5, check=True)
+            except subprocess.CalledProcessError:
+                cli.log.error("{fg_red}Can't run `%s --version`", binary)
+                ok = False

+    # Determine our OS and run platform specific tests
    OS = platform.system()
-    if OS == "Darwin":
-        cli.log.info("Detected {fg_cyan}macOS")
-    elif OS == "Linux":
-        cli.log.info("Detected {fg_cyan}linux")
-        test = 'systemctl list-unit-files | grep enabled | grep -i ModemManager'
-        if os.system(test) == 0:
-            cli.log.warn("{bg_yellow}Detected modem manager. Please disable it if you are using Pro Micros")
-    else:
-        cli.log.info("Assuming {fg_cyan}Windows")

+    if OS == "Darwin":
+        cli.log.info("Detected {fg_cyan}macOS.")
+
+    elif OS == "Linux":
+        cli.log.info("Detected {fg_cyan}Linux.")
+        if shutil.which('systemctl'):
+            mm_check = subprocess.run(['systemctl', 'list-unit-files'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=10)
+            if mm_check.returncode == 0:
+                mm = True
+                for line in mm_check.stdout.split('\n'):
+                    if 'ModemManager' in line and 'enabled' in line:
+                        mm = False
+
+                if mm:
+                    cli.log.warn("{bg_yellow}Detected ModemManager. Please disable it if you are using a Pro-Micro.")
+
+            else:
+                cli.log.error('{bg_red}Could not run `systemctl list-unit-files`:')
+                cli.log.error(mm_check.stderr)
+
+        else:
+            cli.log.warn("Can't find systemctl to check for ModemManager.")
+
+    else:
+        cli.log.info("Assuming {fg_cyan}Windows.")
+
+    # Report a summary of our findings to the user
    if ok:
        cli.log.info('{fg_green}QMK is ready to go')
+    else:
+        cli.log.info('{fg_yellow}Problems detected, please fix these problems before proceeding.')
+        # FIXME(skullydazed): Link to a document about troubleshooting, or discord or something
@@ -0,0 +1,18 @@
+"""QMK Python Unit Tests
+
+QMK script to run unit and integration tests against our python code.
+"""
+from milc import cli
+
+
+@cli.entrypoint('QMK Python Unit Tests')
+def main(cli):
+    """Use nose2 to run unittests
+    """
+    try:
+        import nose2
+    except ImportError:
+        cli.log.error('Could not import nose2! Please install it with {fg_cyan}pip3 install nose2')
+        return False
+
+    nose2.discover()
@@ -0,0 +1,16 @@
+"""Format python code according to QMK's style.
+"""
+from milc import cli
+
+import subprocess
+
+
+@cli.entrypoint("Format python code according to QMK's style.")
+def main(cli):
+    """Format python code according to QMK's style.
+    """
+    try:
+        subprocess.run(['yapf', '-vv', '-ri', 'bin/qmk', 'lib/python'], check=True)
+        cli.log.info('Successfully formatted the python code in `bin/qmk` and `lib/python`.')
+    except subprocess.CalledProcessError:
+        cli.log.error('Error formatting python code!')
@@ -0,0 +1,9 @@
+class AttrDict(dict):
+    """A dictionary that can be accessed by attributes.
+
+    This should only be used to mock objects for unit testing. Please do not use this outside of qmk.tests.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(AttrDict, self).__init__(*args, **kwargs)
+        self.__dict__ = self
@@ -0,0 +1,6 @@
+{
+    "keyboard":"handwired/onekey/pytest",
+    "keymap":"pytest_unittest",
+    "layout":"LAYOUT",
+    "layers":[["KC_A"]]
+}
@@ -0,0 +1,8 @@
+from qmk.errors import NoSuchKeyboardError
+
+
+def test_NoSuchKeyboardError():
+    try:
+        raise NoSuchKeyboardError("test message")
+    except NoSuchKeyboardError as e:
+        assert e.message == 'test message'
@@ -0,0 +1,19 @@
+import qmk.keymap
+
+
+def test_template_onekey_proton_c():
+    templ = qmk.keymap.template('handwired/onekey/proton_c')
+    assert templ == qmk.keymap.DEFAULT_KEYMAP_C
+
+
+def test_template_onekey_pytest():
+    templ = qmk.keymap.template('handwired/onekey/pytest')
+    assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n'
+
+
+def test_generate_onekey_pytest():
+    templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']])
+    assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	[0] = LAYOUT(KC_A)};\n'
+
+
+# FIXME(skullydazed): Add a test for qmk.keymap.write that mocks up an FD.
@@ -0,0 +1,13 @@
+import os
+
+import qmk.path
+
+
+def test_keymap_onekey_pytest():
+    path = qmk.path.keymap('handwired/onekey/pytest')
+    assert path == 'keyboards/handwired/onekey/keymaps'
+
+
+def test_normpath():
+    path = qmk.path.normpath('lib/python')
+    assert path == os.environ['ORIG_CWD'] + '/lib/python'
@@ -0,0 +1,2 @@
+[unittest]
+start-dir = lib/python/qmk/tests
@@ -91,3 +91,18 @@ ifneq (,$(filter $(MCU),atmega32a))
  # Programming options
  PROGRAM_CMD ?= ./util/atmega32a_program.py $(TARGET).hex
 endif
+
+ifneq (,$(filter $(MCU),atmega328p))
+  PROTOCOL = VUSB
+
+  # Processor frequency.
+  #     This will define a symbol, F_CPU, in all source code files equal to the
+  #     processor frequency in Hz. You can then use this symbol in your source code to
+  #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+  #     automatically to create a 32-bit value in your source code.
+  F_CPU ?= 16000000
+
+  # unsupported features for now
+  NO_UART ?= yes
+  NO_SUSPEND_POWER_DOWN ?= yes
+endif
@@ -59,11 +59,6 @@
 uint16_t bootloader_start;
 #endif

-#define BOOT_SIZE_256 0b110
-#define BOOT_SIZE_512 0b100
-#define BOOT_SIZE_1024 0b010
-#define BOOT_SIZE_2048 0b000
-
 // compatibility between ATMega8 and ATMega88
 #if !defined(MCUCSR)
 #    if defined(MCUSR)
@@ -86,11 +81,11 @@ void bootloader_jump(void) {
 #if !defined(BOOTLOADER_SIZE)
    uint8_t high_fuse = boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS);

-    if (high_fuse & BOOT_SIZE_256) {
+    if (high_fuse & ~(FUSE_BOOTSZ0 & FUSE_BOOTSZ1)) {
        bootloader_start = (FLASH_SIZE - 512) >> 1;
-    } else if (high_fuse & BOOT_SIZE_512) {
+    } else if (high_fuse & ~(FUSE_BOOTSZ1)) {
        bootloader_start = (FLASH_SIZE - 1024) >> 1;
-    } else if (high_fuse & BOOT_SIZE_1024) {
+    } else if (high_fuse & ~(FUSE_BOOTSZ0)) {
        bootloader_start = (FLASH_SIZE - 2048) >> 1;
    } else {
        bootloader_start = (FLASH_SIZE - 4096) >> 1;
@@ -32,33 +32,32 @@ volatile uint32_t timer_count;
 */
 void timer_init(void) {
 #if TIMER_PRESCALER == 1
-    uint8_t prescaler = 0x01;
+    uint8_t prescaler = _BV(CS00);
 #elif TIMER_PRESCALER == 8
-    uint8_t prescaler = 0x02;
+    uint8_t prescaler = _BV(CS01);
 #elif TIMER_PRESCALER == 64
-    uint8_t prescaler = 0x03;
+    uint8_t prescaler = _BV(CS00) | _BV(CS01);
 #elif TIMER_PRESCALER == 256
-    uint8_t prescaler = 0x04;
+    uint8_t prescaler = _BV(CS02);
 #elif TIMER_PRESCALER == 1024
-    uint8_t prescaler = 0x05;
+    uint8_t prescaler = _BV(CS00) | _BV(CS02);
 #else
-#    error "Timer prescaler value is NOT vaild."
+#    error "Timer prescaler value is not valid"
 #endif

 #ifndef __AVR_ATmega32A__
    // Timer0 CTC mode
-    TCCR0A = 0x02;
-
+    TCCR0A = _BV(WGM01);
    TCCR0B = prescaler;

    OCR0A  = TIMER_RAW_TOP;
-    TIMSK0 = (1 << OCIE0A);
+    TIMSK0 = _BV(OCIE0A);
 #else
    // Timer0 CTC mode
-    TCCR0 = (1 << WGM01) | prescaler;
+    TCCR0 = _BV(WGM01) | prescaler;

    OCR0  = TIMER_RAW_TOP;
-    TIMSK = (1 << OCIE0);
+    TIMSK = _BV(OCIE0);
 #endif
 }

@@ -151,9 +151,10 @@ static struct SPI_Settings spi;
 // Initialize 4Mhz MSBFIRST MODE0
 void SPI_init(struct SPI_Settings *spi) {
    spi->spcr = _BV(SPE) | _BV(MSTR);
+#if F_CPU == 8000000
+    // For MCUs running at 8MHz (such as Feather 32U4, or 3.3V Pro Micros) we set the SPI doublespeed bit
    spi->spsr = _BV(SPI2X);
-
-    static_assert(SpiBusSpeed == F_CPU / 2, "hard coded at 4Mhz");
+#endif

    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
        // Ensure that SS is OUTPUT High
@@ -302,6 +302,10 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {.Header           = {.
 #    define USB_MAX_POWER_CONSUMPTION 500
 #endif

+#ifndef USB_POLLING_INTERVAL_MS
+#    define USB_POLLING_INTERVAL_MS 10
+#endif
+
 /*
 * Configuration descriptors
 */
@@ -324,7 +328,7 @@ const USB_Descriptor_Configuration_t PROGMEM

                                   .InterfaceStrIndex = NO_DESCRIPTOR},
            .Keyboard_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(KeyboardReport)},
-            .Keyboard_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = KEYBOARD_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Keyboard_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = KEYBOARD_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif

 #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
@@ -333,7 +337,7 @@ const USB_Descriptor_Configuration_t PROGMEM
             */
            .Mouse_Interface  = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = MOUSE_INTERFACE, .AlternateSetting = 0x00, .TotalEndpoints = 1, .Class = HID_CSCP_HIDClass, .SubClass = HID_CSCP_BootSubclass, .Protocol = HID_CSCP_MouseBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
            .Mouse_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(MouseReport)},
-            .Mouse_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MOUSE_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Mouse_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MOUSE_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif

 #ifdef SHARED_EP_ENABLE
@@ -354,7 +358,7 @@ const USB_Descriptor_Configuration_t PROGMEM
 #    endif
                                 .InterfaceStrIndex = NO_DESCRIPTOR},
            .Shared_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(SharedReport)},
-            .Shared_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = SHARED_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Shared_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = SHARED_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif

 #ifdef RAW_ENABLE
@@ -0,0 +1 @@
+#include "narze.h"
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "quantum.h"
+#include "eeconfig.h"
+#include "keymap_colemak.h"
+
+#ifdef COMBO_ENABLE
+#   include "superduper.h"
+#endif
@@ -0,0 +1,18 @@
+# TODO
+- [ ] Make SuperDuper mode fully-compatible in Windows by swapping GUI with Ctrl
+
+# LICENSE
+Copyright 2019 Manassarn Manoonchai manassarn@gmail.com @narze
+
+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/>.
@@ -0,0 +1,5 @@
+SRC += narze.c
+
+ifeq ($(strip $(COMBO_ENABLE)), yes)
+    SRC += superduper.c
+endif
@@ -0,0 +1,66 @@
+#include "superduper.h"
+#include "eeconfig.h"
+#include "eeprom.h"
+#include "keymap_colemak.h"
+
+// SuperDuper
+
+#define SUPERDUPER_COMBO_COUNT 3
+#define EECONFIG_SUPERDUPER_INDEX (uint8_t *) 19
+
+enum process_combo_event {
+    CB_SUPERDUPER,
+};
+
+enum supported_layers {
+    _QWERTY,
+    _COLEMAK,
+    _QWOC
+};
+
+const uint16_t PROGMEM superduper_combos[SUPERDUPER_COMBO_COUNT][3] = {
+    [_QWERTY] = {KC_S, KC_D, COMBO_END},
+    [_COLEMAK] = {KC_R, KC_S, COMBO_END},
+    [_QWOC] = {CM_S, CM_D, COMBO_END},
+};
+
+combo_t key_combos[COMBO_COUNT] = {
+    [CB_SUPERDUPER] = COMBO_ACTION(superduper_combos[_QWERTY]),
+};
+
+volatile bool superduper_enabled = true;
+
+const uint16_t PROGMEM empty_combo[] = {COMBO_END};
+
+bool toggle_superduper_mode(void) {
+    superduper_enabled = !superduper_enabled;
+
+    if (superduper_enabled) {
+        set_superduper_key_combos();
+    } else {
+        clear_superduper_key_combos();
+    }
+
+    return superduper_enabled;
+}
+
+void set_superduper_key_combo_layer(uint16_t layer) {
+    key_combos[CB_SUPERDUPER].keys = superduper_combos[layer];
+    eeprom_update_byte(EECONFIG_SUPERDUPER_INDEX, layer);
+}
+
+void set_superduper_key_combos(void) {
+    uint8_t layer = eeprom_read_byte(EECONFIG_SUPERDUPER_INDEX);
+
+    switch (layer) {
+        case _QWERTY:
+        case _COLEMAK:
+        case _QWOC:
+            key_combos[CB_SUPERDUPER].keys = superduper_combos[layer];
+            break;
+    }
+}
+
+void clear_superduper_key_combos(void) {
+    key_combos[CB_SUPERDUPER].keys = empty_combo;
+}
@@ -0,0 +1,7 @@
+#pragma once
+#include "narze.h"
+
+bool toggle_superduper_mode(void);
+void set_superduper_key_combo_layer(uint16_t layer);
+void set_superduper_key_combos(void);
+void clear_superduper_key_combos(void);
@@ -1,6 +1,10 @@
 #!/bin/sh
 # NOTE: This script uses tabs for indentation

+errcho() {
+	echo "$@" >&2
+}
+
 USAGE="Usage: $0 [keyboard[:keymap[:target]]]"

 # Check preconditions
@@ -11,11 +15,11 @@ for arg; do
 	fi
 done
 if [ $# -gt 1 ]; then
-	echo "$USAGE" >&2
+	errcho "$USAGE"
 	exit 1
 elif ! command -v docker >/dev/null 2>&1; then
-	echo "Error: docker not found" >&2
-	echo "See https://docs.docker.com/install/#supported-platforms for installation instructions" >&2
+	errcho "Error: docker not found"
+	errcho "See https://docs.docker.com/install/#supported-platforms for installation instructions"
 	exit 2
 fi

@@ -29,7 +33,7 @@ else
 	$1
 	EOF
 	if [ -n "$x" ]; then
-		echo "$USAGE" >&2
+		errcho "$USAGE"
 		exit 1
 	fi
 fi
@@ -37,9 +41,9 @@ if [ -n "$target" ]; then
 	if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then
 		usb_args="--privileged -v /dev:/dev"
 	else
-		echo "Error: target requires docker-machine to work on your platform" >&2
-		echo "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos" >&2
-		echo "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead" >&2
+		errcho "Error: target requires docker-machine to work on your platform"
+		errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
+		errcho "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead"
 		exit 3
 	fi
 fi
@@ -47,7 +51,7 @@ dir=$(pwd -W 2>/dev/null) || dir=$PWD  # Use Windows path if on Windows

 # Run container and build firmware
 docker run --rm -it $usb_args \
-    -w /qmk_firmware/ \
+	-w /qmk_firmware \
 	-v "$dir":/qmk_firmware \
 	-e ALT_GET_KEYBOARDS=true \
 	-e SKIP_GIT="$SKIP_GIT" \
@@ -2,9 +2,9 @@

 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
-  function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
-  }
+	function make() {
+		docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+	}
 fi

 # test force push
@@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 		eval $MAKE_ALL
 		: $((exit_code = $exit_code + $?))
 	else
-		NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)'  | grep -Ev '^(docs/)' | wc -l)
+		NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev '(^bin/qmk)' | wc -l)
 		BRANCH=$(git rev-parse --abbrev-ref HEAD)
 		# is this branch master or a "non docs, non keyboards" change 
 		if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
@@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 			eval $MAKE_ALL
 			: $((exit_code = $exit_code + $?))
 		else
-		    # keyboards project format
+			# keyboards project format
 			#  /keyboards/board1/rev/keymaps/
 			#  /keyboards/board2/keymaps/
 			# ensure we strip everything off after and including the keymaps folder to get board and/or revision
@@ -51,6 +51,14 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 				fi
 			done
 		fi
+		# Check and run python tests if necessary
+		PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l)
+		if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
+			echo
+			echo "Running python tests."
+			docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2
+			: $((exit_code = $exit_code + $?))
+		fi
 	fi
 	exit $exit_code
 fi
Author	SHA1	Message	Date
Nshan Petrosyan	79a6c6eda5	[Keymap] Update nshanpetrosyan keymap (#6683 ) * Update keymap.c Additional functionality added to layers. * Error fix Fixed missing key in layer 5, fixed brightness keys with universal codes, made code more readable. * fix missing commas fixed missing commas on line 19 and line 23 * fix Indicator LED sticking on RGB off toggle. fixes issue: LED indicators stay on when toggling RGB off	2019-09-07 08:25:25 -07:00
fauxpark	490a13a02e	Add 328P to mcu_selection.mk (#6682 )	2019-09-07 08:24:19 -07:00
fauxpark	0d94730da0	Adafruit BLE: Set SPI2X bit only when F_CPU is 8MHz (#6671 )	2019-09-07 08:18:05 -07:00
fauxpark	91bd2117df	Banish some more magic numbers (#6662 )	2019-09-07 08:12:46 -07:00
Manassarn Manoonchai	c21281c593	[Keymap] Add narze userspace (#6652 ) * Refactor & reimplement mod tap macros * Reduce tapping term * Update readme * Add narze userspace * Make use of narze userspace * Extract Superduper mode * Refactor Superduper mode * (Ergodox Infinity) Prevent stuck modifiers * Update ergodox_infinity/narze likewise * Add warning for building Infinity with docker * Fix include eeprom.h in superduper * Try enabling superduper mode with combo for ergodox infinity * Apply suggestions on #4546 * Convert to 4 spaces * Map backlight step key * Replace PLAY_NOTE_ARRAY * Fix superduper toggle * Re enable audio in planck rev4 * Use perform_space_cadet * Remove superduper mod tap triggers * Add readme for planck light firmware flashing command * Remove unused layers * Remove unused keycodes * Add backlight toggle * Remove unused songs & use DEFAULT_LAYER_SONGS * Update readme * Move includes to header file	2019-09-07 08:06:30 -07:00
skullY	6ca29f2b9b	Run the python tests inside docker	2019-09-07 07:58:41 -07:00
skullY	16366dd23d	add missing apostrophes	2019-09-07 07:58:41 -07:00
skullY	18690ddaea	filter python from the list of things that trigger default builds	2019-09-07 07:58:41 -07:00
skullY	1013ae2d34	Add python tests to the travis check	2019-09-07 07:58:41 -07:00
skullY	deb6fa6a87	Add a command to format python code	2019-09-07 07:58:41 -07:00
skullY	533d6d6a46	Make the modem manager check more pythonic	2019-09-07 07:58:41 -07:00
skullY	c7eede2249	run yapf on the code	2019-09-07 07:58:41 -07:00
skullY	5b7a5b2a76	Setup a python test framework	2019-09-07 07:58:41 -07:00
Konstantin Đorđević	4d339b7b5d	Update docker_build.sh: indentation fix, error echo function (#6659 ) * Replace spaces with tab in docker_build.sh * Use errcho instead of echo >&2	2019-09-07 18:17:54 +10:00
jotix	736bdc7e97	Jotix (#6687 ) * jotix ortho_4x12 * add shifted symbols * jotix ortho_4x12 layot	2019-09-07 18:05:14 +10:00
MechMerlin	fc5fb2fc15	CA66 R1/R2 Cleanup (#6678 ) * fixup readme to adhere to QMK standards and to also have more information * use pragma once * strip out the custom bootmagic lite routine as it is the same as QMK's default bootmagic lite routine. Also add the caps lock led indicator * turn on bootmagic lite * update default keymap * Update keyboards/playkbtw/ca66/ca66.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * remove lines 4 thru 37 and add bootloader	2019-09-07 18:04:48 +10:00
Silvio Gulizia	ac8f8a8914	fix missing music mode legend (#6686 )	2019-09-07 07:36:40 +10:00
fauxpark	7ffed07310	Make USB polling rate configurable with a define (#6668 )	2019-09-06 07:41:24 -07:00
Mikkel Jeppesen	f8bf1d1b16	Changed to 1209 PID (#6677 )	2019-09-06 14:34:37 +10:00
Danny	f0ad3fc68a	[Keyboard] Add Iris Rev 4 (#6660 ) * Add Iris Rev. 4 * Fix EEPROM addresses	2019-09-05 20:10:57 -07:00
				`@@ -0,0 +1 @@`
				`const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};`