Rework drashna userspace to be more modular (#4544)

* Break up files to make more readable

* Add comments to ortho 4x12 layout rules.mk

* Small tweaks

* Update GitLab CI scripts

* Make ortho boards smaller

layouts/community/ortho_4x12/drashna/config.h

@@ -31,11 +31,11 @@
 #define EE_HANDS
 #endif
 
-#if defined(KEYBOARD_planck_rev5)
+#if !defined(KEYBOARD_planck_light)
 #ifdef RGBLIGHT_ENABLE
 #define NO_MUSIC_MODE
 #endif // RGBLIGHT_ENABLE
-#endif // KEYBOARD_planck_rev5
+#endif // KEYBOARD_planck_light
 
 
 /*

layouts/community/ortho_4x12/drashna/rules.mk

@@ -5,12 +5,12 @@ CONSOLE_ENABLE    = no         # Console for debug(+400)
 COMMAND_ENABLE    = no        # Commands for debug and configuration
 TAP_DANCE_ENABLE  = no
 AUDIO_ENABLE      = yes
-ifeq (,$(findstring planck/rev6,$(KEYBOARD)))
+ifeq (,$(findstring planck/rev6,$(KEYBOARD))) # Make sure it's NOT the Planck Rev6
   RGBLIGHT_ENABLE   = yes
   INDICATOR_LIGHTS  = yes
   RGBLIGHT_TWINKLE  = yes
 endif
-ifneq (,$(findstring planck/light,$(KEYBOARD)))
+ifneq (,$(findstring planck/light,$(KEYBOARD))) # Make sure it IS the Planck Light
   RGB_MATRIX_ENABLE   = yes
   RGBLIGHT_ENABLE     = no
 endif
@@ -23,4 +23,3 @@ endif
 
 
 MACROS_ENABLED    = no
-

users/drashna/.gitlab-ci.yml

@@ -13,7 +13,7 @@ qmk_firmware:
     - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util diffutils gcc gcc-arm-none-eabi gcc-avr git libnewlib-arm-none-eabi unzip wget zip
     - avr-gcc --version
   script:
-    - make iris/rev2:drashna iris/rev2:drashna_old ergodox_ez:drashna viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna
+    - make iris/rev2:drashna:production iris/rev2:drashna_old:production ergodox_ez:drashna ergodox_ez:drashna_glow viterbi/rev1:drashna:production orthodox/rev1:drashna:production orthodox/rev3:drashna:production crkbd:drashna:production planck/light:drashna:production
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:

users/drashna/config.h

@@ -3,7 +3,7 @@
 
 #ifdef AUDIO_ENABLE
 #define AUDIO_CLICKY
-#define STARTUP_SONG SONG(E1M1_DOOM)
+#define STARTUP_SONG SONG(RICK_ROLL)
 #define GOODBYE_SONG  SONG(SONIC_RING)
 #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
                                   SONG(COLEMAK_SOUND), \
@@ -44,7 +44,7 @@
 // and when this option isn't enabled, z rapidly followed by x
 // actually sends Ctrl-x. That's bad.)
 #define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
+#undef PERMISSIVE_HOLD
 //#define TAPPING_FORCE_HOLD
 //#define RETRO_TAPPING