Updates to drashna keymaps and userspace (#2093)

* Add "secret" macor

* Updating secret macros

* Re-add RGB to Ergodox

* Fixed issue when RGB was disabled

* Consistency changes

* Updated bootloader macro

* Fixing audio setup

* Fix bootloader typo

* Update to full list of stings (for completeness)

* Template fix

* Finally got woodpad to force numlock

* Fix for new RGB mode

4 files changed, 64 insertions, 36 deletions

diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 1bf029163c..b7ca84fafa 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 #include "action.h"
 #include "version.h"
+#include "sensitive.h"
 
 #ifdef TAP_DANCE_ENABLE
 //define diablo macro timer variables
@@ -78,6 +79,14 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 };
 #endif
 
+#ifdef AUDIO_ENABLE
+float tone_qwerty[][2]       = SONG(QWERTY_SOUND);
+float tone_dvorak[][2]       = SONG(DVORAK_SOUND);
+float tone_colemak[][2]      = SONG(COLEMAK_SOUND);
+float tone_workman[][2]      = SONG(PLOVER_SOUND);
+float tone_hackstartup[][2]  = SONG(ONE_UP_SOUND);
+#endif
+
 
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
@@ -138,6 +147,11 @@ void matrix_init_user(void) {
     rgblight_mode(5);
   }
 #endif
+#ifdef AUDIO_ENABLE
+//  _delay_ms(21); // gets rid of tick
+//  stop_all_notes();
+//  PLAY_SONG(tone_hackstartup);
+#endif
   matrix_init_keymap();
 }
 #ifdef TAP_DANCE_ENABLE
@@ -190,13 +204,6 @@ void led_set_user(uint8_t usb_led) {
 }
 
 
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_workman[][2]    = SONG(PLOVER_SOUND);
-#endif
-
 
 void persistent_default_layer_set(uint16_t default_layer) {
   eeconfig_update_default_layer(default_layer);
@@ -427,28 +434,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #endif
   case KC_MAKE:
     if (!record->event.pressed) {
-      SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
-#ifndef BOOTLOADER_CATERINA
-      SEND_STRING(":teensy ");
-#else
-      SEND_STRING(" ");
+      SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP
+#if  (defined(BOOTLOADER_DFU) || defined(BOOTLOADER_LUFA_DFU) || defined(BOOTLOADER_QMK_DFU))
+       ":dfu"
+#elif defined(BOOTLOADER_HALFKAY)
+      ":teensy"
+#elif defined(BOOTLOADER_CATERINA)
+       ":avrdude"
 #endif
 #ifdef RGBLIGHT_ENABLE
-      SEND_STRING("RGBLIGHT_ENABLE=yes ");
+        " RGBLIGHT_ENABLE=yes"
 #else
-      SEND_STRING("RGBLIGHT_ENABLE=no ");
+        " RGBLIGHT_ENABLE=no"
 #endif
 #ifdef AUDIO_ENABLE
-      SEND_STRING("AUDIO_ENABLE=yes ");
+        " AUDIO_ENABLE=yes"
 #else
-      SEND_STRING("AUDIO_ENABLE=no ");
+        " AUDIO_ENABLE=no"
 #endif
 #ifdef FAUXCLICKY_ENABLE
-      SEND_STRING("FAUXCLICKY_ENABLE=yes ");
+        " FAUXCLICKY_ENABLE=yes"
 #else
-      SEND_STRING("FAUXCLICKY_ENABLE=no ");
+        " FAUXCLICKY_ENABLE=no" 
 #endif
-      SEND_STRING(SS_TAP(X_ENTER));
+        SS_TAP(X_ENTER));
     }
     return false;
     break;
@@ -475,33 +484,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return false;
     break;
+  case KC_SECRET_1 ... KC_SECRET_5:
+    if (!record->event.pressed) {
+      send_string(secret[keycode - KC_SECRET_1]);
+    }
+    return false;
+    break;
   case KC_RGB_T:  // Because I want the option to go back to normal RGB mode rather than always layer indication
+#ifdef RGBLIGHT_ENABLE
     if (record->event.pressed) {
       rgb_layer_change = !rgb_layer_change;
     }
+#endif
     return false;
     break;
-  case RGB_MOD:
-  case RGB_SMOD:
-  case RGB_HUI:
-  case RGB_HUD:
-  case RGB_SAI:
-  case RGB_SAD:
-  case RGB_VAI:
-  case RGB_VAD:
-  case RGB_MODE_PLAIN:
-  case RGB_MODE_BREATHE:
-  case RGB_MODE_RAINBOW:
-  case RGB_MODE_SWIRL:
-  case RGB_MODE_SNAKE:
-  case RGB_MODE_KNIGHT:
-  case RGB_MODE_XMAS:
-  case RGB_MODE_GRADIENT:
-    if (record->event.pressed) {
+#ifdef RGBLIGHT_ENABLE
+  case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // quantum_keycodes.h L400 for definitions
+    if (record->event.pressed) { //This disrables layer indication, as it's assumed that if you're changing this ... you want that disabled
       rgb_layer_change = false;
     }
     return true;
     break;
+#endif
   }
   return process_record_keymap(keycode, record);
 }
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 002af3dd43..4fd42acb90 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USERSPACE
 
 #include "quantum.h"
+#include "song_list.h"
 
 // Define layer names 
 #define _QWERTY 0
@@ -86,6 +87,11 @@ enum userrpace_custom_keycodes {
   KC_MAKE,
   KC_RESET,
   KC_RGB_T,
+  KC_SECRET_1,
+  KC_SECRET_2,
+  KC_SECRET_3,
+  KC_SECRET_4,
+  KC_SECRET_5,
   NEW_SAFE_RANGE //use "NEWPLACEHOLDER for keymap specific codes
 };
 
@@ -99,6 +105,10 @@ enum {
 #endif
 
 
+#define QMK_KEYS_PER_SCAN 4
 
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_SLEEP
+#endif
 
 #endif
diff --git a/users/drashna/sensitive.h b/users/drashna/sensitive.h
new file mode 100644
index 0000000000..bf47263bd6
--- /dev/null
+++ b/users/drashna/sensitive.h
@@ -0,0 +1,8 @@
+const char secret[][64] = {
+  "test1",
+  "test2",
+  "test3",
+  "test4",
+  "test5"
+};
+
diff --git a/users/drashna/template.c b/users/drashna/template.c
index 37f3233dfc..20dbb96d7f 100644
--- a/users/drashna/template.c
+++ b/users/drashna/template.c
@@ -21,6 +21,8 @@ __attribute__ ((weak))
 uint32_t layer_state_set_keymap (uint32_t state) {
   return state;
 }
+__attribute__ ((weak))
+void led_set_keymap(uint8_t usb_led) {}
 
 // Call user matrix init, then call the keymap's init function
 void matrix_init_user(void) {
@@ -82,3 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 uint32_t layer_state_set_user (uint32_t state) {
   return layer_state_set_keymap (state);
 }
+
+void led_set_user(uint8_t usb_led) {
+   led_set_keymap(usb_led);
+}