Fix LT() crashing some ARM keyboards (#6529)

* Add meson keyboard

* Apply suggestions from code review

Co-Authored-By: noroadsleft <[email protected]>

* Added soft reset and layer 3

* bootmagic light

Co-Authored-By: noroadsleft <[email protected]>

keyboards/jj40/keymaps/waples/keymap.c

@@ -4,15 +4,13 @@ extern keymap_config_t keymap_config;
 
 #define _QWERTY 0
 #define _DVORAK 1
-#define _GAME 2
+#define _LEFTY 2
-#define _LEFTY 3
+#define _RIGHTY 3
-#define _RIGHTY 4
+#define _DUAL 4
-#define _DUAL 5
 
 enum jj40_keycodes {
   QWERTY = SAFE_RANGE,
   DVORAK,
-  GAME,
   LEFTY,
   RIGHTY,
   DUAL,
@@ -28,21 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC, \
   CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, SHFTENT, \
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT, \
-  KC_PSCR, KC_BSPC, KC_LALT, _______, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+  KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 ),
 
 [_DVORAK] = LAYOUT_ortho_4x12( \
   KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,   KC_G,   KC_C,    KC_R,    KC_L,  KC_BSPC, \
   CTLESC,  KC_A,    KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,   KC_T,    KC_N,    KC_S,  SHFTENT, \
   KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,   KC_W,    KC_V,    KC_Z,  KC_SLSH, \
-  KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
+  KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
-),
-
-[_GAME] = LAYOUT_ortho_4x12( \
-  KC_TAB,  KC_Q, KC_W, KC_E, KC_R,  KC_T,   _______, _______, _______, _______, _______, QWERTY, \
-  CTLESC,  KC_A, KC_S, KC_D, KC_F,  KC_G,   _______, _______, _______, _______, _______, _______, \
-  KC_LSFT, KC_Z, KC_X, KC_C, KC_V,  KC_B,   _______, _______, _______, _______, _______, _______, \
-  KC_LCTL, KC_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY,   KC_LEFT, KC_DOWN,   KC_UP, KC_RIGHT \
 ),
 
 [_LEFTY] = LAYOUT_ortho_4x12( \
@@ -59,11 +50,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______ \
 ),
 
-[_DUAL] =  LAYOUT_ortho_4x12( \
+[_DUAL] = LAYOUT_ortho_4x12( \
-  RESET,   _______, _______, _______, _______, QWERTY,  GAME,    _______, _______, _______, BL_BRTG, RESET, \
+  RESET,   _______, _______, _______, _______, QWERTY,  DVORAK,  _______, _______, RGB_HUD,  RGB_TOG,  RESET, \
-  _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, BL_TOGG, _______, \
+  _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, RGB_HUI,  RGB_MOD,  _______, \
-  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \
+  _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, RGB_SAD,  RGB_VAD,  _______, \
-  _______, _______, _______, _______, _______, _______, DVORAK,  _______, _______, _______, _______, _______ \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,  RGB_VAI,  _______ \
 )
 };
 
@@ -86,12 +77,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-    case GAME:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_GAME);
-      }
-      return false;
-      break;
     case LEFTY:
       if (record->event.pressed) {
         layer_on(_LEFTY);

keyboards/jj40/keymaps/waples/readme.md

@@ -6,11 +6,15 @@
 I currently have the following layers in my keymap:
 * Qwerty 	(as default)
 * Dvorak	(still learning this type of layout, so not really used much)
-* Gaming	(WIP! I tried some I found, but didn't like them, so I'm in the progress of making my own)
 * Lefty		(lower)
 * Righty	(raise)
 * Dual		(adjust)
 
+### Note to self:
+YOU NEED TO USE [bootloadHID -r jj40_waples.hex](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jj40)
+
+## the stuff below is out of date and I think about removing them from this readme
+
 #### QWERTY
 	| Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bsp |
 	|C_Esc|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |S_Ent|
@@ -24,14 +28,6 @@ I currently have the following layers in my keymap:
 	| Sft |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  |  /  |
 	|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
 
-
-#### GAMING
-	| Tab |  Q  |  W  |  E  |  R  |  T  |     |     |     |     |     |QWERT|
-	| Esc |  A  |  S  |  D  |  F  |  G  |     |     |     |     |     |     |
-	| Sft |  Z  |  X  |  C  |  V  |  B  |     |     |     |     |     |     |
-	| Ctl |  1  |  2  |  3  | ^L^ | Spc | Bsp | ^R^ | Lft | Dwn | Up  | Rgt |
-
-
 #### LEFTY	(lower)
 	|  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | Bsp |
 	| Del |     |     |     |     |     |     |  (  |  )  |  [  |  ]  |     |
@@ -51,5 +47,3 @@ I currently have the following layers in my keymap:
 	|     | Prv | Stp | Tog | Nxt | Nrm | Swp |     |     |     |     |     |
 	|     |     | Mte | Vol-| Vol+|     | NKRO|     |     |     |     |     |
 	|     |     |     |     |     |     |DVORK|     |     |     |     |     |
-
-

keyboards/jj40/keymaps/waples/rules.mk

@@ -5,7 +5,6 @@ EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-BACKLIGHT_CUSTOM_DRIVER = yes
 RGBLIGHT_ENABLE = yes
 RGBLIGHT_CUSTOM_DRIVER = yes
 KEY_LOCK_ENABLE = yes

keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c

@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
     _______, 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_F11 , KC_F12 , _______, _______, _______,   _______, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
-    _______, _______, _______, _______, _______, _______,   _______, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, _______, _______, _______, _______, _______,   KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______, _______,
 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
     _______, _______, _______, _______, _______, _______,   _______, KC_PGDN, KC_PGUP, KC_HOME, KC_END , _______,
 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤

keyboards/keebio/nyquist/keymaps/georgepetri/readme.md

@@ -26,9 +26,9 @@ Features a dedicated navigation layer on rise and current layer status on rgb un
 ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐
 │      │  F1  │  F2  │  F3  │  F4  │  F5  │ │  F6  │  F7  │  F8  │  F9  │  F10 │      │
 ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │  F11 │  F12 │      │      │      │ │      │      │      │      │      │      │
+│      │  F11 │  F12 │      │      │      │ │      │  MINS│  EQL │  LBRC│  RBRC│ BSLS │
 ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
-│      │      │      │      │      │      │ │      │  MINS│  EQL │  LBRC│  RBRC│ BSLS │
+│      │      │      │      │      │      │ │ LEFT │ DOWN │ UP   │ RGHT │      │      │
 ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤
 │      │      │      │      │      │      │ │      │  PGDN│ PGUP │  HOME│  END │      │
 ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤

keyboards/kudox/keymaps/jis/keymap.c

@@ -1,4 +1,5 @@
 #include QMK_KEYBOARD_H
+#include"keymap_jp.h"
 
 // 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.
@@ -21,23 +22,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                   KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_AT   ,KC_BSLS ,
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_COLN ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,                                   KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_SLSH ,KC_N    ,KC_M    ,KC_MINS ,KC_UP   ,SYM_L   ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LANG2,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_COLN
+     KC_ALES ,KC_LGUI ,KC_LALT ,KC_ENT  ,KC_LANG2,KC_SPC  ,KC_SPC  ,                 KC_COMM ,KC_DOT  ,KC_L1SYM,KC_LEFT ,KC_DOWN ,KC_RGHT ,JP_BSLS
   //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
   [_SYMB] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   XXXXXXX ,KC_CIRC ,KC_JYEN ,KC_TILD ,KC_PIPE ,KC_DEL  ,
+     KC_ESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   XXXXXXX ,JP_CIRC ,JP_YEN  ,JP_TILD ,JP_PIPE ,KC_DEL  ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,                 KC_LT   ,KC_GT   ,KC_LBRC ,KC_RBRC ,KC_LCBR ,KC_RCBR ,XXXXXXX ,
+     _______ ,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,                 KC_LT   ,KC_GT   ,JP_LBRC ,JP_RBRC ,JP_LCBR ,JP_RCBR ,XXXXXXX ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,KC_PLUS ,KC_ASTR ,KC_SCLN ,KC_COLN ,_______ ,
+     _______ ,KC_F11  ,KC_F12  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,JP_PLUS ,JP_ASTR ,KC_SCLN ,JP_COLN ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   _______ ,XXXXXXX ,XXXXXXX ,_______ ,KC_VOLU ,_______ ,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤

keyboards/meson/config.h

@@ -0,0 +1,172 @@
+/*
+Copyright 2019 Luciano M
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0000
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Luciano M
+#define PRODUCT         Meson
+#define DESCRIPTION     3x14 split keyboard with two thumb keys per side
+
+/* key matrix size */
+#define MATRIX_ROWS 8 // 4 rows each half
+#define MATRIX_COLS 7
+
+#define MATRIX_ROW_PINS { F7, C6, F6, F5 }
+#define MATRIX_COL_PINS { D4, D7, E6, B3, B2, B6, F4 }
+// #define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USE_I2C
+#define SOFT_SERIAL_PIN D0
+
+#define RGB_DI_PIN B5
+#ifdef RGB_DI_PIN
+   #define RGBLED_NUM 10
+   #define RGBLIGHT_SPLIT
+   #define RGBLED_SPLIT { 5, 5 }
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   #define RGBLIGHT_ANIMATIONS
+ /*== customize breathing effect ==*/
+   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+   /*==== use exp() and sin() ====*/
+   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0

keyboards/meson/info.json

@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Meson",
+    "keyboard_folder": "meson",
+    "maintainer": "qmk",
+    "width": 15.5,
+    "height": 4,
+    "layouts": {
+      "LAYOUT": {
+        "layout": [
+          {"label": "", "x": 0, "y": 0},
+          {"label": "", "x": 1, "y": 0},
+          {"label": "", "x": 2, "y": 0},
+          {"label": "", "x": 3, "y": 0},
+          {"label": "", "x": 4, "y": 0},
+          {"label": "", "x": 5, "y": 0},
+          {"label": "", "x": 6, "y": 0},
+          {"label": "", "x": 8.5, "y": 0},
+          {"label": "", "x": 9.5, "y": 0},
+          {"label": "", "x": 10.5, "y": 0},
+          {"label": "", "x": 11.5, "y": 0},
+          {"label": "", "x": 12.5, "y": 0},
+          {"label": "", "x": 13.5, "y": 0},
+          {"label": "", "x": 14.5, "y": 0},
+          {"label": "", "x": 0, "y": 1},
+          {"label": "", "x": 1, "y": 1},
+          {"label": "", "x": 2, "y": 1},
+          {"label": "", "x": 3, "y": 1},
+          {"label": "", "x": 4, "y": 1},
+          {"label": "", "x": 5, "y": 1},
+          {"label": "", "x": 6, "y": 1},
+          {"label": "", "x": 8.5, "y": 1},
+          {"label": "", "x": 9.5, "y": 1},
+          {"label": "", "x": 10.5, "y": 1},
+          {"label": "", "x": 11.5, "y": 1},
+          {"label": "", "x": 12.5, "y": 1},
+          {"label": "", "x": 13.5, "y": 1},
+          {"label": "", "x": 14.5, "y": 1},
+          {"label": "", "x": 0, "y": 2},
+          {"label": "", "x": 1, "y": 2},
+          {"label": "", "x": 2, "y": 2},
+          {"label": "", "x": 3, "y": 2},
+          {"label": "", "x": 4, "y": 2},
+          {"label": "", "x": 5, "y": 2},
+          {"label": "", "x": 6, "y": 2},
+          {"label": "", "x": 8.5, "y": 2},
+          {"label": "", "x": 9.5, "y": 2},
+          {"label": "", "x": 10.5, "y": 2},
+          {"label": "", "x": 11.5, "y": 2},
+          {"label": "", "x": 12.5, "y": 2},
+          {"label": "", "x": 13.5, "y": 2},
+          {"label": "", "x": 14.5, "y": 2},
+          {"label": "", "x": 4, "y": 3},
+          {"label": "", "x": 5, "y": 3},
+          {"label": "", "x": 9.5, "y": 3},
+          {"label": "", "x": 10.5, "y": 3}
+        ]
+      }, 
+    "LAYOUT_2u": {
+        "layout": [
+          {"label": "", "x": 0, "y": 0},
+          {"label": "", "x": 1, "y": 0},
+          {"label": "", "x": 2, "y": 0},
+          {"label": "", "x": 3, "y": 0},
+          {"label": "", "x": 4, "y": 0},
+          {"label": "", "x": 5, "y": 0},
+          {"label": "", "x": 6, "y": 0},
+          {"label": "", "x": 8.5, "y": 0},
+          {"label": "", "x": 9.5, "y": 0},
+          {"label": "", "x": 10.5, "y": 0},
+          {"label": "", "x": 11.5, "y": 0},
+          {"label": "", "x": 12.5, "y": 0},
+          {"label": "", "x": 13.5, "y": 0},
+          {"label": "", "x": 14.5, "y": 0},
+          {"label": "", "x": 0, "y": 1},
+          {"label": "", "x": 1, "y": 1},
+          {"label": "", "x": 2, "y": 1},
+          {"label": "", "x": 3, "y": 1},
+          {"label": "", "x": 4, "y": 1},
+          {"label": "", "x": 5, "y": 1},
+          {"label": "", "x": 6, "y": 1},
+          {"label": "", "x": 8.5, "y": 1},
+          {"label": "", "x": 9.5, "y": 1},
+          {"label": "", "x": 10.5, "y": 1},
+          {"label": "", "x": 11.5, "y": 1},
+          {"label": "", "x": 12.5, "y": 1},
+          {"label": "", "x": 13.5, "y": 1},
+          {"label": "", "x": 14.5, "y": 1},
+          {"label": "", "x": 0, "y": 2},
+          {"label": "", "x": 1, "y": 2},
+          {"label": "", "x": 2, "y": 2},
+          {"label": "", "x": 3, "y": 2},
+          {"label": "", "x": 4, "y": 2},
+          {"label": "", "x": 5, "y": 2},
+          {"label": "", "x": 6, "y": 2},
+          {"label": "", "x": 8.5, "y": 2},
+          {"label": "", "x": 9.5, "y": 2},
+          {"label": "", "x": 10.5, "y": 2},
+          {"label": "", "x": 11.5, "y": 2},
+          {"label": "", "x": 12.5, "y": 2},
+          {"label": "", "x": 13.5, "y": 2},
+          {"label": "", "x": 14.5, "y": 2},
+          {"label": "", "x": 4, "y": 3, "w": 2},
+          {"label": "", "x": 9.5, "y": 3, "w": 2}
+        ]
+      }
+    }
+  }
+  

keyboards/meson/keymaps/default/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2019 Luciano M
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// place overrides here

keyboards/meson/keymaps/default/keymap.c

@@ -0,0 +1,78 @@
+/* Copyright 2019 Luciano M
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  MESON = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  
+  [0] = LAYOUT( /* Base */
+    KC_ESC,  KC_Q, KC_W, KC_E, KC_R,  KC_T, KC_TAB,         KC_BSLS, KC_Y,   KC_U,  KC_I,    KC_O,   KC_P,    KC_BSPC, 
+    KC_LCTL, KC_A, KC_S, KC_D, KC_F,  KC_G, KC_LALT,        KC_GRV,  KC_H,   KC_J,  KC_K,    KC_L,   KC_SCLN, KC_ENT, 
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V,  KC_B, KC_LGUI,        KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, 
+                               MO(1), KC_SPC,                        KC_SPC, MO(2) 
+  ),
+  
+  [1] = LAYOUT( /* Symbols */
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TAB,        KC_BSLS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RGB_VAI, 
+    KC_LCTL, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_VAD, 
+    KC_LSFT, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LGUI,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS,  MESON,  RGB_MOD, 
+                                        MO(1),   KC_SPC,                          KC_SPC,  MO(3) 
+  ),
+  
+  [2] = LAYOUT( /* Numbers */
+    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_TAB,         KC_BSLS, KC_6,    KC_7,   KC_8,    KC_9,     KC_0,    KC_VOLU, 
+    KC_LCTL, 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_VOLD, 
+    KC_LSFT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI,        KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_MPRV, KC_MNXT, KC_MPLY, 
+                                       MO(3),   KC_SPC,                           KC_SPC,  MO(2) 
+  ),
+    
+  [3] = LAYOUT( /* Reset, other functions if you want */
+    RESET,    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, 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 
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case MESON:
+      if (record->event.pressed) {
+        // when keycode MESON is pressed
+        SEND_STRING("Meson macro working");
+      } else {
+        // when keycode MESON is released
+      }
+      break;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}

keyboards/meson/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default keymap for meson

keyboards/meson/meson.c

@@ -0,0 +1,51 @@
+/* Copyright 2019 Luciano M
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "meson.h"
+
+// Optional override functions below.
+// You can leave any or all of these undefined.
+// These are only required if you want to perform custom actions.
+
+/*
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+  // put your looping keyboard code here
+  // runs every cycle (a lot)
+
+  matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  // put your per-action keyboard code here
+  // runs for every action, just before processing by the firmware
+
+  return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+  led_set_user(usb_led);
+}
+
+*/

keyboards/meson/meson.h

@@ -0,0 +1,56 @@
+/* Copyright 2019 Luciano M
+ *
+ * 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 "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06,     R06, R05, R04, R03, R02, R01, R00, \
+    L10, L11, L12, L13, L14, L15, L16,     R16, R15, R14, R13, R12, R11, R10, \
+    L20, L21, L22, L23, L24, L25, L26,     R26, R25, R24, R23, R22, R21, R20, \
+                        L30, L31,               R31, R30 \
+) \
+{ \
+    { L00, L01, L02, L03, L04, L05, L06}, \
+    { L10, L11, L12, L13, L14, L15, L16}, \
+    { L20, L21, L22, L23, L24, L25, L26}, \
+    { ___, ___, ___, ___, L30, L31, ___}, \
+    { R00, R01, R02, R03, R04, R05, R06}, \
+    { R10, R11, R12, R13, R14, R15, R16}, \
+    { R20, R21, R22, R23, R24, R25, R26}, \
+    { ___, ___, ___, ___, R30, R31, ___}, \
+}
+
+// 2u SPACEBAR LAYOUT, DON'T FORGET TO CHANGE NAME OF LAYOUTS IN KEYMAP.C
+
+#define LAYOUT_2u( \
+    L00, L01, L02, L03, L04, L05, L06,     R06, R05, R04, R03, R02, R01, R00, \
+    L10, L11, L12, L13, L14, L15, L16,     R16, R15, R14, R13, R12, R11, R10, \
+    L20, L21, L22, L23, L24, L25, L26,     R26, R25, R24, R23, R22, R21, R20, \
+                           L30,                   R30 \
+) \
+{ \
+    { L00, L01, L02, L03, L04, L05, L06}, \
+    { L10, L11, L12, L13, L14, L15, L16}, \
+    { L20, L21, L22, L23, L24, L25, L26}, \
+    { ___, ___, ___, ___, L30, ___, ___},\
+    { R00, R01, R02, R03, R04, R05, R06}, \
+    { R10, R11, R12, R13, R14, R15, R16}, \
+    { R20, R21, R22, R23, R24, R25, R26}, \
+    { ___, ___, ___, ___, R30, ___, ___},\
+}

keyboards/meson/readme.md

@@ -0,0 +1,13 @@
+# meson
+
+A 3x14 split keyboard with two thumb keys on each half. Supports MX, Alps, and Choc reversible.
+
+Keyboard Maintainer: [PyroL](https://github.com/PyrooL)  
+Hardware Supported: Meson PCBs, Pro Micro  
+Hardware Availability: [open source at PyroL's Github](https://github.com/PyrooL/Meson)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make meson:default
+
+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).

keyboards/meson/rules.mk

@@ -0,0 +1,81 @@
+# 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
+
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# 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
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   change yes to no to disable
+#
+SPLIT_KEYBOARD = yes
+BOOTMAGIC_ENABLE = lite     # 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 = no        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no         # Unicode
+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)

keyboards/planck/keymaps/sascha/keymap.c

@@ -24,14 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
          * │   `  │   !  │   @  │   #  │   $  │   %  │   ^  │   &  │   *  │   ü  │   ö  │   ä  │
          * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
-         * │ SINS │   ♥  │   ≈  │   ✓  │   ✗  │   ←  │   →  │   €  │   ß  │   Ü  │   Ö  │   Ä  │
+         * │ SINS │   ♥  │   ’  │   “  │   ”  │   ←  │   →  │   €  │   ß  │   Ü  │   Ö  │   Ä  │
          * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤
          * │ Rset │ BLSt │  F1  │ Home │ End  │ PgUp │ PgDn │ Left │ Down │  Up  │ Rght │      │
          * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
          */
         KC_TILD   , KC_1     , KC_2     , KC_3     , KC_4     , KC_5      , KC_6     , KC_7     , KC_8     , KC_9     , KC_0     , KC_DEL,
         KC_GRV    , KC_EXLM  , KC_AT    , KC_HASH  , KC_DLR   , KC_PERC   , KC_CIRC  , KC_AMPR  , KC_ASTR  , UC(L'ü') , UC(L'ö') , UC(L'ä'),
-        S(KC_INS) , UC(L'♥') , UC(L'≈') , UC(L'✓') , UC(L'✗') , UC(L'←')  , UC(L'→') , UC(L'€') , UC(L'ß') , UC(L'Ü') , UC(L'Ö') , UC(L'Ä'),
+        S(KC_INS) , UC(L'♥') , UC(L'’') , UC(L'“') , UC(L'”') , UC(L'←')  , UC(L'→') , UC(L'€') , UC(L'ß') , UC(L'Ü') , UC(L'Ö') , UC(L'Ä'),
         RESET     , BL_STEP  , KC_F1    , KC_HOME  , KC_END   , KC_PGUP   , KC_PGDN  , KC_LEFT  , KC_DOWN  , KC_UP    , KC_RGHT  , KC_TRNS
     )
 };

keyboards/romac/keymaps/jarred/keymap.c

@@ -0,0 +1,37 @@
+/* Copyright 2019 Jarred Steenvoorden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define _BASE 0
+#define _FN1 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT(
+		KC_7, KC_8, KC_9, \
+		KC_4, KC_5, KC_6, \
+		KC_1, KC_2, KC_3, \
+		LT(_FN1, KC_0), KC_ENT, KC_DOT \
+	),
+  
+	[_FN1] = LAYOUT(
+		KC_HOME, KC_UP  , KC_PGUP , \
+		KC_LEFT, KC_DOWN, KC_RIGHT, \
+		KC_END , KC_BSPC, KC_PGDN , \
+		KC_TRNS, XXXXXXX, KC_DEL    \
+	)
+};

quantum/mcu_selection.mk

@@ -1,4 +1,3 @@
-
 ifneq ($(findstring STM32F303, $(MCU)),)
   ## chip/board settings
   # - the next two should match the directories in
@@ -54,7 +53,7 @@ ifneq (,$(filter $(MCU),atmega32u4 at90usb1286))
   # LUFA specific
   #
   # Target architecture (see library "Board Types" documentation).
-  ARCH ?= AVR8
+  ARCH = AVR8
 
   # Input clock frequency.
   #     This will define a symbol, F_USB, in all source code files equal to the
@@ -68,4 +67,27 @@ ifneq (,$(filter $(MCU),atmega32u4 at90usb1286))
   #     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
+  ifeq (,$(filter $(NO_INTERRUPT_CONTROL_ENDPOINT),yes))
+    OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+  endif
+endif
+
+ifneq (,$(filter $(MCU),atmega32a))
+  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 ?= 12000000
+
+  # unsupported features for now
+  NO_UART ?= yes
+  NO_SUSPEND_POWER_DOWN ?= yes
+
+  # Programming options
+  PROGRAM_CMD ?= ./util/atmega32a_program.py $(TARGET).hex
 endif

quantum/process_keycode/process_tap_dance.h

@@ -34,7 +34,7 @@ typedef struct
   bool finished;
 } qk_tap_dance_state_t;
 
-#define TD(n) (QK_TAP_DANCE + n)
+#define TD(n) (QK_TAP_DANCE | ((n) & 0xFF))
 
 typedef void (*qk_tap_dance_user_fn_t) (qk_tap_dance_state_t *state, void *user_data);
 

quantum/template/avr/rules.mk

@@ -1,42 +1,6 @@
 # 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
-
 
 # Bootloader selection
 #   Teensy       halfkay

quantum/template/ps2avrgb/rules.mk

@@ -1,13 +1,5 @@
 # MCU name
 MCU = atmega32a
-PROTOCOL = VUSB
-
-# unsupported features for now
-NO_UART = yes
-NO_SUSPEND_POWER_DOWN = yes
-
-# processor frequency
-F_CPU = 12000000
 
 # Bootloader
 #     This definition is optional, and if your keyboard supports multiple bootloaders of
@@ -28,6 +20,3 @@ RGBLIGHT_CUSTOM_DRIVER = yes
 OPT_DEFS = -DDEBUG_LEVEL=0
 
 SRC += i2c_master.c
-
-# programming options
-PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex

tmk_core/common/wait.h

@@ -13,8 +13,8 @@ extern "C" {
 #   define wait_us(us)  _delay_us(us)
 #elif defined PROTOCOL_CHIBIOS
 #   include "ch.h"
-#   define wait_ms(ms) chThdSleepMilliseconds(ms)
+#   define wait_ms(ms) do { if (ms != 0) { chThdSleepMilliseconds(ms); } else { chThdSleepMicroseconds(1); } } while (0)
-#   define wait_us(us) chThdSleepMicroseconds(us)
+#   define wait_us(us) do { if (us != 0) { chThdSleepMicroseconds(us); } else { chThdSleepMicroseconds(1); } } while (0)
 #elif defined PROTOCOL_ARM_ATSAM
 #   include "clks.h"
 #   define wait_ms(ms) CLK_delay_ms(ms)