Merge remote-tracking branch 'origin/master' into develop

2 files changed, 9 insertions, 11 deletions

diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c
index 98c349b2e8..9f6622c7d5 100644
--- a/layouts/community/ortho_5x12/drashna/keymap.c
+++ b/layouts/community/ortho_5x12/drashna/keymap.c
@@ -24,17 +24,17 @@
  * of use. K## is a placeholder to pass through the individual keycodes
  */
 // clang-format off
+#define LAYOUT_ortho_5x12_wrapper(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x12_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,  \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A  \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_ortho_5x12_wrapper( \
-    KC_ESC,  K01,    K02,     K03,      K04,     K05,     K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
-    LALT_T(KC_TAB), K11, K12, K13,      K14,     K15,     K16,     K17,     K18,     K19,     K1A,     KC_BSPC, \
-    KC_C1R3, K21,    K22,     K23,      K24,     K25,     K26,     K27,     K28,     K29,     K2A, RALT_T(KC_QUOT), \
-    KC_MLSF, CTL_T(K31), K32, K33,      K34,     K35,     K36,     K37,     K38,     K39, RCTL_T(K3A), KC_ENT,  \
+    KC_ESC,  ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_BSPC, \
+    LALT_T(KC_TAB), K01, K02, K03,      K04,     K05,     K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
+    KC_C1R3, K11,    K12,     K13,      K14,     K15,     K16,     K17,     K18,     K19,     K1A, RALT_T(K1B), \
+    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     K26,     K27,     K28,     K29, RCTL_T(K2A), KC_ENT,  \
     KC_NO,   OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
   )
 
@@ -44,28 +44,24 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_QWERTY] = LAYOUT_ortho_5x12_base_wrapper(
-  ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
   _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
   _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
   _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
 ),
 
 [_COLEMAK] = LAYOUT_ortho_5x12_base_wrapper(
-  ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
   _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
   _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
   _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
 ),
 
 [_DVORAK] = LAYOUT_ortho_5x12_base_wrapper(
-  ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
   _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
   _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
   _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
 ),
 
 [_WORKMAN] = LAYOUT_ortho_5x12_base_wrapper(
-  ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________,
   _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
   _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
   _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk
index 2c59c614fe..af68e04c01 100644
--- a/layouts/community/ortho_5x12/drashna/rules.mk
+++ b/layouts/community/ortho_5x12/drashna/rules.mk
@@ -9,6 +9,8 @@ NKRO_ENABLE       = yes
 ifeq ($(strip $(KEYBOARD)), fractal)
     RGB_MATRIX_ENABLE           = no
     AUDIO_ENABLE                = yes
+    AUDIO_SUPPORTED             = yes
+    RGBLIGHT_SUPPORTED          = yes
     RGBLIGHT_ENABLE             = yes
     RGBLIGHT_TWINKLE            = yes
     RGBLIGHT_STARTUP_ANIMATION  = yes