[QP] Explicit buffer alignment. (#17532 )

Allow locate_keymap to handle DEFAULT_FOLDER (#17529 )
Specify blackpill board files where relevant (#17521 )
2026-07-09 18:34:31 -04:00 · 2022-07-02 13:22:46 +10:00 · 2022-07-01 22:20:32 +01:00 · 2022-07-01 15:38:57 +01:00 · 2022-07-01 15:36:08 +01:00 · 2022-06-30 23:11:13 -07:00
85 changed files with 1205 additions and 153 deletions
@@ -40,5 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    5
-
-#define STM32_HSECLK 8000000
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = GENERIC_STM32_F411XE

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -47,8 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BREATHING_PERIOD 5
 #define BACKLIGHT_ON_STATE 1

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 24
 #define RGBLIGHT_ANIMATIONS
@@ -17,19 +17,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    96
-#define STM32_PLLP_VALUE                    2
-#define STM32_PLLQ_VALUE                    4
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,4 +1,5 @@
 MCU = STM32F411
+BOARD = GENERIC_STM32_F411XE

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "ADM42 rev4",
+    "url": "https://adm42.dev/",
+    "maintainer": "lleonini",
+    "layouts": {
+        "LAYOUT_adm42_3x12_6": {
+            "layout": [
+                {"label":"GUI/`~", "x":0, "y":0.8},
+                {"label":"Q", "x":1, "y":0.8},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0.5},
+                {"label":"T", "x":5, "y":0.5},
+                {"label":"Y", "x":7.5, "y":0.5},
+                {"label":"U", "x":8.5, "y":0.5},
+                {"label":"I", "x":9.5, "y":0},
+                {"label":"O", "x":10.5, "y":0},
+                {"label":"P", "x":11.5, "y":0.8},
+                {"label":"GUI/=+", "x":12.5, "y":0.8},
+
+                {"label":"Ctrl/Tab", "x":0, "y":1.8},
+                {"label":"A", "x":1, "y":1.8},
+                {"label":"S", "x":2, "y":1},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1.5},
+                {"label":"G", "x":5, "y":1.5},
+                {"label":"H", "x":7.5, "y":1.5},
+                {"label":"J", "x":8.5, "y":1.5},
+                {"label":"K", "x":9.5, "y":1},
+                {"label":"L", "x":10.5, "y":1},
+                {"label":";:", "x":11.5, "y":1.8},
+                {"label":"Ctrl/'\"", "x":12.5, "y":1.8},
+
+                {"label":"Alt", "x":0, "y":2.8},
+                {"label":"Z", "x":1, "y":2.8},
+                {"label":"X", "x":2, "y":2},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2.5},
+                {"label":"B", "x":5, "y":2.5},
+                {"label":"N", "x":7.5, "y":2.5},
+                {"label":"M", "x":8.5, "y":2.5},
+                {"label":",<", "x":9.5, "y":2},
+                {"label":".>", "x":10.5, "y":2},
+                {"label":"/?", "x":11.5, "y":2.8},
+                {"label":"Alt", "x":12.5, "y":2.8},
+
+                {"label":"Special/Esc", "x":4.25, "y":3.55},
+                {"label":"Shift/Backspace", "x":5.25, "y":3.65},
+                {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25},
+                {"label":"Extra/Enter", "x":6.25, "y":4.05},
+                {"label":"Shift/Space", "x":7.25, "y":3.65},
+                {"label":"Special/Alt", "x":8.25, "y":3.55}
+            ]
+        }
+    }
+}
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 @cyril279
+
+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      0x5F10
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    cyril279
+#define PRODUCT         rev41lp
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 6
+
+#define MATRIX_ROW_PINS { F4, B2, F5, B3, F6, B1, F7 }
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_ON_STATE 1
+#define BACKLIGHT_LEVELS 7
+#define BACKLIGHT_LIMIT_VAL 150
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
@@ -0,0 +1,58 @@
+{
+    "keyboard_name": "rev41lp",
+    "url": "https://github.com/cyril279/keyboards/tree/main/revlp/41_1350",
+    "maintainer": "cyril279",
+    "layouts": {
+        "LAYOUT_rev41lp": {
+            "layout": [
+                {"label":"K00", "x":0, "y":0.54},
+                {"label":"K01", "x":1, "y":0.36},
+                {"label":"K02", "x":2, "y":0.18},
+                {"label":"K03", "x":3, "y":0},
+                {"label":"K04", "x":4, "y":0.18},
+                {"label":"K05", "x":5, "y":0.36},
+
+                {"label":"K10", "x":7, "y":0.36},
+                {"label":"K11", "x":8, "y":0.18},
+                {"label":"K12", "x":9, "y":0},
+                {"label":"K13", "x":10, "y":0.18},
+                {"label":"K14", "x":11, "y":0.36},
+                {"label":"K15", "x":12, "y":0.54},
+
+                {"label":"K20", "x":0, "y":1.54},
+                {"label":"K21", "x":1, "y":1.36},
+                {"label":"K22", "x":2, "y":1.18},
+                {"label":"K23", "x":3, "y":1},
+                {"label":"K24", "x":4, "y":1.18},
+                {"label":"K25", "x":5, "y":1.36},
+
+                {"label":"K30", "x":7, "y":1.36},
+                {"label":"K31", "x":8, "y":1.18},
+                {"label":"K32", "x":9, "y":1},
+                {"label":"K33", "x":10, "y":1.18},
+                {"label":"K34", "x":11, "y":1.36},
+                {"label":"K35", "x":12, "y":1.54},
+
+                {"label":"K40", "x":0, "y":2.54},
+                {"label":"K41", "x":1, "y":2.36},
+                {"label":"K42", "x":2, "y":2.18},
+                {"label":"K43", "x":3, "y":2},
+                {"label":"K44", "x":4, "y":2.18},
+                {"label":"K45", "x":5, "y":2.36},
+
+                {"label":"K50", "x":7, "y":2.36},
+                {"label":"K51", "x":8, "y":2.18},
+                {"label":"K52", "x":9, "y":2},
+                {"label":"K53", "x":10, "y":2.18},
+                {"label":"K54", "x":11, "y":2.36},
+                {"label":"K55", "x":12, "y":2.54},
+
+                {"label":"K60", "x":2.875, "y":3.54, "w":1.25},
+                {"label":"K61", "x":4.125, "y":3.54, "w":1.25},
+                {"label":"K62", "x":5.375, "y":3.54, "w":2.25},
+                {"label":"K63", "x":7.625, "y":3.54, "w":1.25},
+                {"label":"K64", "x":8.875, "y":3.54, "w":1.25}
+            ]
+        }
+    }
+}
@@ -0,0 +1,21 @@
+/*
+Copyright 2021 @cyril279
+
+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 TAPPING_TERM 150
+#define TAPPING_TERM_PER_KEY
+#define IGNORE_MOD_TAP_INTERRUPT
@@ -0,0 +1,105 @@
+/*
+Copyright 2021 @cyril279
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+    _NAVIG,
+    _FUNCTION
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+#define SPC_NAV LT(_NAVIG,KC_SPC)
+#define FUNCT  MO(_FUNCTION)
+#define NAVIG  MO(_NAVIG)
+
+#define LGUI_A LGUI_T(KC_A)
+#define LALT_S LALT_T(KC_S)
+#define LSFT_D LSFT_T(KC_D)
+#define LCTL_F LCTL_T(KC_F)
+#define RCTL_J RCTL_T(KC_J)
+#define RSFT_K RSFT_T(KC_K)
+#define RALT_L LALT_T(KC_L)
+#define RGUI_SCLN RGUI_T(KC_SCLN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_rev41lp(
+    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
+    KC_ESC,     KC_A,  LALT_S,  LSFT_D,  LCTL_F,    KC_G,             KC_H,  RCTL_J,  RSFT_K,  RALT_L, KC_SCLN, KC_QUOT,
+    KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+                                        KC_LGUI,   LOWER, SPC_NAV,   RAISE,   FUNCT
+  ),
+
+  [_LOWER] = LAYOUT_rev41lp(
+    KC_GRV,  KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
+    _______, _______, _______, _______, _______, _______,          KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          KC_PSCR, _______, _______, _______, _______, _______,
+                                        _______, _______, _______, _______, _______
+  ),
+
+  [_RAISE] = LAYOUT_rev41lp(
+    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_GRV,  KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          KC_PSCR, _______, _______, _______, _______, _______,
+                                        _______, _______, _______, _______, _______
+  ),
+
+  [_NAVIG] = LAYOUT_rev41lp(
+    KC_DEL,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_DEL,
+    _______, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,   KC_NO,
+    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,          _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______,
+                                        _______, _______, _______, _______, _______
+  ),
+
+  [_FUNCTION] = LAYOUT_rev41lp(
+    KC_DEL,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_DEL,
+    _______, _______, _______, _______, _______, _______,            KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+    _______, _______, KC_LGUI, KC_LALT, KC_CAPS, _______,            KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+                                        _______, _______, _______, _______, _______
+  ),
+
+    [_ADJUST] = LAYOUT_rev41lp(
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  BL_DEC, BL_TOGG,          BL_BRTG,  BL_INC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                                        _______, _______, _______, _______, _______
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LGUI_A:
+        case RGUI_SCLN:
+        case LALT_S:
+        case RALT_L:
+        case LCTL_F:
+        case RCTL_J:
+        case SPC_NAV:
+            return 225;
+        default:
+            return TAPPING_TERM;
+    }
+}
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 @cyril279
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_rev41lp(
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               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_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_SLSH,  RSFT_T(KC_ENT),
+                                            KC_LALT,   MO(1),    KC_SPC,   MO(2),    KC_LGUI
+  ),
+
+  [1] = LAYOUT_rev41lp(
+    _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,    KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_DEL,
+    _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,   KC_PIPE,            KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_GRV,   KC_TILD,
+    _______,  KC_ESC,   KC_LGUI,  KC_LALT,  KC_CAPS,   KC_DQUO,            KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  KC_PSCR,  RSFT_T(KC_SPC),
+                                            _______,   _______,  KC_ENT,   MO(3),  _______
+  ),
+
+  [2] = LAYOUT_rev41lp(
+    _______,  KC_1,     KC_2,     KC_3,     KC_4,      KC_5,               KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
+    _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,   KC_BSLS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,
+    _______,  KC_ESC,   KC_RGUI,  KC_RALT,  KC_CAPS,   KC_QUOT,            KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+                                            _______,   MO(3),  KC_BSPC,  _______,  _______
+  ),
+
+  [3] = LAYOUT_rev41lp(
+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,            RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                               _______, _______, _______,  _______,  _______
+  )
+};
+
@@ -0,0 +1,43 @@
+/* Copyright 2022 Jan Lindblom (@janlindblom)
+ *
+ * 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
+
+#undef BACKLIGHT_LEVELS
+#define BACKLIGHT_LEVELS 11
+#undef BACKLIGHT_LIMIT_VAL
+#define BACKLIGHT_LIMIT_VAL 255
+#define BACKLIGHT_DEFAULT_LEVEL 3
+
+#define COMBO_COUNT 3
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_MAC, UC_LNX
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200
+#define TAPPING_TERM_PER_KEY
+
+#define LAYER_STATE_8BIT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* key combination for command */
+#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
@@ -0,0 +1,176 @@
+/* Copyright 2022 Jan Lindblom (@janlindblom)
+ *
+ * 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
+#include "keymap_swedish.h"
+#include "sendstring_swedish.h"
+
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+enum custom_keycodes {
+    SK_NOT_EQL = SAFE_RANGE,
+    SK_LEQ,
+    SK_GEQ,
+};
+
+// Custom send_string keys
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case SK_NOT_EQL:
+            if (record->event.pressed) {
+                SEND_STRING("!=");
+            }
+            break;
+        case SK_LEQ:
+            if (record->event.pressed) {
+                SEND_STRING("<=");
+            }
+            break;
+        case SK_GEQ:
+            if (record->event.pressed) {
+                SEND_STRING(">=");
+            }
+            break;
+    }
+    return true;
+}
+
+// Combos, if enabled
+#ifdef COMBO_ENABLE
+enum combo_events {
+    ZC_COPY,
+    XV_PASTE,
+    ZX_CUT,
+};
+
+const uint16_t PROGMEM copy_combo[]  = {KC_Z, KC_C, COMBO_END};
+const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
+const uint16_t PROGMEM cut_combo[]   = {KC_Z, KC_X, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+    [ZC_COPY]  = COMBO_ACTION(copy_combo),
+    [XV_PASTE] = COMBO_ACTION(paste_combo),
+    [ZX_CUT]   = COMBO_ACTION(cut_combo),
+};
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    switch (combo_index) {
+        case ZC_COPY:
+            if (pressed) {
+                tap_code16(LCTL(KC_C));
+            }
+            break;
+        case XV_PASTE:
+            if (pressed) {
+                tap_code16(LCTL(KC_V));
+            }
+            break;
+        case ZX_CUT:
+            if (pressed) {
+                tap_code16(LCTL(KC_X));
+            }
+            break;
+    }
+}
+#endif
+
+// Tap Dance definitions
+#ifdef TAP_DANCE_ENABLE
+enum dances {
+    TD_SHFT_CAPS,
+    TD_DOT_COL,
+    TD_COM_SCL,
+    TD_DASH_USCR,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for Shift, twice for Caps Lock
+    [TD_SHFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
+    [TD_COM_SCL]   = ACTION_TAP_DANCE_DOUBLE(KC_COMM, SE_SCLN),
+    [TD_DOT_COL]   = ACTION_TAP_DANCE_DOUBLE(KC_DOT, SE_COLN),
+    [TD_DASH_USCR] = ACTION_TAP_DANCE_DOUBLE(SE_MINS, S(SE_MINS)),
+};
+#    define CK_LSFT TD(TD_SHFT_CAPS)
+#    define CK_COMM TD(TD_COM_SCL)
+#    define CK_DOT TD(TD_DOT_COL)
+#    define CK_DASH TD(TD_DASH_USCR)
+#else
+#    define CK_LSFT KC_LSFT
+#    define CK_COMM KC_COMM
+#    define CK_DOT KC_DOT
+#    define CK_DASH SE_MINS
+#endif
+
+// Some defines for the keys below
+#define CK_ESC LT(_RAISE, KC_ESC)
+#define CK_BSPC LCTL_T(KC_BSPC)
+#define CK_DEL LALT_T(KC_DEL)
+#define CK_ENT1 LT(_LOWER, KC_ENT)
+#define CK_ENT2 LT(_RAISE, KC_ENT)
+#define CK_TAB RALT_T(KC_TAB)
+#define CK_ADIA RCTL_T(SE_ADIA)
+#define CK_QUOT RSFT_T(SE_QUOT)
+#define CK_SPC RSFT_T(KC_SPC)
+
+// Alt + [-] => – (en-dash)
+const key_override_t mins_ndash_override = ko_make_basic(MOD_MASK_ALT, SE_MINS, UC(0x2013));
+ // Shift + Alt + [-] => — (em-dash)
+const key_override_t mins_mdash_override = ko_make_basic(MOD_MASK_SA, SE_MINS, UC(0x2014));
+
+const key_override_t **key_overrides = (const key_override_t *[]){
+    &mins_ndash_override,
+    &mins_mdash_override,
+    NULL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_rev41lp(
+    CK_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  SE_ARNG,
+    CK_BSPC,  KC_A,     KC_S,     KC_D,     KC_F,      KC_G,               KC_H,     KC_J,     KC_K,     KC_L,  SE_ODIA,  CK_ADIA,
+    CK_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,               KC_N,     KC_M,  SE_COMM,   SE_DOT,  SE_MINS,  CK_QUOT,
+                                          CK_DEL,   CK_ENT1,  KC_SPC,   CK_ENT2,   CK_TAB
+  ),
+
+  [_LOWER] = LAYOUT_rev41lp(
+ SK_NOT_EQL,  SE_EXLM,    SE_AT,  SE_HASH,   SE_DLR,   SE_PERC,            SE_CIRC,  SE_AMPR,  SE_ASTR,  SE_LPRN,  SE_RPRN,  SE_DIAE,
+     SK_LEQ,  SE_UNDS,  SE_PLUS,  SE_LCBR,  SE_RCBR,   SE_PIPE,            KC_LEFT,  KC_DOWN,    KC_UP,  KC_RGHT,   SE_GRV,  SE_TILD,
+     SK_GEQ,   KC_ESC,  KC_LGUI,  KC_LALT,  KC_CAPS,   SE_DQUO,            KC_HOME,   KC_END,  KC_PGUP,  KC_PGDN,  KC_PSCR,   CK_SPC,
+                                            _______,   _______,  KC_ENT,   _______,  _______
+  ),
+
+  [_RAISE] = LAYOUT_rev41lp(
+    _______,     SE_1,     SE_2,     SE_3,     SE_4,      SE_5,               SE_6,   SE_7,   SE_8,    SE_9,    SE_0,  SE_GRV,
+    _______,  SE_MINS,   SE_EQL,  SE_LBRC,  SE_RBRC,   SE_BSLS,              KC_F1,  KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,
+    _______,   KC_ESC,  KC_RGUI,  KC_RALT,  KC_CAPS,   SE_ACUT,              KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
+                                            SE_LABK,   SE_RABK,  KC_BSPC,  _______,  _______
+  ),
+
+  [_ADJUST] = LAYOUT_rev41lp(
+    XXXXXXX,   XXXXXXX, XXXXXXX,   BL_OFF,   BL_DEC,   BL_TOGG,            BL_BRTG,   BL_INC,    BL_ON,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   XXXXXXX, XXXXXXX,  XXXXXXX,  XXXXXXX,   BL_STEP,            XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,   UC_M_WC, UC_M_MA,  UC_M_LN,  XXXXXXX,   XXXXXXX,            RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                                               _______, _______, _______,  _______,  _______
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
@@ -0,0 +1,3 @@
+# Namnlos custom keymap for Rev41lp
+
+This is a nordic keymap for the Rev41lp by [cyril](https://github.com/cyril279), it's based on the default keymap but has customisations for nordic languages.
@@ -0,0 +1,7 @@
+SLEEP_LED_ENABLE = yes
+NKRO_ENABLE = yes
+UNICODE_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+KEY_OVERRIDE_ENABLE = yes
+DEBOUNCE_TYPE = sym_defer_pk
+LTO_ENABLE = yes
@@ -0,0 +1,15 @@
+# The rev41lp keyboard
+
+![The rev41lp keyboard by cyril279](https://imgur.com/nZNHSaWh.jpg)
+
+Inspired by the REVIUNG series by Gtips, the rev41lp is 41-key column staggered keyboard designed for use with low-profile Kailh Choc (pg1350) switches.
+
+* Keyboard Maintainer: [cyril279](https://github.com/cyril279)
+* Hardware Supported: The REVlp PCBs, Pro Micro supported, bluetooth controller friendly.
+* Hardware Availability: [PCB Data](https://github.com/cyril279/keyboards/tree/main/revlp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make b_sides/rev41lp: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).
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 @cyril279
+
+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 "rev41lp.h"
@@ -0,0 +1,35 @@
+/*
+Copyright 2021 @cyril279
+
+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 LAYOUT_rev41lp( \
+    K00, K01, K02, K03, K04, K05,      K10, K11, K12, K13, K14, K15, \
+    K20, K21, K22, K23, K24, K25,      K30, K31, K32, K33, K34, K35, \
+    K40, K41, K42, K43, K44, K45,      K50, K51, K52, K53, K54, K55, \
+                        K60, K61, K62, K63, K64 \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05 }, \
+    { K10, K11, K12, K13, K14, K15 }, \
+    { K20, K21, K22, K23, K24, K25 }, \
+    { K30, K31, K32, K33, K34, K35 }, \
+    { K40, K41, K42, K43, K44, K45 }, \
+    { K50, K51, K52, K53, K54, K55 }, \
+    { K60, K61, K62, K63, K64, KC_NO } \
+}
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
@@ -12,6 +12,7 @@
        "nkro": true
    },
    "processor": "STM32F401",
+    "board": "BLACKPILL_STM32_F411",
    "url": "https://github.com/diepala/cantor",
    "usb": {
        "device_version": "1.0.0",
@@ -151,6 +151,77 @@
                {"x": 13.75,  "y": 4, "w": 1.25}
            ]
        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"x": 0,      "y": 0},
+                {"x": 1,      "y": 0},
+                {"x": 2,      "y": 0},
+                {"x": 3,      "y": 0},
+                {"x": 4,      "y": 0},
+                {"x": 5,      "y": 0},
+                {"x": 6,      "y": 0},
+                {"x": 7,      "y": 0},
+                {"x": 8,      "y": 0},
+                {"x": 9,      "y": 0},
+                {"x": 10,     "y": 0},
+                {"x": 11,     "y": 0},
+                {"x": 12,     "y": 0},
+                {"x": 13,     "y": 0},
+                {"x": 14,     "y": 0},
+
+                {"x": 0,      "y": 1, "w": 1.5},
+                {"x": 1.5,    "y": 1},
+                {"x": 2.5,    "y": 1},
+                {"x": 3.5,    "y": 1},
+                {"x": 4.5,    "y": 1},
+                {"x": 5.5,    "y": 1},
+                {"x": 6.5,    "y": 1},
+                {"x": 7.5,    "y": 1},
+                {"x": 8.5,    "y": 1},
+                {"x": 9.5,    "y": 1},
+                {"x": 10.5,   "y": 1},
+                {"x": 11.5,   "y": 1},
+                {"x": 12.5,   "y": 1},
+                {"x": 13.5,   "y": 1, "w": 1.5},
+
+                {"x": 0,      "y": 2, "w": 1.75},
+                {"x": 1.75,   "y": 2},
+                {"x": 2.75,   "y": 2},
+                {"x": 3.75,   "y": 2},
+                {"x": 4.75,   "y": 2},
+                {"x": 5.75,   "y": 2},
+                {"x": 6.75,   "y": 2},
+                {"x": 7.75,   "y": 2},
+                {"x": 8.75,   "y": 2},
+                {"x": 9.75,   "y": 2},
+                {"x": 10.75,  "y": 2},
+                {"x": 11.75,  "y": 2},
+                {"x": 12.75,  "y": 2, "w": 2.25},
+
+                {"x": 0,      "y": 3, "w": 2.25},
+                {"x": 2.25,   "y": 3},
+                {"x": 3.25,   "y": 3},
+                {"x": 4.25,   "y": 3},
+                {"x": 5.25,   "y": 3},
+                {"x": 6.25,   "y": 3},
+                {"x": 7.25,   "y": 3},
+                {"x": 8.25,   "y": 3},
+                {"x": 9.25,   "y": 3},
+                {"x": 10.25,  "y": 3},
+                {"x": 11.25,  "y": 3},
+                {"x": 12.25,  "y": 3, "w": 1.75},
+                {"x": 14,     "y": 3},
+
+                {"x": 0,      "y": 4, "w": 1.25},
+                {"x": 1.25,   "y": 4, "w": 1.25},
+                {"x": 2.5,    "y": 4, "w": 1.25},
+                {"x": 3.75,   "y": 4, "w": 6.25},
+                {"x": 10,     "y": 4, "w": 1.25},
+                {"x": 11.25,  "y": 4, "w": 1.25},
+                {"x": 12.5,   "y": 4, "w": 1.25},
+                {"x": 13.75,  "y": 4, "w": 1.25}
+            ]
+        },
        "LAYOUT_60_hhkb": {
            "layout": [
                {"x": 0,      "y": 0},
@@ -219,6 +290,76 @@
                {"x": 12.5,   "y": 4}
            ]
        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"x": 0,      "y": 0},
+                {"x": 1,      "y": 0},
+                {"x": 2,      "y": 0},
+                {"x": 3,      "y": 0},
+                {"x": 4,      "y": 0},
+                {"x": 5,      "y": 0},
+                {"x": 6,      "y": 0},
+                {"x": 7,      "y": 0},
+                {"x": 8,      "y": 0},
+                {"x": 9,      "y": 0},
+                {"x": 10,     "y": 0},
+                {"x": 11,     "y": 0},
+                {"x": 12,     "y": 0},
+                {"x": 13,     "y": 0, "w": 2},
+
+                {"x": 0,      "y": 1, "w": 1.5},
+                {"x": 1.5,    "y": 1},
+                {"x": 2.5,    "y": 1},
+                {"x": 3.5,    "y": 1},
+                {"x": 4.5,    "y": 1},
+                {"x": 5.5,    "y": 1},
+                {"x": 6.5,    "y": 1},
+                {"x": 7.5,    "y": 1},
+                {"x": 8.5,    "y": 1},
+                {"x": 9.5,    "y": 1},
+                {"x": 10.5,   "y": 1},
+                {"x": 11.5,   "y": 1},
+                {"x": 12.5,   "y": 1},
+
+                {"x": 0,      "y": 2, "w": 1.75},
+                {"x": 1.75,   "y": 2},
+                {"x": 2.75,   "y": 2},
+                {"x": 3.75,   "y": 2},
+                {"x": 4.75,   "y": 2},
+                {"x": 5.75,   "y": 2},
+                {"x": 6.75,   "y": 2},
+                {"x": 7.75,   "y": 2},
+                {"x": 8.75,   "y": 2},
+                {"x": 9.75,   "y": 2},
+                {"x": 10.75,  "y": 2},
+                {"x": 11.75,  "y": 2},
+                {"x": 12.75,  "y": 2},
+                {"x": 13.75,  "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0,      "y": 3, "w": 1.25},
+                {"x": 1.25,   "y": 3},
+                {"x": 2.25,   "y": 3},
+                {"x": 3.25,   "y": 3},
+                {"x": 4.25,   "y": 3},
+                {"x": 5.25,   "y": 3},
+                {"x": 6.25,   "y": 3},
+                {"x": 7.25,   "y": 3},
+                {"x": 8.25,   "y": 3},
+                {"x": 9.25,   "y": 3},
+                {"x": 10.25,  "y": 3},
+                {"x": 11.25,  "y": 3},
+                {"x": 12.25,  "y": 3, "w": 2.75},
+
+                {"x": 0,      "y": 4, "w": 1.25},
+                {"x": 1.25,   "y": 4, "w": 1.25},
+                {"x": 2.5,    "y": 4, "w": 1.25},
+                {"x": 3.75,   "y": 4, "w": 6.25},
+                {"x": 10,     "y": 4, "w": 1.25},
+                {"x": 11.25,  "y": 4, "w": 1.25},
+                {"x": 12.5,   "y": 4, "w": 1.25},
+                {"x": 13.75,  "y": 4, "w": 1.25}
+            ]
+        },
        "LAYOUT_60_iso_split_bs_rshift": {
            "layout": [
                {"x": 0,      "y": 0},
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -49,8 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 #define OPENDRAIN_INDICATORS
 #define LED_CAPS_LOCK_PIN A6

@@ -17,19 +17,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -17,5 +18,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
@@ -49,8 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 #define OPENDRAIN_INDICATORS
 #define LED_CAPS_LOCK_PIN A6

@@ -22,19 +22,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -17,5 +18,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
@@ -49,8 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 #define OPENDRAIN_INDICATORS
 #define LED_CAPS_LOCK_PIN C8

@@ -22,19 +22,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -50,8 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
@@ -22,19 +22,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -50,8 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
@@ -22,19 +22,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 #pragma once
+
 #define BACKLIGHT_PIN           A6
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
@@ -25,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BREATHING_PERIOD 5
 #define BACKLIGHT_ON_STATE 1

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 22
 #define RGBLIGHT_EFFECT_BREATHING
@@ -17,19 +17,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    72
-#define STM32_PLLP_VALUE                    2
-#define STM32_PLLQ_VALUE                    3
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1

 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = GENERIC_STM32_F411XE

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -0,0 +1,132 @@
+/*
+Copyright 2022 Yiancar
+
+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       0x8968
+#define PRODUCT_ID      0x5332
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         NEBULA12B
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 3
+
+#define MATRIX_ROW_PINS { B7, B4, F7, F6 }
+#define MATRIX_COL_PINS { F4, F5, D7 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+// #define MATRIX_HAS_GHOST
+
+/* 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
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB options */
+
+#define RGB_DI_PIN D5
+#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "NEBULA12B",
+    "url": "",
+    "maintainer": "yiancar",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}
+            ]
+        }
+    }
+}
@@ -0,0 +1,30 @@
+/* Copyright 2022 Yiancar
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_P7, KC_P8, KC_P9,
+    KC_P4, KC_P5, KC_P6,
+    KC_P1, KC_P2, KC_P3,
+    MO(1), KC_P0, KC_PDOT),
+
+[1] = LAYOUT_all( /* FN */
+    RGB_TOG, RGB_MOD, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_PENT)
+};
@@ -0,0 +1,7 @@
+# The default keymap for Nebula12B. VIA support disabled.
+
+![Layer 0](https://i.imgur.com/CoMteJW.png)
+
+![Layer 1](https://i.imgur.com/LbIPiJj.png)
+
+The full RGB control does not fit due to the small number of keys. Using VIA might be a good idea!
@@ -0,0 +1,42 @@
+/* Copyright 2022 Yiancar
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_P7, KC_P8, KC_P9,
+    KC_P4, KC_P5, KC_P6,
+    KC_P1, KC_P2, KC_P3,
+    MO(1), KC_P0, KC_PDOT),
+
+[1] = LAYOUT_all( /* FN */
+    RGB_TOG, RGB_MOD, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_PENT),
+
+[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS),
+};
@@ -0,0 +1,5 @@
+# The default keymap for Nebula12B. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/CoMteJW.png)
+
+![Layer 1](https://i.imgur.com/LbIPiJj.png)
@@ -0,0 +1 @@
+VIA_ENABLE = yes
@@ -0,0 +1,42 @@
+/* Copyright 2022 Yiancar
+ *
+ * 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 "nebula12b.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    { 13, 15,  1 }, 
+    {  4,  3,  2 }, 
+    {  5,  6,  7 }, 
+    { 11, 10,  9 }, 
+}, {
+    {224,  0 }, {224,  9 }, {224, 27 }, {112, 27 }, {  0,27 }, 
+    {  0, 46 }, {112, 46 }, {224, 46 }, {224, 55 }, {224,64 }, 
+    {112, 64 }, {  0, 64 }, {  0, 55 }, {  0,  9 }, {  0, 0 }, {112, 9 }
+}, {
+    2,
+    4, 4, 4, 4, 4, 4, 4,
+    2,
+    4, 4, 4,
+    2,
+    4,
+    2,
+    4
+} };
+// clang-format on
+#endif
+
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2022 Yiancar
 *
 * 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
@@ -13,25 +13,22 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
- */
-
 #pragma once

-#include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
+#define XXX KC_NO

-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_all( \
+    K00, K01, K02, \
+    K10, K11, K12, \
+    K20, K21, K22, \
+    K30, K31, K32 \
+) { \
+    { K00, K01, K02, }, \
+    { K10, K11, K12, }, \
+    { K20, K21, K22, }, \
+    { K30, K31, K32, }  \
+}
@@ -0,0 +1,32 @@
+# Nebula12B
+
+This is a micropad layout PCB. It supports VIA, full per-key RGB and underglow RGB. This is revision B.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A micropad with ATMEGA32U4
+* Hardware Availability: https://spaceholdings.net/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make spaceholdings/nebula12b: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make nebula12b:<keymap>:flash`)
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
+RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
+
+LTO_ENABLE = yes
@@ -1,4 +1,4 @@
-# The default keymap for Nebula68. VIA support disabled.
+# The default keymap for Nebula68B. VIA support disabled.

 ![Layer 0](https://i.imgur.com/dXyRwb1.png)

@@ -1,4 +1,4 @@
-# The default keymap for Nebula68. VIA support enabled.
+# The default keymap for Nebula68B. VIA support enabled.

 ![Layer 0](https://i.imgur.com/dXyRwb1.png)

@@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 - Unplug
 - Hold Escape
 - Plug In
- Flash using QMK Toolbox or dfu-util (`make nebula65b:<keymap>:flash`)
+- Flash using QMK Toolbox or dfu-util (`make nebula68b:<keymap>:flash`)
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
@@ -156,6 +156,18 @@ def _broken_module_imports(requirements):
    return False


+def _yesno(*args):
+    """Wrapper to only prompt if interactive
+    """
+    return sys.stdout.isatty() and yesno(*args)
+
+
+def _eprint(errmsg):
+    """Wrapper to print to stderr
+    """
+    print(errmsg, file=sys.stderr)
+
+
 # Make sure our python is new enough
 #
 # Supported version information
@@ -177,7 +189,7 @@ def _broken_module_imports(requirements):
 # void: 3.9

 if sys.version_info[0] != 3 or sys.version_info[1] < 7:
-    print('Error: Your Python is too old! Please upgrade to Python 3.7 or later.')
+    _eprint('Error: Your Python is too old! Please upgrade to Python 3.7 or later.')
    exit(127)

 milc_version = __VERSION__.split('.')
@@ -185,7 +197,7 @@ milc_version = __VERSION__.split('.')
 if int(milc_version[0]) < 2 and int(milc_version[1]) < 4:
    requirements = Path('requirements.txt').resolve()

-    print(f'Your MILC library is too old! Please upgrade: python3 -m pip install -U -r {str(requirements)}')
+    _eprint(f'Your MILC library is too old! Please upgrade: python3 -m pip install -U -r {str(requirements)}')
    exit(127)

 # Make sure we can run binaries in the same directory as our Python interpreter
@@ -195,7 +207,7 @@ if python_dir not in os.environ['PATH'].split(':'):
    os.environ['PATH'] = ":".join((python_dir, os.environ['PATH']))

 # Check to make sure we have all our dependencies
-msg_install = f'Please run `{sys.executable} -m pip install -r %s` to install required python dependencies.'
+msg_install = f'\nPlease run `{sys.executable} -m pip install -r %s` to install required python dependencies.'
 args = sys.argv[1:]
 while args and args[0][0] == '-':
    del args[0]
@@ -204,24 +216,20 @@ safe_command = args and args[0] in safe_commands

 if not safe_command:
    if _broken_module_imports('requirements.txt'):
-        if yesno('Would you like to install the required Python modules?'):
+        if _yesno('Would you like to install the required Python modules?'):
            _install_deps('requirements.txt')
        else:
-            print()
-            print(msg_install % (str(Path('requirements.txt').resolve()),))
-            print()
+            _eprint(msg_install % (str(Path('requirements.txt').resolve()),))
            exit(1)

    if cli.config.user.developer and _broken_module_imports('requirements-dev.txt'):
-        if yesno('Would you like to install the required developer Python modules?'):
+        if _yesno('Would you like to install the required developer Python modules?'):
            _install_deps('requirements-dev.txt')
-        elif yesno('Would you like to disable developer mode?'):
+        elif _yesno('Would you like to disable developer mode?'):
            _run_cmd(sys.argv[0], 'config', 'user.developer=None')
        else:
-            print()
-            print(msg_install % (str(Path('requirements-dev.txt').resolve()),))
-            print('You can also turn off developer mode: qmk config user.developer=None')
-            print()
+            _eprint(msg_install % (str(Path('requirements-dev.txt').resolve()),))
+            _eprint('You can also turn off developer mode: qmk config user.developer=None')
            exit(1)

 # Import our subcommands
@@ -231,6 +239,6 @@ for subcommand in subcommands:

    except (ImportError, ModuleNotFoundError) as e:
        if safe_command:
-            print(f'Warning: Could not import {subcommand}: {e.__class__.__name__}, {e}')
+            _eprint(f'Warning: Could not import {subcommand}: {e.__class__.__name__}, {e}')
        else:
            raise
@@ -12,7 +12,7 @@ from pygments.token import Token
 from pygments import lex

 import qmk.path
-from qmk.keyboard import find_keyboard_from_dir, rules_mk
+from qmk.keyboard import find_keyboard_from_dir, rules_mk, keyboard_folder
 from qmk.errors import CppError

 # The `keymap.c` template to use when a keyboard doesn't have its own
@@ -357,7 +357,7 @@ def locate_keymap(keyboard, keymap):
    checked_dirs = ''
    keymap_path = ''

-    for dir in keyboard.split('/'):
+    for dir in keyboard_folder(keyboard).split('/'):
        if checked_dirs:
            checked_dirs = '/'.join((checked_dirs, dir))
        else:
@@ -20,17 +20,17 @@ _Static_assert((QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE > 0) && (QUANTUM_PAINTER_PIX
 //

 // Buffer used for transmitting native pixel data to the downstream device.
-uint8_t qp_internal_global_pixdata_buffer[QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE];
+__attribute__((__aligned__(4))) uint8_t qp_internal_global_pixdata_buffer[QUANTUM_PAINTER_PIXDATA_BUFFER_SIZE];

 // Static buffer to contain a generated color palette
-static bool       generated_palette = false;
-static int16_t    generated_steps   = -1;
-static qp_pixel_t interpolated_fg_hsv888;
-static qp_pixel_t interpolated_bg_hsv888;
+static bool                                       generated_palette = false;
+static int16_t                                    generated_steps   = -1;
+__attribute__((__aligned__(4))) static qp_pixel_t interpolated_fg_hsv888;
+__attribute__((__aligned__(4))) static qp_pixel_t interpolated_bg_hsv888;
 #if QUANTUM_PAINTER_SUPPORTS_256_PALETTE
-qp_pixel_t qp_internal_global_pixel_lookup_table[256];
+__attribute__((__aligned__(4))) qp_pixel_t qp_internal_global_pixel_lookup_table[256];
 #else
-qp_pixel_t qp_internal_global_pixel_lookup_table[16];
+__attribute__((__aligned__(4))) qp_pixel_t qp_internal_global_pixel_lookup_table[16];
 #endif

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Author	SHA1	Message	Date
Nick Brassel	c8fbfca1b6	[QP] Explicit buffer alignment. (#17532 )	2022-07-02 13:22:46 +10:00
Joel Challis	9d70162d53	Allow locate_keymap to handle DEFAULT_FOLDER (#17529 )	2022-07-01 22:20:32 +01:00
Joel Challis	2757251218	Specify blackpill board files where relevant (#17521 )	2022-07-01 15:38:57 +01:00
Joel Challis	d978432812	Swap over F4x1 8MHz HSE boards over from blackpill board files (#17520 )	2022-07-01 15:36:08 +01:00
yiancar	1e643ba1d1	[Keyboard] Nebula12b (#17308 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: yiancar <yiancar@gmail.com>	2022-06-30 23:11:13 -07:00
Jan Lindblom	38ca5e95e1	Adding Rev41lp keyboard (#15895 ) * [keyboard] Add rev41lp * [keymap] rev41lp: More layer, less clutter * [keymap] rev41lp:whitespace cleanup * [keymap] rev41lp: Remove outer shift & edit homerow timings left-ctrl < left-shift kc-enter < kc-sftent lower + tab = grave raise + tab = tilde * Initial namnlos keymap for rev41lp. * Updated according to PR checklist. * Update keyboards/b_sides/rev41lp/config.h Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/rules.mk Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Update keyboards/b_sides/rev41lp/keymaps/default/keymap.c Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Updated to fulfill PR checklist. * Update keyboards/b_sides/rev41lp/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/keymaps/cyril/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/keymaps/cyril/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/b_sides/rev41lp/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/b_sides/rev41lp/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/b_sides/rev41lp/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/b_sides/rev41lp/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Adding picture. * Rename README.md to readme.md * Cleaning up in rules.mk. * Moving en- and em-dash from dedicated keys. * Readme fixup. There was a typo in the title, also changed the description a little. * Update keyboards/b_sides/rev41lp/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/b_sides/rev41lp/keymaps/namnlos/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: cyril279 <cyril.x9@gmail.com> Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2022-07-01 13:02:07 +10:00
James Young	f2f2a7ace9	Add missing QMK Configurator layout data for chlx str.merro60 (#17518 ) * add LAYOUT_60_ansi_split_bs_rshift layout data * add LAYOUT_60_iso layout data	2022-06-30 23:39:49 +01:00
James Young	c1d4950938	Add QMK Configurator layout data for ADM42 rev4 (#17515 )	2022-06-30 20:10:15 +01:00
Joel Challis	7326a0051b	Allow module check to error out when piped to /dev/null (#17505 )	2022-06-30 00:33:59 +01:00