Update ARM GCC on macOS to 8.3 (#7318)

* Added Xulkal ALT Keymap

* Hadron compile fix

* Keymap fix

keyboards/converter/xt_usb/config.h

@@ -17,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "config_common.h"
+
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6512
 #define DEVICE_VER      0x0001

keyboards/converter/xt_usb/matrix.c

@@ -99,25 +99,25 @@ static uint8_t move_e0code(uint8_t code) {
 uint8_t matrix_scan(void)
 {
     static enum {
-        INIT,
-        E0,
+        XT_STATE_INIT,
+        XT_STATE_E0,
         // Pause: E1 1D 45, E1 9D C5
-        E1,
-        E1_1D,
-        E1_9D,
-    } state = INIT;
+        XT_STATE_E1,
+        XT_STATE_E1_1D,
+        XT_STATE_E1_9D,
+    } state = XT_STATE_INIT;
 
     uint8_t code = xt_host_recv();
     if (!code) return 0;
     xprintf("%02X ", code);
     switch (state) {
-        case INIT:
+        case XT_STATE_INIT:
             switch (code) {
                 case 0xE0:
-                    state = E0;
+                    state = XT_STATE_E0;
                     break;
                 case 0xE1:
-                    state = E1;
+                    state = XT_STATE_E1;
                     break;
                 default:
                     if (code < 0x80)
@@ -127,59 +127,59 @@ uint8_t matrix_scan(void)
                     break;
             }
             break;
-        case E0:
+        case XT_STATE_E0:
             switch (code) {
                 case 0x2A:
                 case 0xAA:
                 case 0x36:
                 case 0xB6:
                     //ignore fake shift
-                    state = INIT;
+                    state = XT_STATE_INIT;
                     break;
                 default:
                     if (code < 0x80)
                         matrix_make(move_e0code(code));
                     else
                         matrix_break(move_e0code(code & 0x7F));
-                    state = INIT;
+                    state = XT_STATE_INIT;
                     break;
             }
             break;
-        case E1:
+        case XT_STATE_E1:
             switch (code) {
                 case 0x1D:
-                    state = E1_1D;
+                    state = XT_STATE_E1_1D;
                     break;
                 case 0x9D:
-                    state = E1_9D;
+                    state = XT_STATE_E1_9D;
                     break;
                 default:
-                    state = INIT;
+                    state = XT_STATE_INIT;
                     break;
             }
             break;
-        case E1_1D:
+        case XT_STATE_E1_1D:
             switch (code) {
                 case 0x45:
                     matrix_make(0x55);
                     break;
                 default:
-                    state = INIT;
+                    state = XT_STATE_INIT;
                     break;
             }
             break;
-        case E1_9D:
+        case XT_STATE_E1_9D:
             switch (code) {
                 case 0x45:
                     matrix_break(0x55);
                     break;
                 default:
-                    state = INIT;
+                    state = XT_STATE_INIT;
                     break;
             }
             break;
         default:
-            state = INIT;
+            state = XT_STATE_INIT;
     }
     matrix_scan_quantum();
     return 1;

keyboards/dz60/keymaps/calbatr0ss/keymap.c

@@ -11,16 +11,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
  * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │CAPS│ OS │ ALT│ SPACE  │ FN │  SPACE   │ ALT│ OS │MENU│CTRL│
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │CAPS│ ALT│ OS │ SPACE    │ FN │ SPACE  │ OS │ ALT│MENU│CTRL│
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
  */
   LAYOUT_60_calbatr0ss(
-      KC_ESC,  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_BSLS, KC_GRV,
-      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_BSPC,
-      KC_LCTL,          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,  KC_SLSH,          KC_RSFT, MO(3),
-      KC_CAPS, KC_LGUI,          KC_LALT, KC_SPC,        MO(2),            KC_SPC, KC_RALT,         KC_RGUI, KC_APP,  KC_RCTL),
+      KC_ESC,  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_BSLS, KC_GRV,
+      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_BSPC,
+      KC_LCTL,          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, KC_SLSH,          KC_RSFT, MO(3),
+      KC_CAPS, KC_LALT,       KC_LGUI, KC_SPC,       MO(2),       KC_SPC, KC_RGUI,         KC_RALT, KC_APP,  KC_RCTL),
 
 /*  LAYER 1
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -31,54 +31,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
  * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │CAPS│ ALT│ OS │ SPACE  │ FN │  SPACE   │ OS │ ALT│MENU│CTRL│
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │CAPS│ OS │ ALT│ SPACE    │ FN │ SPACE  │ ALT│ OS │MENU│CTRL│
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
  */
   LAYOUT_60_calbatr0ss(
-      KC_ESC,  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_BSLS, KC_GRV,
-      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_BSPC,
-      KC_LCTL,          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,  KC_SLSH,          KC_RSFT, MO(3),
-      KC_CAPS, KC_LALT,          KC_LGUI, KC_SPC,        MO(2),            KC_SPC, KC_RGUI,         KC_RALT, KC_APP,  KC_RCTL),
+      KC_ESC,  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_BSLS, KC_GRV,
+      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_BSPC,
+      KC_LCTL,          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, KC_SLSH,          KC_RSFT, MO(3),
+      KC_CAPS, KC_LGUI,       KC_LALT, KC_SPC,       MO(2),       KC_SPC, KC_RALT,         KC_RGUI, KC_APP,  KC_RCTL),
 
 /*  LAYER 2
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │PDN│ UP│PUP│   │   │   │ DEL │
+ * │     │RGB│   │   │   │   │   │PDN│ UP│PUP│   │   │   │ DEL │
  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
  * │      │   │   │   │   │   │HOM│LFT│DWN│RHT│END│   │        │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
  * │        │   │   │   │   │VDN│VUP│MUT│PRV│NXT│PLY│      │   │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │RSET│    │    │        │    │          │    │    │    │    │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │RSET│    │    │          │    │        │    │    │    │    │
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
  */
   LAYOUT_60_calbatr0ss(
       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_TRNS, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+      KC_TRNS,          RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,  KC_TRNS, KC_TRNS,
       KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT,  KC_MPLY,          KC_TRNS, KC_TRNS,
       RESET,   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS),
 
 /*  LAYER 3
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │   │WIN│MAC│   │   │   │   │   │   │   │   │   │   │   │   │
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+ * │     │   │WIN│   │   │   │   │   │   │   │   │   │   │     │
  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
  * │      │   │   │   │   │   │   │   │   │   │   │   │        │
  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │        │   │   │   │   │   │   │   │   │   │   │      │   │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
- * │    │    │    │        │    │          │    │    │    │    │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * │        │   │   │   │   │   │   │MAC│   │   │   │      │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │    │    │    │          │    │        │    │    │    │    │
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
  */
   LAYOUT_60_calbatr0ss(
-      KC_TRNS, DF(0),   DF(1),   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, DF(1),   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, DF(0),   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)
 };

keyboards/massdrop/alt/keymaps/xulkal/config.h

@@ -0,0 +1,23 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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
+
+#define RGB_MATRIX_TOG_LAYERS

keyboards/massdrop/alt/keymaps/xulkal/keymap.c

@@ -0,0 +1,79 @@
+#include QMK_KEYBOARD_H
+#include "xulkal.h"
+
+enum ctrl_keycodes {
+    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
+    U_T_AGCR,              //USB Toggle Automatic GCR control
+    DBG_TOG,               //DEBUG Toggle On / Off
+    DBG_MTRX,              //DEBUG Toggle Matrix Prints
+    DBG_KBD,               //DEBUG Toggle Keyboard Prints
+    DBG_MOU,               //DEBUG Toggle Mouse Prints
+};
+
+#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
+
+#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        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,  TD_BSPC, KC_HOME, \
+        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, KC_END,  \
+        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_PGUP, \
+        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    TD_COMM, KC_DOT,  KC_SLSH, KC_RSPC,          KC_UP,   KC_PGDN, \
+        KC_LCPO, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LOWER,   KC_LEFT, KC_DOWN, KC_RGHT  \
+    ),
+
+#ifndef GAMELAYER_DISABLE
+    [_GAME] = LAYOUT(
+        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_HOME, \
+        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, KC_END,  \
+        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_PGUP, \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN, \
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, LOWER,   KC_LEFT, KC_DOWN, KC_RGHT  \
+    ),
+#endif
+
+    [_LOWER] = LAYOUT(
+        _______, RGB_RMOD,RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RESET,   QWERTY,  _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______, _______, \
+        RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGBRST,  GAME,    _______, _______, _______, _______, _______, _______,          _______, _______, \
+        _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,          _______, _______, \
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______ \
+    )
+};
+
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
+{
+    switch (keycode) {
+        case U_T_AUTO:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL)
+                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
+            return false;
+        case U_T_AGCR:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL)
+                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
+            return false;
+        case DBG_TOG:
+            if (record->event.pressed)
+                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
+            return false;
+        case DBG_MTRX:
+            if (record->event.pressed)
+                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
+            return false;
+        case DBG_KBD:
+            if (record->event.pressed)
+                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
+            return false;
+        case DBG_MOU:
+            if (record->event.pressed)
+                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
+            return false;
+    }
+
+    return true;
+}

keyboards/massdrop/alt/keymaps/xulkal/rules.mk

@@ -0,0 +1 @@
+DISABLE_LTO = yes

keyboards/setta21/config.h

@@ -0,0 +1,21 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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"

keyboards/setta21/info.json

@@ -0,0 +1,34 @@
+{
+    "keyboard_name": "setta21", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "width": 18.25, 
+    "height": 6.25, 
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label":"ESC", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"\uff1d", "x":2, "y":0},
+                {"label":"Del", "x":3, "y":0},
+                {"label":"Num Lock", "x":0, "y":1.25},
+                {"label":"/", "x":1, "y":1.25},
+                {"label":"*", "x":2, "y":1.25},
+                {"label":"-", "x":3, "y":1.25},
+                {"label":"7", "x":0, "y":2.25},
+                {"label":"8", "x":1, "y":2.25},
+                {"label":"9", "x":2, "y":2.25},
+                {"label":"+", "x":3, "y":2.25, "h":2},
+                {"label":"4", "x":0, "y":3.25},
+                {"label":"5", "x":1, "y":3.25},
+                {"label":"6", "x":2, "y":3.25},
+                {"label":"1", "x":0, "y":4.25},
+                {"label":"2", "x":1, "y":4.25},
+                {"label":"3", "x":2, "y":4.25},
+                {"label":"Enter", "x":3, "y":4.25, "h":2},
+                {"label":"0", "x":0, "y":5.25, "w":2},
+                {"label":".", "x":2, "y":5.25}
+            ]
+        }
+    }
+}

keyboards/setta21/keymaps/default/config.h

@@ -0,0 +1,23 @@
+/* Copyright 2018 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
+

keyboards/setta21/keymaps/default/keymap.c

@@ -0,0 +1,69 @@
+#include QMK_KEYBOARD_H
+
+
+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+#endif
+
+extern uint8_t is_master;
+
+// 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 layer_number {
+  _BASE,
+  _ARROW,
+  _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_numpad_6x4(
+      //,-----------------------------------|
+LT(_ADJUST,KC_ESC),  KC_F2,  KC_EQL,  KC_DEL,
+      //|--------+--------+--------+--------|
+          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      //|--------+--------+--------+--------|
+            KC_P7,   KC_P8,   KC_P9,         
+      //|--------+--------+--------+--------|
+            KC_P4,   KC_P5,   KC_P6, KC_PPLS,
+      //|--------+--------+--------+--------|
+            KC_P1,   KC_P2,   KC_P3,         
+      //|--------+--------+--------+--------|
+LT(_ARROW, KC_P0),          KC_PDOT,KC_PENT
+      //`-----------------------------------'
+  ),
+
+  [_ARROW] = LAYOUT_numpad_6x4(
+      //,-----------------------------------|
+           KC_ESC, _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX,   KC_UP, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          KC_LEFT, KC_DOWN,KC_RIGHT, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, KC_DOWN, XXXXXXX,         
+      //|--------+--------+--------+--------|
+       MO(_ARROW),          _______, _______ 
+      //`-----------------------------------'
+  ),
+
+  [_ADJUST] = LAYOUT_numpad_6x4( /* Base */
+      //,-----------------------------------|
+      MO(_ADJUST), _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      //|--------+--------+--------+--------|
+          RGB_SAD, RGB_SAI, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
+      //|--------+--------+--------+--------|
+          RGB_VAD, RGB_VAI, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          XXXXXXX,          XXXXXXX, RGB_MOD 
+      //`-----------------------------------'
+  )
+};

keyboards/setta21/keymaps/default/readme.md

@@ -0,0 +1,38 @@
+# The default keymap for setta21
+
+## Base
+|       1    |   2  |   3  |  4   |
+|:----------:|:----:|:----:|:----:|
+|Adjust , ESC|  F2  |   =  |  Del |
+|   NumLock  |   /  |   *  | minus|
+|      7     |   8  |   9  |      |
+|      4     |   5  |   6  |   +  |
+|      1     |   2  |   3  |      |
+| Arrow , 0  |      |   .  |  Ent |
+
+
+
+## Arrow
+|       1    |   2  |   3  |  4   |
+|:----------:|:----:|:----:|:----:|
+|     ESC    |  F2  |   =  |  Del |
+|    XXXXX   |   /  |   *  | minus|
+|    XXXXX   |  UP  | XXXXX|      |
+|     LEFT   | DOWN | RIGHT|   +  |
+|    XXXXX   | DOWN | XXXXX|      |
+|    Arrow   |      |   .  |  Ent |
+
+
+
+
+## Adjust
+|       1    |    2  |   3  |    4   |
+|:----------:|:-----:|:----:|:------:|
+|   Adjust   |   F2  |   =  |   Del  |
+|    XXXXX   | XXXXX | XXXXX|  XXXXX |
+|    XXXXX   |RGB_SAI| XXXXX|        |
+|     LEFT   |RGB_HUI| XXXXX| RGB_TOG|
+|   RGB_VAD  |RGB_VAI| XXXXX|        |
+|    XXXXX   |       | XXXXX| RGB_MOD|
+
+

keyboards/setta21/keymaps/salicylic/config.h

@@ -0,0 +1,40 @@
+/* Copyright 2018 Salicylic_acid3
+ *
+ * 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
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
+
+#define DRIVER_LED_TOTAL RGBLED_NUM
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+// #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_LIMIT_VAL 50
+#    define RGB_MATRIX_VAL_STEP 5
+#    define RGB_MATRIX_SPD_STEP 10
+#endif
+

keyboards/setta21/keymaps/salicylic/keymap.c

@@ -0,0 +1,197 @@
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+
+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+#endif
+
+extern uint8_t is_master;
+
+#ifdef OLED_DRIVER_ENABLE
+static uint32_t        oled_timer = 0;
+#endif
+
+// 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 layer_number {
+  _BASE = 0,
+  _ARROW,
+  _MACRO,
+  _ADJUST,
+};
+
+enum custom_keycodes {
+  RGB_RST = SAFE_RANGE,
+  SEND_SUM,
+  SEND_AVE,
+  SEND_CIF,
+  SEND_MAX,
+  SEND_MIN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_numpad_6x4(
+      //,-----------------------------------|
+           KC_ESC,   KC_F2,  JP_EQL,  KC_DEL,
+      //|--------+--------+--------+--------|
+          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      //|--------+--------+--------+--------|
+            KC_P7,   KC_P8,   KC_P9,         
+      //|--------+--------+--------+--------|
+            KC_P4,   KC_P5,   KC_P6, KC_PPLS,
+      //|--------+--------+--------+--------|
+            KC_P1,   KC_P2,   KC_P3,         
+      //|--------+--------+--------+--------|
+LT(_ARROW, KC_P0),LT(_MACRO, KC_PDOT),KC_PENT
+      //`-----------------------------------'
+  ),
+
+  [_ARROW] = LAYOUT_numpad_6x4(
+      //,-----------------------------------|
+          _______, _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX,   KC_UP, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          KC_LEFT, KC_DOWN,KC_RIGHT, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, KC_DOWN, XXXXXXX,         
+      //|--------+--------+--------+--------|
+       MO(_ARROW),       MO(_MACRO), _______ 
+      //`-----------------------------------'
+  ),
+
+  [_MACRO] = LAYOUT_numpad_6x4(
+      //,-----------------------------------|
+          _______, _______, _______, _______,
+      //|--------+--------+--------+--------|
+         SEND_MIN,SEND_MAX,SEND_CIF,SEND_AVE,
+      //|--------+--------+--------+--------|
+            KC_F7,   KC_F8,   KC_F9,         
+      //|--------+--------+--------+--------|
+            KC_F4,   KC_F5,   KC_F6,SEND_SUM,
+      //|--------+--------+--------+--------|
+           KC_F11,  KC_F12,   KC_F3,         
+      //|--------+--------+--------+--------|
+          _______,          _______, JP_RPRN 
+      //`-----------------------------------'
+  ),
+
+  [_ADJUST] = LAYOUT_numpad_6x4( /* Base */
+      //,-----------------------------------|
+          _______, _______, _______, _______,
+      //|--------+--------+--------+--------|
+          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      //|--------+--------+--------+--------|
+          RGB_SAD, RGB_SAI, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
+      //|--------+--------+--------+--------|
+          RGB_VAD, RGB_VAI, XXXXXXX,         
+      //|--------+--------+--------+--------|
+          _______,          _______, RGB_MOD 
+      //`-----------------------------------'
+  )
+};
+
+
+//A description for expressing the layer position in LED mode.
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _ARROW, _MACRO, _ADJUST);
+}
+
+int RGB_current_mode;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  bool result = false;
+  if (record->event.pressed) {
+     #ifdef OLED_DRIVER_ENABLE
+        oled_timer = timer_read32();
+     #endif
+  }
+  switch (keycode) {
+    case SEND_SUM:
+      if (record->event.pressed) {
+        SEND_STRING("_SUM*");
+      }
+      break;
+    case SEND_AVE:
+      if (record->event.pressed) {
+        SEND_STRING("_AVERAGE*");
+      }
+      break;
+    case SEND_CIF:
+      if (record->event.pressed) {
+        SEND_STRING("_COUNTIF*");
+      }
+      break;
+    case SEND_MAX:
+      if (record->event.pressed) {
+        SEND_STRING("_MAX*");
+      }
+      break;
+    case SEND_MIN:
+      if (record->event.pressed) {
+        SEND_STRING("_MIN*");
+      }
+      break;
+    #ifdef RGBLIGHT_ENABLE
+      case RGB_MOD:
+          if (record->event.pressed) {
+            rgblight_mode(RGB_current_mode);
+            rgblight_step();
+            RGB_current_mode = rgblight_config.mode;
+          }
+        break;
+      case RGB_RST:
+          if (record->event.pressed) {
+            eeconfig_update_rgblight_default();
+            rgblight_enable();
+            RGB_current_mode = rgblight_config.mode;
+          }
+        break;
+    #endif
+    default:
+      result = true;
+      break;
+  }
+
+  return result;
+}
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_0; }
+
+
+void render_layer_state(void) {
+    oled_write_P(PSTR("LAYER: "), false);
+    oled_write_P(PSTR(" Arrow "), layer_state_is(_ARROW));
+    oled_write_P(PSTR(" Macro "), layer_state_is(_MACRO));
+}
+
+void render_keylock_status(uint8_t led_usb_state) {
+    oled_write_P(PSTR("NumLock"), led_usb_state & (1 << USB_LED_NUM_LOCK));
+    oled_write_P(PSTR("              "), false);
+}
+
+void render_layer_messages(void) {
+    oled_write_P(PSTR("Setta21                For Your Good Job. "), false);
+}
+
+
+void render_status(void) {
+    /* Show Keyboard Layout  */
+    render_layer_messages();
+    render_keylock_status(host_keyboard_leds());
+    render_layer_state();
+}
+
+void oled_task_user(void) {
+    render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+}
+
+#endif

keyboards/setta21/keymaps/salicylic/readme.md

@@ -0,0 +1,49 @@
+# The salicylic keymap for setta21
+
+## Base
+|       1    |   2  |      3    |  4   |
+|:----------:|:----:|:---------:|:----:|
+|     ESC    |  F2  |      =    |  Del |
+|   NumLock  |   /  |      *    | minus|
+|      7     |   8  |      9    |      |
+|      4     |   5  |      6    |   +  |
+|      1     |   2  |      3    |      |
+| Arrow , 0  |      | Macro , . |  Ent |
+
+
+
+## Arrow
+|       1    |   2  |   3   |  4   |
+|:----------:|:----:|:-----:|:----:|
+|     ESC    |  F2  |   =   |  Del |
+|    XXXXX   |   /  |   *   | minus|
+|    XXXXX   |  UP  | XXXXX |      |
+|     LEFT   | DOWN | RIGHT |   +  |
+|    XXXXX   | DOWN | XXXXX |      |
+|    Arrow   |      | Macro |  Ent |
+
+
+
+## Macro
+|       1    |    2   |      3    |     4    |
+|:----------:|:------:|:---------:|:--------:|
+|     ESC    |  F2    |      =    |    Del   |
+|    =MIN(   | =MAX(  | =COUNTIF( | =AVERAGE(|
+|      F7    |    F8  |     F9    |          |
+|      F4    |    F5  |     F6    |   =SUM(  |
+|     F11    |   F12  |     F3    |          |
+|    Arrow   |        |   Macro   |     )    |
+
+
+
+## Adjust
+|       1    |    2  |   3  |    4   |
+|:----------:|:-----:|:----:|:------:|
+|   Adjust   |   F2  |   =  |   Del  |
+|    XXXXX   | XXXXX | XXXXX|  XXXXX |
+|    XXXXX   |RGB_SAI| XXXXX|        |
+|     LEFT   |RGB_HUI| XXXXX| RGB_TOG|
+|   RGB_VAD  |RGB_VAI| XXXXX|        |
+|    Arrow   |       | Macro| RGB_MOD|
+
+

keyboards/setta21/keymaps/salicylic/rules.mk

@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = WS2812
+

keyboards/setta21/readme.md

@@ -0,0 +1,17 @@
+# setta21
+
+![setta21](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20190315/20190315022018.jpg)
+
+This is 21 keys tenkeypad. 
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: setta21 PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_Data), [Booth Shop](https://salicylic-acid3.booth.pm/items/1271667)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make setta21: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).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/setta21-build-guide) 

keyboards/setta21/rev1/config.h

@@ -0,0 +1,67 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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       0xFEED
+#define PRODUCT_ID      0x3060
+#define DEVICE_VER      0x0011
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         setta21
+#define DESCRIPTION     A custom tenkeypad
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+
+/* Set 0 if debouncing isn't 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
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#define RGBLED_NUM 21    // Number of LEDs
+#define RGBLIGHT_ANIMATIONS
+
+#ifndef IOS_DEVICE_ENABLE
+  #define RGBLIGHT_LIMIT_VAL 180
+  #define RGBLIGHT_VAL_STEP 17
+#else
+  #define RGBLIGHT_LIMIT_VAL 50
+  #define RGBLIGHT_VAL_STEP 4
+#endif
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+
+#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
+  #define USB_MAX_POWER_CONSUMPTION 400
+#else
+  // fix iPhone and iPad power adapter issue
+  // iOS device need lessthan 100
+  #define USB_MAX_POWER_CONSUMPTION 100
+#endif

keyboards/setta21/rev1/rev1.c

@@ -0,0 +1,25 @@
+#include "rev1.h"
+
+#ifdef RGB_MATRIX_ENABLE
+    led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+        { 14,13, 7, 6, 0,20 },
+        {    12, 8, 5, 1,19 },
+        { 15,11, 9, 4, 2,18 },
+        { 16,   10,    3,17 }
+    }, {
+    // LED Index to Physical Position
+        {   0, 179 }, {  21, 179 }, {  43, 179 }, {  64, 179 }, {  43, 134 }, {  21, 134 }, {   0, 134 }, {   0,  90 }, {  21,  90 }, {  43,  90 },
+        {  64, 112 }, {  43,  45 }, {  21,  45 }, {   0,  45 }, {  11,   0 }, {  43,   0 }, {  64,  23 }, {  64, 224 }, {  43, 224 }, {  21, 224 },
+        {   0, 224 }
+    }, {
+    // LED Index to Flag
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4
+} };
+#endif
+
+void matrix_init_kb(void) {
+	matrix_init_user();
+};

keyboards/setta21/rev1/rev1.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "setta21.h"
+
+#define LAYOUT_numpad_6x4( \
+       L05, L15, L25, L35, \
+       L04, L14, L24, L34, \
+       L03, L13, L23,      \
+       L02, L12, L22, L32, \
+       L01, L11, L21,      \
+       L00,      L20, L30  \
+  ) \
+  { \
+    {  L00,  L01,  L02,  L03,  L04,  L05  },  \
+    {KC_NO,  L11,  L12,  L13,  L14,  L15  },  \
+    {  L20,  L21,  L22,  L23,  L24,  L25  },  \
+    {  L30,KC_NO,  L32,KC_NO,  L34,  L35  }   \
+  }

keyboards/setta21/rules.mk

@@ -0,0 +1,37 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+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 = no       # 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 = yes       # Enable WS2812 RGB underlight. 
+TAP_DANCE_ENABLE = no
+OLED_DRIVER_ENABLE = yes
+USE_I2C = no
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+DEFAULT_FOLDER = setta21/rev1
+
+LAYOUTS = numpad_6x4

keyboards/setta21/setta21.c

@@ -0,0 +1 @@
+#include "setta21.h"

keyboards/setta21/setta21.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "quantum.h"
+
+#ifdef KEYBOARD_setta21_rev1
+  #include "rev1.h"
+#endif

users/xulkal/custom_rgb.h

@@ -1,9 +1,12 @@
 #pragma once
 
 #if defined(RGB_MATRIX_ENABLE)
-#include "rgb_matrix.h"
+#    include "rgb_matrix.h"
 #elif defined(RGBLIGHT_ENABLE)
-#include "rgblight.h"
+#    if !defined(__AVR__)
+#        define PROGMEM
+#    endif
+#    include "rgblight.h"
 #endif
 
 #ifdef RGB_MATRIX_ENABLE

util/macos_install.sh

@@ -22,8 +22,8 @@ if ! brew --version >/dev/null 2>&1; then
 fi
 
 brew tap osx-cross/avr
-brew tap PX4/homebrew-px4
+brew tap osx-cross/arm
 brew update
-brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
+brew install avr-gcc@8 arm-gcc-bin dfu-programmer avrdude clang-format dfu-util python3
 brew link --force avr-gcc@8
 pip3 install -r "${util_dir}/../requirements.txt"

util/travis_utils.sh

@@ -10,8 +10,8 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
 
 # Extra variables
-LOCAL_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}
-QMK_CHANGES=$(git diff --name-only HEAD ${TRAVIS_BRANCH})
+LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
 
 # if docker is installed - patch calls to within the qmk docker image
 if command -v docker >/dev/null; then