Fix up the ARM audio support (#2136 )

* Get audio working on clueboard/60 * add keys for music mode * Change doubles to floats * add keys for all the songs * revert to the default startup sound * Remove music mode until we can figure out why it crashes
Update info.json
2018-01-13 23:38:25 -05:00 · 2018-01-12 20:24:48 -08:00 · 2018-01-12 20:47:39 -05:00 · 2018-01-12 13:25:05 -05:00 · 2018-01-12 13:24:30 -05:00 · 2018-01-12 13:23:38 -05:00
26 changed files with 1570 additions and 177 deletions
--- a/common_features.mk
+++ b/common_features.mk
@@ -34,7 +34,11 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
    OPT_DEFS += -DAUDIO_ENABLE
    MUSIC_ENABLE := 1
    SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
-    SRC += $(QUANTUM_DIR)/audio/audio.c
+    ifeq ($(PLATFORM),AVR)
+        SRC += $(QUANTUM_DIR)/audio/audio.c
+    else
+        SRC += $(QUANTUM_DIR)/audio/audio_arm.c
+    endif
    SRC += $(QUANTUM_DIR)/audio/voices.c
    SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
--- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
@@ -0,0 +1,389 @@
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include "chimera_ortho.h"
+#include "action_layer.h"
+#include "version.h"
+#include "process_keycode/process_tap_dance.h"
+#include "gordon.h"
+
+// 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.
+
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+#define KC_SNAPLEFT LGUI(KC_LEFT)
+#define KC_SNAPRIGHT LGUI(KC_RIGHT)
+#define KC_SNAPUP LGUI(KC_UP)
+#define KC_SNAPDOWN LGUI(KC_DOWN)
+#define KC_PREVTAB LCTL(LSFT(KC_TAB))
+#define KC_NEXTTAB LCTL(KC_TAB)
+#define KC_WORKRIGHT LCTL(LGUI(KC_RIGHT))
+#define KC_WORKLEFT LCTL(LGUI(KC_LEFT))
+
+#define KC_NMPD TG(_NUMPAD)
+#define KC_SYMB TG(_SYMBOLS)
+
+#define KC_SCTL MT(MOD_LCTL, KC_LBRC)
+#define KC_SCTR MT(MOD_LCTL, KC_RBRC)
+#define KC_SPLT MT(MOD_LALT, KC_MINS)
+#define KC_SPRT MT(MOD_LALT, KC_1)
+#define KC_GBRC MT(MOD_RGUI, KC_8)
+#define KC_GQOT MT(MOD_LGUI, KC_QUOT)
+#define KC_CSHW MT(MOD_LCTL|MOD_LSFT,KC_W)
+
+#define KC_CDEL LCTL(KC_DEL)
+#define KC_AUDUP KC_AUDIO_VOL_UP
+#define KC_AUDOWN KC_AUDIO_VOL_DOWN
+
+
+#define KC_MEHS MEH_T(KC_S)
+#define KC_MEHL MEH_T(KC_L)
+#define KC_GWIN GUI_T(KC_G)
+#define KC_FCTL CTL_T(KC_F)
+#define KC_JCTL CTL_T(KC_J)
+#define KC_ZCTL CTL_T(KC_Z)
+#define KC_ALTV ALT_T(KC_V)
+#define KC_ALTN ALT_T(KC_N)
+#define KC_MEHX ALL_T(KC_X)
+#define KC_RESET RESET
+
+//LTs
+#define KC_MESC LT(_MACROS, KC_ESC)
+#define KC_DNUM LT(_NUMPAD, KC_D)
+#define KC_SPFN LT(_NAV,KC_EQL)
+#define KC_EMAUS LT(_MOUSE,KC_E)
+#define KC_ENAV LT(_NAV,KC_E)
+#define KC_INAV LT(_TEXTNAV,KC_I)
+#define KC_BSPSYM LT(_SYMBOLS,KC_BSPACE)
+#define KC_ENTSYM LT(_SYMBOLS,KC_ENTER)
+#define KC_CLNMAUS LT(_MOUSE,KC_SCOLON)
+
+#define KC_FUNC TT(_FUNCTION)
+
+//TAP DANCE
+#define KC_F6F7 TD(F6F7)
+#define KC_ALF4 TD(ALTF4)
+#define KC_TTT TD(TTT)
+#define KC_ENHM TD(HOME_END)
+#define KC_CLPS TD(CALC_PRINTSCREEN)
+
+
+#define KC_INCL M(0)
+#define KC_PULL M(1)
+#define KC_PUSH M(2)
+#define KC_SCAP M(3)
+#define KC_SCOF M(4)
+#define KC_CAD LALT(LCTL(KC_DEL))
+
+#define LONGPRESS_DELAY 150
+//#define LAYER_TOGGLE_DELAY 300
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+#define KC_ KC_TRNS 
+
+/* TODO: 
+ *
+ * DONE: RESET and CAD into macro layer.
+ * DONE: WINUP AND WINDOWN in NAV layer
+ * DONE: Get rid of caps layer. not sure what it is even for.
+ * DONE: LMEH
+ * DONE: plus, divide, multiply on left hand for num layer
+ * DONE: F1 - F12 on a layer toggle (not a temp toggle but a one shot or something)
+ * DONE: Volume, page up and down for mouse layer.
+ * DONE: Add full user files - without using anything.
+ * DONE: Insert, ctrl delete
+ * DONE: Home and End
+ * DONE: Printscreen
+
+ * Easier way to open new terminal (instead of alt + F2)
+ * Intellij/text navigation layer (ctrl delete could be here).
+ * Macro for "System.exit(0)" probably macro layer and "c"
+ * Some sort of tap dance for comma, H, right pinky, and possibly other corners.
+ * Something more with the right hand. not sure what.
+ * Mouse: Left scroll, right scroll
+ * Passwords and any other macros.
+ * LED for control
+ * All modifiers reset
+ * Russain layer
+ * Hebrew layer
+ * Get rid of stupid git pull and push macros.
+ * 
+*/
+
+//Tap dance enums
+enum {
+  F12ETAPS = 0,
+  CALCCOMP,
+  ALTF4,
+  F6F7,
+  TTT,
+  HOME_END,
+  CALC_PRINTSCREEN
+};
+
+static xtap ttt_state = { 
+  .is_press_action = true,
+  .state = 0
+};
+
+
+//Already exists in gordon.c, shouldn't need this anymore
+/*// To activate SINGLE_HOLD, you will need to hold for 200ms first. 
+// This tap dance favors keys that are used frequently in typing like 'f'
+int cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    if (state->interrupted) {
+      return SINGLE_TAP;
+    }
+    else {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+  }
+  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
+  //with single tap.
+  else if (state->count == 2) {
+    if (state->interrupted) return DOUBLE_SINGLE_TAP;
+    else if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP; 
+  } 
+  else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
+  else if (state->count == 3) return TRIPLE_HOLD;
+  else return 8; //magic number. At some point this method will expand to work for more presses
+}*/
+
+/* "Super tap toggle"
+ * Basically, TT but for two or more layers for a single key.
+ * This particular dance:
+ * Single tap/hold - TT for Function layer
+ * Double tap/hold - TT for Numpad layer
+ * Triple tap/hold - TT for Mouse layer
+ *
+*/
+void TTT_finished (qk_tap_dance_state_t *state, void *user_data) {
+  ttt_state.state = cur_dance(state);
+  switch (ttt_state.state) {
+    case SINGLE_TAP: layer_invert(_FUNCTION); break;
+    case SINGLE_HOLD: layer_on(_FUNCTION); break;
+    case DOUBLE_TAP: layer_invert(_NUMPAD); break;
+    case DOUBLE_HOLD: layer_on(_NUMPAD); break;
+    case DOUBLE_SINGLE_TAP: layer_invert(_NUMPAD); break;
+    case TRIPLE_TAP: layer_invert(_MOUSE); break;
+    case TRIPLE_HOLD: layer_on(_MOUSE); break;
+  }
+}
+
+void TTT_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (ttt_state.state) {
+    case SINGLE_TAP: break;
+    case SINGLE_HOLD: layer_off(_FUNCTION); break;
+    case DOUBLE_TAP:  break;
+    case DOUBLE_HOLD: layer_off(_NUMPAD); break;
+    case DOUBLE_SINGLE_TAP:  break;
+    case TRIPLE_TAP:  break;
+    case TRIPLE_HOLD: layer_off(_MOUSE); break;
+  }
+  ttt_state.state = 0;
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  // simple tap dance
+  [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),  
+  [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
+  [CALC_PRINTSCREEN] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_PSCR),
+  [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
+  [F6F7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)),
+  [HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_HOME),
+  [TTT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,TTT_finished, TTT_reset),
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = KEYMAP(
+  //,----+----+----+----+----+----+----.      ,----+----+----+----+----+----+----.
+     MESC, Q  ,CSHW,ENAV, R  , T  ,SPC ,       CLPS, Y  , U  ,INAV, O  , P  ,TTT,
+  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
+     TAB , A , MEHS,DNUM,FCTL,GWIN,GRAVE,      TILD, H  ,JCTL, K ,MEHL,CLNMAUS,ENHM,
+  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
+    MINUS,ZCTL,MEHX, C  ,ALTV, B  ,DELETE,     INS ,ALTN, M  ,COMM,DOT ,SLSH,UNDS,
+  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
+                         LSHIFT,BSPSYM,                SPC ,ENTSYM
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+  [_NUMPAD] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+         ,    ,    ,    ,ASTR,    ,    ,          ,    , 7  , 8  , 9  ,ASTR,/**/,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,MINS,PLUS,/**/,EQUAL,    ,   ,          ,    , 4  , 5  , 6  ,PLUS,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,SLSH,    ,    ,          ,    , 1  , 2  , 3  ,SLSH,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                             ,    ,                     , 0  
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+  [_SYMBOLS] = KEYMAP(  
+  //,----+----+-----+----+----+----+----.     ,----+----+----+----+----+----+----.
+         ,EXLM, AT  ,LCBR,RCBR,HASH,    ,          ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/,
+  //|----+----+-----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,EXLM,EXLM,LPRN,RPRN ,    ,    ,          ,    ,DQUO,EQUAL,QUOTE,RCBR,    ,
+  //|----+----+----+----+----+----+----|      |----+----+----+----+----+----+----|
+      ,DOLLAR, PERC,LBRACKET,RBRACKET, ,      ,    ,PIPE,BSLASH,PLUS,  ,  ,  ,
+  //|----+----+-----+----+----+----+----|     |----+----+----+----+----+----+----|
+                          UNDS,/**/,                    ,/**/
+  // \-------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+  [_FUNCTION] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+    F6F7 ,F1  ,F2  ,F3  ,ALF4,F5  ,F6  ,      F7  ,F8  ,F9  ,F10 ,F11 ,F12 ,/**/,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                             ,    ,                    ,    
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+  [_NAV] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+      ,   ,SNAPLEFT,/**/,SNAPRIGHT,,  ,           ,    ,    , UP ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+     ,SNAPUP,PREVTAB, ,NEXTTAB,SNAPDOWN,,   ,    ,LEFT,DOWN,RGHT,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+    ,    ,WORKLEFT,    ,WORKRIGHT,,    ,          ,    ,PGUP,PGDN,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                            CDEL ,DEL,                 ,    
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+  [_TEXTNAV] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+         ,   ,    ,    ,    ,    ,  ,             ,    ,    ,/**/,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                                 ,    ,                 ,    
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ),
+
+   [_MOUSE] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+         ,    ,    ,MS_UP,   ,   ,    ,      ,    ,    , UP ,    ,    ,    ,/**/
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+      ,   ,MS_LEFT,MS_DOWN,MS_RIGHT,   ,    ,     ,    ,LEFT,DOWN,RGHT,/**/,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                      ,MS_BTN1 ,MS_BTN2              ,    
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  ), 
+
+
+  [_MACROS] = KEYMAP(  
+  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
+    /**/,RESET,SECRET_2,SECRET_3,   ,   ,   ,SYSTEM_SLEEP,    ,    ,INCL,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+     CAD ,SECRET_1,    ,   ,   ,   ,   ,      ,    ,    ,    ,    ,    ,    ,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+     SCAP,    ,    ,    ,    ,    ,    ,          ,    ,    ,    ,    ,    ,SCAP,
+  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
+                             ,    ,                    ,    
+  // \------------------+----+----+---/       \---+----+----+-------------------/
+  )
+
+};
+
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  switch(id) {
+    /* include some kind of library or header */
+    case 0:
+      if (record->event.pressed) {
+        SEND_STRING("#include <>");
+        return MACRO( T(LEFT), END);
+      }
+      break;
+    case 1:
+      if (record->event.pressed) {
+        SEND_STRING("git pull");
+        return MACRO( T(ENT), END );
+      }
+      break;
+    case 2:
+      if (record->event.pressed){
+        SEND_STRING("git push");
+        return MACRO( T(ENT), END );
+      }
+      break;
+    case 3:
+      if (record->event.pressed){
+        // layer_on(_CAPS);
+        // register_code(KC_CAPSLOCK);
+        // unregister_code(KC_CAPSLOCK);
+      }
+      break;
+    case 4:
+      if (record->event.pressed){
+        // layer_off(_CAPS);
+        // register_code(KC_CAPSLOCK);
+        // unregister_code(KC_CAPSLOCK);
+      }
+      break;
+  }
+  return MACRO_NONE;
+};
+ 
+
+void matrix_scan_user(void) {
+    uint8_t layer = biton32(layer_state);
+    
+    switch (layer) {
+      case _QWERTY:
+        set_led_green;
+        break;
+      case _MOUSE:
+        set_led_yellow;
+        break;
+      case _NUMPAD:
+        set_led_blue;
+        break;
+      case _SYMBOLS:
+        set_led_red;
+        break;
+      case _NAV:
+        set_led_magenta;
+        break;
+      case _MACROS:
+        set_led_green;
+        _delay_ms(45);
+        set_led_red;
+        _delay_ms(45);
+        break;
+      case _FUNCTION:
+        set_led_green;
+        _delay_ms(45);
+        set_led_blue;
+        _delay_ms(45);
+        break;  
+      default:
+        set_led_green;
+        break;
+    }
+};
--- a/keyboards/clueboard/60/keymaps/default/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default/keymap.c
@@ -3,11 +3,35 @@
 #define _______ KC_TRNS

 enum keyboard_layers {
-  _BL,
-  _FL,
-  _CL
+    _BL,
+    _FL,
+    _CL
 };

+enum custom_keycodes {
+    S_BSKTC = SAFE_RANGE,
+    S_ODEJY,
+    S_RCKBY,
+    S_DOEDR,
+    S_SCALE,
+    S_ONEUP,
+    S_COIN,
+    S_SONIC,
+    S_ZELDA
+};
+
+#ifdef AUDIO_ENABLE
+  float song_basketcase[][2] = SONG(BASKET_CASE);
+  float song_ode_to_joy[][2]  = SONG(ODE_TO_JOY);
+  float song_rock_a_bye_baby[][2]  = SONG(ROCK_A_BYE_BABY);
+  float song_doe_a_deer[][2]  = SONG(DOE_A_DEER);
+  float song_scale[][2]  = SONG(MUSIC_SCALE_SOUND);
+  float song_coin[][2]  = SONG(COIN_SOUND);
+  float song_one_up[][2]  = SONG(ONE_UP_SOUND);
+  float song_sonic_ring[][2]  = SONG(SONIC_RING);
+  float song_zelda_puzzle[][2]  = SONG(ZELDA_PUZZLE);
+#endif
+
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Layer 0: Default Layer
     * ,-----------------------------------------------------------.
@@ -33,11 +57,71 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     \
      _______,     _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______, \
      _______,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,   _______, \
-      _______,  _______,  _______,                        _______,                     _______,  _______,  MO(_FL),   _______),
+      _______,_______,_______,                        _______,                     _______,  _______,  MO(_FL),   _______),
    [_CL] = KEYMAP(
-      BL_STEP,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,\
+      BL_STEP,S_BSKTC,S_ODEJY,S_RCKBY,S_DOEDR,S_SCALE,S_ONEUP,S_COIN, S_SONIC,S_ZELDA,_______,_______,_______,_______,_______,\
      _______,   _______,_______,_______,RESET,  _______,_______,_______,_______,_______,_______,_______,_______,_______,     \
      _______,     _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______, \
      _______,  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______, \
      _______,  _______,  _______,                        _______,                     _______,  _______,  MO(_FL),   _______)
 };
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case S_BSKTC:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_basketcase);
+            }
+            return false;
+        case S_ODEJY:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_ode_to_joy);
+            }
+            return false;
+        case S_RCKBY:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_rock_a_bye_baby);
+            }
+            return false;
+        case S_DOEDR:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_doe_a_deer);
+            }
+            return false;
+        case S_SCALE:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_scale);
+            }
+            return false;
+        case S_ONEUP:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_one_up);
+            }
+            return false;
+        case S_COIN:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_coin);
+            }
+            return false;
+        case S_SONIC:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_sonic_ring);
+            }
+            return false;
+        case S_ZELDA:
+            if (record->event.pressed) {
+                stop_all_notes();
+                PLAY_SONG(song_zelda_puzzle);
+            }
+            return false;
+    }
+    return true;
+}
--- a/keyboards/clueboard/60/led.c
+++ b/keyboards/clueboard/60/led.c
@@ -23,7 +23,7 @@
 void backlight_init_ports(void) {
    printf("backlight_init_ports()\n");
    #ifdef BACKLIGHT_ENABLE
-    palSetPadMode(GPIOB, 8,  PAL_MODE_OUTPUT_PUSHPULL);
+    palSetPadMode(GPIOB, 8, PAL_MODE_OUTPUT_PUSHPULL);
    palSetPad(GPIOB, 8);
    #endif
 }
@@ -41,13 +41,8 @@ void backlight_set(uint8_t level) {
    #endif
 }

-void led_init_ports() {
-    printf("led_init_ports()\n");
-    palSetPadMode(GPIOB, 7,  PAL_MODE_OUTPUT_PUSHPULL);
-}
-
 void led_set_kb(uint8_t usb_led) {
-    printf("led_init_ports()\n");
+    printf("led_set_kb(%d)\n", usb_led);
    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
        // Turn capslock on
        palSetPad(GPIOB, 7);
--- a/keyboards/clueboard/60/matrix.c
+++ b/keyboards/clueboard/60/matrix.c
@@ -11,7 +11,7 @@

 /* Clueboard 60%
 *
- * Column pins are input with internal pull-down. 
+ * Column pins are input with internal pull-down.
 * Row pins are output and strobe with high.
 * Key is high or 1 when it turns on.
 *
@@ -68,13 +68,10 @@ void matrix_init(void) {
    palSetPadMode(GPIOA, 15,  PAL_MODE_INPUT_PULLDOWN);
    palSetPadMode(GPIOA, 10,  PAL_MODE_INPUT_PULLDOWN);

-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, MATRIX_COLS);
-
-    /* Setup capslock */
-    // palSetPadMode(GPIOB, 7,  PAL_MODE_OUTPUT_PUSHPULL);
-    // palClearPad(GPIOB, 7);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));

+    palClearPad(GPIOB, 7);  // Turn off capslock
    matrix_init_quantum();
 }

@@ -84,20 +81,20 @@ uint8_t matrix_scan(void) {

        // strobe col { PA2, PA3, PA6, PB14, PB15, PA8, PA9, PA7, PB3, PB4, PC14, PC15, PC13, PB5, PB6 }
        switch (col) {
-            case 0: palSetPad(GPIOA, 2); break; 
-            case 1: palSetPad(GPIOA, 3); break; 
-            case 2: palSetPad(GPIOA, 6); break; 
-            case 3: palSetPad(GPIOB, 14); break; 
-            case 4: palSetPad(GPIOB, 15); break; 
-            case 5: palSetPad(GPIOA, 8); break; 
-            case 6: palSetPad(GPIOA, 9); break; 
-            case 7: palSetPad(GPIOA, 7); break; 
-            case 8: palSetPad(GPIOB, 3); break; 
-            case 9: palSetPad(GPIOB, 4); break; 
-            case 10: palSetPad(GPIOC, 15); break; 
-            case 11: palSetPad(GPIOC, 14); break; 
-            case 12: palSetPad(GPIOC, 13); break; 
-            case 13: palSetPad(GPIOB, 5); break; 
+            case 0: palSetPad(GPIOA, 2); break;
+            case 1: palSetPad(GPIOA, 3); break;
+            case 2: palSetPad(GPIOA, 6); break;
+            case 3: palSetPad(GPIOB, 14); break;
+            case 4: palSetPad(GPIOB, 15); break;
+            case 5: palSetPad(GPIOA, 8); break;
+            case 6: palSetPad(GPIOA, 9); break;
+            case 7: palSetPad(GPIOA, 7); break;
+            case 8: palSetPad(GPIOB, 3); break;
+            case 9: palSetPad(GPIOB, 4); break;
+            case 10: palSetPad(GPIOC, 15); break;
+            case 11: palSetPad(GPIOC, 14); break;
+            case 12: palSetPad(GPIOC, 13); break;
+            case 13: palSetPad(GPIOB, 5); break;
            case 14: palSetPad(GPIOB, 6); break;
        }

@@ -115,20 +112,20 @@ uint8_t matrix_scan(void) {

        // unstrobe  col { PA2, PA3, PA6, PB14, PB15, PA8, PA9, PA7, PB3, PB4, PC15, PC14, PC13, PB5, PB6 }
        switch (col) {
-            case 0: palClearPad(GPIOA, 2); break; 
-            case 1: palClearPad(GPIOA, 3); break; 
-            case 2: palClearPad(GPIOA, 6); break; 
-            case 3: palClearPad(GPIOB, 14); break; 
-            case 4: palClearPad(GPIOB, 15); break; 
-            case 5: palClearPad(GPIOA, 8); break; 
-            case 6: palClearPad(GPIOA, 9); break; 
-            case 7: palClearPad(GPIOA, 7); break; 
-            case 8: palClearPad(GPIOB, 3); break; 
-            case 9: palClearPad(GPIOB, 4); break; 
-            case 10: palClearPad(GPIOC, 15); break; 
-            case 11: palClearPad(GPIOC, 14); break; 
-            case 12: palClearPad(GPIOC, 13); break; 
-            case 13: palClearPad(GPIOB, 5); break; 
+            case 0: palClearPad(GPIOA, 2); break;
+            case 1: palClearPad(GPIOA, 3); break;
+            case 2: palClearPad(GPIOA, 6); break;
+            case 3: palClearPad(GPIOB, 14); break;
+            case 4: palClearPad(GPIOB, 15); break;
+            case 5: palClearPad(GPIOA, 8); break;
+            case 6: palClearPad(GPIOA, 9); break;
+            case 7: palClearPad(GPIOA, 7); break;
+            case 8: palClearPad(GPIOB, 3); break;
+            case 9: palClearPad(GPIOB, 4); break;
+            case 10: palClearPad(GPIOC, 15); break;
+            case 11: palClearPad(GPIOC, 14); break;
+            case 12: palClearPad(GPIOC, 13); break;
+            case 13: palClearPad(GPIOB, 5); break;
            case 14: palClearPad(GPIOB, 6); break;
        }

@@ -138,6 +135,7 @@ uint8_t matrix_scan(void) {
            debouncing_time = timer_read();
        }
    }
+
    if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
        for (int row = 0; row < MATRIX_ROWS; row++) {
            matrix[row] = 0;
--- a/keyboards/clueboard/60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
@@ -50,5 +50,5 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
-#AUDIO_ENABLE = yes
+AUDIO_ENABLE = yes
 # SERIAL_LINK_ENABLE = yes
--- a/keyboards/eagle_viper/info.json
+++ b/keyboards/eagle_viper/info.json
@@ -7,7 +7,7 @@
    "height": 5, 
    "layouts": {
        "KEYMAP": {
-            "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.5, "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":14, "y":1, "w":1.5}, {"x":0.75, "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":14, "y":2, "w":2.25}, {"x":1.25, "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":13, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0.25, "y":4, "w":1.25}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":9, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.25}, {"x":11.5, "y":4, "w":1.25}, {"x":12.75, "y":4, "w":1.25}, {"x":14, "y":4, "w":1.25}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"iso", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":5}, {"x":9, "y":4}, {"x":10, "y":4}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"|", "x":13.75, "y":5}]
        }
    }
 }
--- a/keyboards/ergodone/ergodone.c
+++ b/keyboards/ergodone/ergodone.c
@@ -12,6 +12,8 @@ extern inline void ergodox_right_led_2_off(void);
 extern inline void ergodox_right_led_3_off(void);
 extern inline void ergodox_right_led_off(uint8_t led);

+extern inline void ergodox_led_all_off(void);
+
 void ergodox_led_init(void);
 void ergodox_blink_all_leds(void);

--- a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
@@ -0,0 +1,315 @@
+#include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+#include "process_keycode/process_tap_dance.h"
+#include "gordon.h"
+
+#include "keymap_german.h"
+
+#include "keymap_nordic.h"
+
+
+#define TLSLSH   M(TIL_SLASH)
+#define F1_F13   TD(F1F13)
+#define F2_F14   TD(F2F14)
+#define F5_F15   TD(F5F15)
+#define F4_ALTF4 TD(ALTF4)
+#define END_ESC  TD(ENDESC)
+#define SHF6_AF7 TD(F6F7)
+#define F12_RUN  TD(F12ETAPS)
+#define COMMA_TD TD(COMMA)
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // can always be here
+  EPRM,
+  VRSN,
+  RGB_SLD,
+};
+
+//Tap dance enums
+enum {
+  F12TAP = 0,
+  F12ETAPS,
+  CALCCOMP,
+  REFRESH, //send R, or Control+R if double tapped.
+  ENDESC,
+  XESC, //'quad function'. x, control, escape, alt
+  ALY2, //'quad function': a, Hyper, ctrl+a, layer 2
+  PRLOCK,
+  F6F7, // Shift F6 or Alt F7
+  TABCOMBO,
+  FCTRL,
+  F3D,
+  ALTF4,
+  COMMA,
+  AT,
+  HTAB,
+  F1F13,
+  F2F14,
+  F5F15
+};
+
+
+
+// Custom tapping terms for each key.
+// Requires changes to action_taping.c
+/* uint16_t get_tapping_term(keyevent_t* event) {
+    uint16_t keycode = keymap_key_to_keycode(layer_switch_get_layer(event->key), event->key);
+    if (keycode == LT(3,KC_E) ) {
+        return TAPPING_TERM + 50;
+    }
+    return TAPPING_TERM;
+} */
+
+            
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  // simple tap dance
+  [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),  
+  [REFRESH] = ACTION_TAP_DANCE_DOUBLE(KC_R,LCTL(KC_R)),
+  [ENDESC] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_ESC),
+  [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
+  [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
+  [F6F7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LALT(KC_F7)),
+  [F1F13] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F13),
+  [F2F14] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F14),
+  [F5F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
+  [TABCOMBO] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tab_finished, tab_reset),
+  [F3D] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, bt_finished, bt_reset),
+  [COMMA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, comma_finished, comma_reset),
+  [HTAB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,h_finished, h_reset)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+//**************************FIRST LAYER - LAYER ZERO ************************************** 
+  [_QWERTY] = KEYMAP(
+
+    SHF6_AF7,   F1_F13,    F2_F14,   TD(F3D), F4_ALTF4,    F5_F15,   KC_F11,
+    ________,     KC_Q,  CTR_SH_W,     NAV_E, CTR_AL_R,      KC_T, PRINTSCR,
+      KC_TAB,     KC_A,     MEH_S,  NUMPAD_D,   CTRL_F,     WIN_G,
+    ALT_SHFT,   CTRL_Z,   HYPER_X,   MOUSE_C,    ALT_V,      KC_B, TT(_MOUSE),
+    KC_MINUS, KC_GRAVE, KC_DELETE,   KC_LEFT, KC_RIGHT,
+                                    
+                                              KC_INSERT,  KC_DELETE, 
+                                                           ALT_HOME,
+                                    KC_LSHIFT, SYMB_BSP,    END_ESC,
+
+                 F12_RUN,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10, TD(CALCCOMP),
+                ________,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,  ________,
+                             WIN_H,   CTRL_J,     KC_K,    MEH_L,  COL_MOUS,  ________,
+                 KC_LEAD,     KC_N,    ALT_M, COMMA_TD, HYPE_DOT,  KC_SLASH, TD(TABCOMBO),
+                                       KC_UP,  KC_DOWN,   KC_ESC,    KC_TILD,    KC_UNDS,
+
+  KC_ESCAPE,  KC_DELETE,
+         ALT_T(KC_PGUP),
+  RCTL_T(KC_PGDOWN), LT(_NAV,KC_ENTER), SPAC_SYM),
+
+
+  //**************************SYMBOLS LAYER**************************
+  [_SYMBOLS] = KEYMAP(
+    ________, ________, ________, ________, ________, ________,  ________,
+    ________,   TLSLSH,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_CIRC,  ________,
+    ________,  KC_EXLM,  KC_PIPE,  KC_LPRN,  KC_RPRN, M(DEREF),
+    ________,KC_DOLLAR,  KC_PERC, LSQUIGLY, RSQUIGLY, ________,  ________,
+    ________,  M(TICK3),  ________,  ________,  ________,  
+
+                                    ________,________,
+                                             ________,
+                           ________,________,________,
+
+
+                  ________, ________, ________, ________, ________, ________, NUMLOCK,
+                  ________,   TLSLSH,  KC_PIPE,  KC_PLUS,  KC_AMPR, ________, CAPLOCK,
+                          M(EQRIGHT),  KC_DQUO, KC_EQUAL, KC_QUOTE,KC_SCOLON, ________,
+                  ________,  KC_PIPE, BK_SLASH,  ASTERSK,   KC_DOT, KC_SLASH, ________,
+                  ________,________,________,M(TILD3),________,
+                                                              ________,________,
+                                                                       ________,
+                                                     ________,________,________),
+  
+  //**************************MOUSE MOVEMENT LAYER**************************
+  [_MOUSE] = KEYMAP(RESET,________,________,________,________,________,________,
+                    RESET,________,________,KC_MS_UP,________,KC_MS_WH_UP,CALTDEL,
+                    ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
+                    KC_SECRET_1,________,HYPR(KC_F13),________,HYPR(KC_F14),KC_SECRET_2,________,
+                    ________,________,HYPR(KC_F15),KC_MS_WH_LEFT,KC_MS_WH_RIGHT,
+                    
+                                                       ________,________,
+                                                                ________,
+                                          KC_MS_BTN1,KC_MS_BTN2,________,
+                                          
+                                         
+                    ________,________,________,________,________,________,________,
+                    KC_MS_WH_UP,________,________,KC_UP,________,________,________,
+                    ________,KC_LEFT,KC_DOWN,KC_RIGHT,________,________,
+                    KC_MS_WH_DOWN,________,KC_PGUP,KC_PGDOWN,KC_MEDIA_NEXT_TRACK,________,________,
+                    KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_MEDIA_PLAY_PAUSE,________,
+                    ________,________,
+                    ________,
+                    ________,________,KC_WWW_BACK),
+
+
+
+
+  //**************************WINDOWS NAVIGATION LAYER**************************
+
+  [_NAV] = KEYMAP(________,________,________,________,________,________,________,
+                  ________,________,SNAPLEFT,________,SNAPRGHT,LALT(KC_LEFT),________,
+                  ________,LCTL(KC_W),PREVTAB,LGUI(KC_D),NEXTTAB,________,
+                  ________,________,WORKLEFT,________,WORKRIGHT,________,________,
+                  ________,________,________,________,________,
+                  
+                  ________,________,
+                           ________,
+         ________,________,________, 
+         
+         
+         ________,________,________,________,________,________,________,
+         ________,________,SNAPUP  ,KC_UP   ,SNAPDOWN,________,________,
+                  ________,KC_LEFT ,KC_DOWN ,KC_RIGHT,________,________,
+         ________,________,________,________,________,________,________,
+         ________,________,________,________,________,
+         
+         
+         ________,________,
+         ________,
+         ________,________,________),
+
+  //****************************NUMPAD LAYER****************************
+  [_NUMPAD] = KEYMAP(________,________,________,________,________,________,________,
+                     ________,________,________,________,________,________,________,
+                     ________,________,________,________,________,________,
+                     ________,________,________,________,________,________,________,
+                     ________,________,________,________,________,
+                     
+                     ________,________,
+                     ________,
+                     ________,________,________,
+                     
+                     BL_TOGG ,BL_STEP ,________,________,________,________,________,
+                     ________,________,KC_7    ,KC_8    ,KC_9    ,________,________,
+                              ________,KC_4    ,KC_5    ,KC_6    ,________,________,
+                     ________,________,KC_1    ,KC_2    ,KC_3    ,________,________,
+                                       KC_0    ,KC_0 ,  KC_DOT   ,________,________,
+                                       
+                                       ________,________,
+                                       ________,
+                                       ________,________,KC_0),
+  //****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
+  [_TEXTNAV] = KEYMAP(________,________,________,________,________,________,________,
+                      ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
+                      ________,LALT(KC_F7),LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
+                      ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,________,________,________,________,________,________,________,________,________,LCTL(KC_DELETE),________,LALT(LSFT(KC_F9)),________,________,________,________,________,________,________,MEH(KC_5),LALT(LSFT(KC_Z)),________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________,________)
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+  [1] = ACTION_LAYER_TAP_TOGGLE(1)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+      switch(id) {
+        case INFOQM: {
+          if (record->event.pressed) {
+            SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+          }
+          break;
+        }
+
+        case TIL_SLASH: {
+          if (record->event.pressed) {
+            SEND_STRING ("~/.");
+          }
+          break;
+        }
+
+        case DEREF: {
+          if (record->event.pressed) {
+            SEND_STRING ("->");
+          }
+          break;
+        }
+        
+        case EQRIGHT: {
+          if (record->event.pressed) {
+            SEND_STRING ("=>");
+          }
+          break;
+        }
+
+        case TICK3: {
+          if (record->event.pressed) {
+            SEND_STRING ("```");
+          }
+          break;
+        }
+
+        case TILD3: {
+          if (record->event.pressed) {
+            SEND_STRING ("~~~");
+          }
+          break;
+        }
+
+        case ALTTAB_START: {
+          register_code(KC_LALT);
+          layer_on(8);
+        }
+
+        case ALTTAB_END: {
+          unregister_code(KC_LALT);
+          layer_off(8);
+        }
+
+
+
+      }
+      return MACRO_NONE;
+};
+
+void matrix_scan_user(void) {
+
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_on();
+    ergodox_led_all_on();
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+        case _SYMBOLS:
+            ergodox_right_led_1_on();
+            break;
+        case _MOUSE:
+            ergodox_right_led_2_on();
+            break;
+        case _NUMPAD:
+            ergodox_right_led_3_on();
+            break;
+        case _NAV:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            break;
+        case 5:
+            ergodox_right_led_1_on();
+            ergodox_right_led_3_on();
+            break;
+        case 6:
+            ergodox_right_led_2_on();
+            ergodox_right_led_3_on();
+            break;
+        case 7:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            ergodox_right_led_3_on();
+            break;
+        default:
+            break;
+    }
+
+};
--- a/keyboards/ergodox_infinity/matrix.c
+++ b/keyboards/ergodox_infinity/matrix.c
@@ -62,8 +62,8 @@ void matrix_init(void)
    palSetPadMode(GPIOC, 11, PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOD, 0,  PAL_MODE_OUTPUT_PUSHPULL);

-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, LOCAL_MATRIX_ROWS);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, LOCAL_MATRIX_ROWS * sizeof(matrix_row_t));

    matrix_init_quantum();
 }
--- a/keyboards/infinity60/matrix.c
+++ b/keyboards/infinity60/matrix.c
@@ -60,8 +60,8 @@ void matrix_init(void)
    palSetPadMode(GPIOC, 5,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOD, 0,  PAL_MODE_OUTPUT_PUSHPULL);
 #endif
-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, MATRIX_ROWS);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));

    matrix_init_quantum();
 }
--- a/keyboards/jm60/matrix.c
+++ b/keyboards/jm60/matrix.c
@@ -49,8 +49,8 @@ void matrix_init(void)
    palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOB, 0,  PAL_MODE_OUTPUT_PUSHPULL);

-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, MATRIX_ROWS);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
 }

 uint8_t matrix_scan(void)
--- a/keyboards/k_type/matrix.c
+++ b/keyboards/k_type/matrix.c
@@ -42,8 +42,8 @@ void matrix_init(void)
    palSetPadMode(GPIOD, 1,   PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOD, 4,   PAL_MODE_OUTPUT_PUSHPULL);

-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, MATRIX_ROWS);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));

    matrix_init_quantum();
 }
--- a/keyboards/preonic/info.json
+++ b/keyboards/preonic/info.json
@@ -10,7 +10,7 @@
  "width": 12,
  "height": 5,
  "layouts": {
-    "LAYOUT_preonic_mit": {
+    "KEYMAP": {
      "key_count": 59,
      "layout": [ 
        { "w": 1, "x": 0, "y": 0 }, 
@@ -138,4 +138,4 @@
        { "w": 1, "x": 11, "y": 4 } ]
    }
  }
-}
+}
--- a/keyboards/tada68/keymaps/trashcat/keymap.c
+++ b/keyboards/tada68/keymaps/trashcat/keymap.c
@@ -0,0 +1,113 @@
+#include "tada68.h"
+
+// 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.
+#define _BL 0
+#define _FL 1
+#define _GM 2
+#define _GF 3
+
+#define _______ KC_TRNS
+
+// Tap dance declarations (These must go above the keymaps)
+enum {
+  TD_F1 = 0,
+  TD_F2,
+  TD_F3,
+  TD_F4,
+  TD_F5,
+  TD_F6,
+  TD_F7,
+  TD_F8,
+  TD_F9,
+  TD_F10,
+  TD_F11,
+  TD_F12,
+  TD_AE_FITCOMP,
+  TD_AE_IN,
+  TD_AE_OUT
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,----------------------------------------------------------------.
+   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   |~ ` |
+   * |----------------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bksp |Del |
+   * |----------------------------------------------------------------|
+   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+   * |----------------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
+   * |----------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space          |FN| Alt|Ctrl|Lef|Dow|Rig |
+   * `----------------------------------------------------------------'
+   */
+[_BL] = KEYMAP_ANSI(
+  KC_ESC, TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), 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_DEL, \
+  KC_LCTRL, 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,                        MO(_FL),KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+   * ,----------------------------------------------------------------.
+   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  _GM  |Ins |
+   * |----------------------------------------------------------------|
+   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
+   * |----------------------------------------------------------------|
+   * | Caps |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
+   * |----------------------------------------------------------------|
+   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
+   * |----------------------------------------------------------------|
+   * |    |    |    |                       |   |   |   |Prev|P/P|Next|
+   * `----------------------------------------------------------------'
+   */
+[_FL] = KEYMAP_ANSI(
+  _______, 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_INS ,  \
+  _______,_______, KC_UP,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
+  KC_CAPS,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,        _______,KC_END, \
+  _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______, _______, _______, \
+  _______,_______,_______,                 TG(_GM),               _______,_______,_______,KC_MPRV,KC_MPLY, KC_MNXT),
+
+  /* Keymap _GL: Gaming Layer. Basically makes Caps Lock behave normally. I know there is a better way to do this but copy and paste was my friend
+   * ,----------------------------------------------------------------.
+   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   \   |~ ` |
+   * |----------------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Bksp |Del |
+   * |----------------------------------------------------------------|
+   * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+   * |----------------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
+   * |----------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space          |FN| Alt|Ctrl|Lef|Dow|Rig |
+   * `----------------------------------------------------------------'
+   */
+[_GM] = KEYMAP_ANSI(
+  KC_ESC,TD(TD_F1), TD(TD_F2), TD(TD_F3), TD(TD_F4), TD(TD_F5), TD(TD_F6), TD(TD_F7), TD(TD_F8), TD(TD_F9), TD(TD_F10), TD(TD_F11), TD(TD_F12), _______, 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_DEL, \
+  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,                _______,                        MO(_FL),KC_RALT,KC_RCTRL, KC_LEFT,KC_DOWN,KC_RGHT),
+
+};
+
+// Tapdance definitions. Tap Dance F Keys.
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_F1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_F1),
+  [TD_F2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_F2),
+  [TD_F3] = ACTION_TAP_DANCE_DOUBLE(KC_3, KC_F3),
+  [TD_F4] = ACTION_TAP_DANCE_DOUBLE(KC_4, KC_F4),
+  [TD_F5] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_F5),
+  [TD_F6] = ACTION_TAP_DANCE_DOUBLE(KC_6, KC_F6),
+  [TD_F7] = ACTION_TAP_DANCE_DOUBLE(KC_7, KC_F7),
+  [TD_F8] = ACTION_TAP_DANCE_DOUBLE(KC_8, KC_F8),
+  [TD_F9] = ACTION_TAP_DANCE_DOUBLE(KC_9, KC_F9),
+  [TD_F10] = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_F10),
+  [TD_F11] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_F11),
+  [TD_F12] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_F12),
+  [TD_AE_FITCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, LALT(KC_SLSH)),
+  [TD_AE_IN] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, LALT(KC_LBRC)),
+[TD_AE_OUT] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, LALT(KC_RBRC))
+};
--- a/keyboards/tada68/keymaps/trashcat/readme.md
+++ b/keyboards/tada68/keymaps/trashcat/readme.md
@@ -0,0 +1,7 @@
+# Trashcat's Tada68
+
+Just my simple layout for the Tada68.  
+Caps Lock behaves as LCtrl until switched to the Gaming Layer. I have a stupid reason for why I need caps lock at all but I won't get into it.  
+LCtrl is also LCtrl because I had no idea what else to put there.  
+
+Tap Dance for the F Row.. i.e double tap 1 and get F1 instead. 
--- a/keyboards/tada68/keymaps/trashcat/rules.mk
+++ b/keyboards/tada68/keymaps/trashcat/rules.mk
@@ -0,0 +1,21 @@
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes       # 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 = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = yes      # Tappa Dance Bitch
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
--- a/keyboards/whitefox/matrix.c
+++ b/keyboards/whitefox/matrix.c
@@ -47,8 +47,9 @@ void matrix_init(void)
    palSetPadMode(GPIOC, 10, PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 11, PAL_MODE_OUTPUT_PUSHPULL);

-    memset(matrix, 0, MATRIX_ROWS);
-    memset(matrix_debouncing, 0, MATRIX_ROWS);
+    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+    memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
+
    matrix_init_quantum();
 }

--- a/message.mk
+++ b/message.mk
@@ -58,7 +58,7 @@ MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \
 	Some git sub-modules are out of date or modified, please consider runnning:$(BOLD)\n\
        make git-submodule\n\
 	You can ignore this warning if you are not compiling any ChibiOS keyboards,\n\
-	or if you have modified the ChibiOS libraries yourself. \n\n
+	or if you have modified the ChibiOS libraries yourself. \n\n$(NO_COLOR)
 MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR)

 define GENERATE_MSG_MAKE_KB
--- a/quantum/audio/audio_arm.c
+++ b/quantum/audio/audio_arm.c
@@ -18,7 +18,6 @@
 #include "ch.h"
 #include "hal.h"

-#include <stdio.h>
 #include <string.h>
 #include "print.h"
 #include "keymap.h"
--- a/quantum/audio/musical_notes.h
+++ b/quantum/audio/musical_notes.h
@@ -53,127 +53,127 @@

 // Note Timbre
 // Changes how the notes sound
-#define TIMBRE_12       0.125
-#define TIMBRE_25       0.250
-#define TIMBRE_50       0.500
-#define TIMBRE_75       0.750
+#define TIMBRE_12       0.125f
+#define TIMBRE_25       0.250f
+#define TIMBRE_50       0.500f
+#define TIMBRE_75       0.750f
 #define TIMBRE_DEFAULT  TIMBRE_50

 // Notes - # = Octave

-#define NOTE_REST         0.00
+#define NOTE_REST         0.00f

 /* These notes are currently bugged
-#define NOTE_C0          16.35
-#define NOTE_CS0         17.32
-#define NOTE_D0          18.35
-#define NOTE_DS0         19.45
-#define NOTE_E0          20.60
-#define NOTE_F0          21.83
-#define NOTE_FS0         23.12
-#define NOTE_G0          24.50
-#define NOTE_GS0         25.96
-#define NOTE_A0          27.50
-#define NOTE_AS0         29.14
-#define NOTE_B0          30.87
-#define NOTE_C1          32.70
-#define NOTE_CS1         34.65
-#define NOTE_D1          36.71
-#define NOTE_DS1         38.89
-#define NOTE_E1          41.20
-#define NOTE_F1          43.65
-#define NOTE_FS1         46.25
-#define NOTE_G1          49.00
-#define NOTE_GS1         51.91
-#define NOTE_A1          55.00
-#define NOTE_AS1         58.27
+#define NOTE_C0          16.35f
+#define NOTE_CS0         17.32f
+#define NOTE_D0          18.35f
+#define NOTE_DS0         19.45f
+#define NOTE_E0          20.60f
+#define NOTE_F0          21.83f
+#define NOTE_FS0         23.12f
+#define NOTE_G0          24.50f
+#define NOTE_GS0         25.96f
+#define NOTE_A0          27.50f
+#define NOTE_AS0         29.14f
+#define NOTE_B0          30.87f
+#define NOTE_C1          32.70f
+#define NOTE_CS1         34.65f
+#define NOTE_D1          36.71f
+#define NOTE_DS1         38.89f
+#define NOTE_E1          41.20f
+#define NOTE_F1          43.65f
+#define NOTE_FS1         46.25f
+#define NOTE_G1          49.00f
+#define NOTE_GS1         51.91f
+#define NOTE_A1          55.00f
+#define NOTE_AS1         58.27f
 */

-#define NOTE_B1          61.74
-#define NOTE_C2          65.41
-#define NOTE_CS2         69.30
-#define NOTE_D2          73.42
-#define NOTE_DS2         77.78
-#define NOTE_E2          82.41
-#define NOTE_F2          87.31
-#define NOTE_FS2         92.50
-#define NOTE_G2          98.00
-#define NOTE_GS2        103.83
-#define NOTE_A2         110.00
-#define NOTE_AS2        116.54
-#define NOTE_B2         123.47
-#define NOTE_C3         130.81
-#define NOTE_CS3        138.59
-#define NOTE_D3         146.83
-#define NOTE_DS3        155.56
-#define NOTE_E3         164.81
-#define NOTE_F3         174.61
-#define NOTE_FS3        185.00
-#define NOTE_G3         196.00
-#define NOTE_GS3        207.65
-#define NOTE_A3         220.00
-#define NOTE_AS3        233.08
-#define NOTE_B3         246.94
-#define NOTE_C4         261.63
-#define NOTE_CS4        277.18
-#define NOTE_D4         293.66
-#define NOTE_DS4        311.13
-#define NOTE_E4         329.63
-#define NOTE_F4         349.23
-#define NOTE_FS4        369.99
-#define NOTE_G4         392.00
-#define NOTE_GS4        415.30
-#define NOTE_A4         440.00
-#define NOTE_AS4        466.16
-#define NOTE_B4         493.88
-#define NOTE_C5         523.25
-#define NOTE_CS5        554.37
-#define NOTE_D5         587.33
-#define NOTE_DS5        622.25
-#define NOTE_E5         659.26
-#define NOTE_F5         698.46
-#define NOTE_FS5        739.99
-#define NOTE_G5         783.99
-#define NOTE_GS5        830.61
-#define NOTE_A5         880.00
-#define NOTE_AS5        932.33
-#define NOTE_B5         987.77
-#define NOTE_C6        1046.50
-#define NOTE_CS6       1108.73
-#define NOTE_D6        1174.66
-#define NOTE_DS6       1244.51
-#define NOTE_E6        1318.51
-#define NOTE_F6        1396.91
-#define NOTE_FS6       1479.98
-#define NOTE_G6        1567.98
-#define NOTE_GS6       1661.22
-#define NOTE_A6        1760.00
-#define NOTE_AS6       1864.66
-#define NOTE_B6        1975.53
-#define NOTE_C7        2093.00
-#define NOTE_CS7       2217.46
-#define NOTE_D7        2349.32
-#define NOTE_DS7       2489.02
-#define NOTE_E7        2637.02
-#define NOTE_F7        2793.83
-#define NOTE_FS7       2959.96
-#define NOTE_G7        3135.96
-#define NOTE_GS7       3322.44
-#define NOTE_A7        3520.00
-#define NOTE_AS7       3729.31
-#define NOTE_B7        3951.07
-#define NOTE_C8        4186.01
-#define NOTE_CS8       4434.92
-#define NOTE_D8        4698.64
-#define NOTE_DS8       4978.03
-#define NOTE_E8        5274.04
-#define NOTE_F8        5587.65
-#define NOTE_FS8       5919.91
-#define NOTE_G8        6271.93
-#define NOTE_GS8       6644.88
-#define NOTE_A8        7040.00
-#define NOTE_AS8       7458.62
-#define NOTE_B8        7902.13
+#define NOTE_B1          61.74f
+#define NOTE_C2          65.41f
+#define NOTE_CS2         69.30f
+#define NOTE_D2          73.42f
+#define NOTE_DS2         77.78f
+#define NOTE_E2          82.41f
+#define NOTE_F2          87.31f
+#define NOTE_FS2         92.50f
+#define NOTE_G2          98.00f
+#define NOTE_GS2        103.83f
+#define NOTE_A2         110.00f
+#define NOTE_AS2        116.54f
+#define NOTE_B2         123.47f
+#define NOTE_C3         130.81f
+#define NOTE_CS3        138.59f
+#define NOTE_D3         146.83f
+#define NOTE_DS3        155.56f
+#define NOTE_E3         164.81f
+#define NOTE_F3         174.61f
+#define NOTE_FS3        185.00f
+#define NOTE_G3         196.00f
+#define NOTE_GS3        207.65f
+#define NOTE_A3         220.00f
+#define NOTE_AS3        233.08f
+#define NOTE_B3         246.94f
+#define NOTE_C4         261.63f
+#define NOTE_CS4        277.18f
+#define NOTE_D4         293.66f
+#define NOTE_DS4        311.13f
+#define NOTE_E4         329.63f
+#define NOTE_F4         349.23f
+#define NOTE_FS4        369.99f
+#define NOTE_G4         392.00f
+#define NOTE_GS4        415.30f
+#define NOTE_A4         440.00f
+#define NOTE_AS4        466.16f
+#define NOTE_B4         493.88f
+#define NOTE_C5         523.25f
+#define NOTE_CS5        554.37f
+#define NOTE_D5         587.33f
+#define NOTE_DS5        622.25f
+#define NOTE_E5         659.26f
+#define NOTE_F5         698.46f
+#define NOTE_FS5        739.99f
+#define NOTE_G5         783.99f
+#define NOTE_GS5        830.61f
+#define NOTE_A5         880.00f
+#define NOTE_AS5        932.33f
+#define NOTE_B5         987.77f
+#define NOTE_C6        1046.50f
+#define NOTE_CS6       1108.73f
+#define NOTE_D6        1174.66f
+#define NOTE_DS6       1244.51f
+#define NOTE_E6        1318.51f
+#define NOTE_F6        1396.91f
+#define NOTE_FS6       1479.98f
+#define NOTE_G6        1567.98f
+#define NOTE_GS6       1661.22f
+#define NOTE_A6        1760.00f
+#define NOTE_AS6       1864.66f
+#define NOTE_B6        1975.53f
+#define NOTE_C7        2093.00f
+#define NOTE_CS7       2217.46f
+#define NOTE_D7        2349.32f
+#define NOTE_DS7       2489.02f
+#define NOTE_E7        2637.02f
+#define NOTE_F7        2793.83f
+#define NOTE_FS7       2959.96f
+#define NOTE_G7        3135.96f
+#define NOTE_GS7       3322.44f
+#define NOTE_A7        3520.00f
+#define NOTE_AS7       3729.31f
+#define NOTE_B7        3951.07f
+#define NOTE_C8        4186.01f
+#define NOTE_CS8       4434.92f
+#define NOTE_D8        4698.64f
+#define NOTE_DS8       4978.03f
+#define NOTE_E8        5274.04f
+#define NOTE_F8        5587.65f
+#define NOTE_FS8       5919.91f
+#define NOTE_G8        6271.93f
+#define NOTE_GS8       6644.88f
+#define NOTE_A8        7040.00f
+#define NOTE_AS8       7458.62f
+#define NOTE_B8        7902.13f

 // Flat Aliases
 #define NOTE_DF0 NOTE_CS0
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@@ -53,6 +53,24 @@
    E__NOTE(_CS4), E__NOTE(_B4),  QD_NOTE(_AS4), \
    E__NOTE(_AS4), E__NOTE(_AS4), QD_NOTE(_B4),

+#define CLUEBOARD_SOUND \
+    HD_NOTE(_C3), HD_NOTE(_D3), HD_NOTE(_E3), HD_NOTE(_F3), HD_NOTE(_G3), HD_NOTE(_A4), HD_NOTE(_B4), HD_NOTE(_C4)
+/*
+    HD_NOTE(_G3), HD_NOTE(_E3), HD_NOTE(_C3), \
+    Q__NOTE(_E3), Q__NOTE(_C3), Q__NOTE(_G3), \
+    Q__NOTE(_E3)
+*/
+/*
+    HD_NOTE(_C3), HD_NOTE(_G3), HD_NOTE(_E3), \
+    Q__NOTE(_G3), Q__NOTE(_E3), Q__NOTE(_G3), \
+    Q__NOTE(_F3)
+*/
+
+#define BASKET_CASE \
+    QD_NOTE(_G3), E__NOTE(_F3), E__NOTE(_E3), Q__NOTE(_F3), M__NOTE(_G3, 8+32), Q__NOTE(_REST), \
+    Q__NOTE(_B4), Q__NOTE(_C4), Q__NOTE(_B4), E__NOTE(_A4), Q__NOTE(_G3), M__NOTE(_G3, 8+32), Q__NOTE(_REST), \
+    Q__NOTE(_B4), Q__NOTE(_C4), Q__NOTE(_B4), E__NOTE(_A4), Q__NOTE(_G3), Q__NOTE(_G3), Q__NOTE(_G3), Q__NOTE(_G3), E__NOTE(_A4), E__NOTE(_C4), QD_NOTE(_B4), HD_NOTE(_B4)
+
 #define STARTUP_SOUND  \
    E__NOTE(_E6),     \
    E__NOTE(_A6),     \
--- a/users/gordon/gordon.c
+++ b/users/gordon/gordon.c
@@ -0,0 +1,275 @@
+#include "gordon.h"
+#include "quantum.h"
+#include "action.h"
+#include "process_keycode/process_tap_dance.h"
+
+#if (__has_include("secret.h"))
+#include "secret.h"
+#else
+const char secret[][64] = {
+  "test1",
+  "test2",
+  "test3",
+  "test4",
+  "test5"
+};
+#endif
+
+
+
+
+void register_hyper (void) { //Helper function to invoke Hyper
+  register_code (KC_LSFT);
+  register_code (KC_LCTL); 
+  register_code (KC_LALT); 
+  register_code (KC_LGUI); 
+}
+void unregister_hyper (void) { //Helper function to invoke Hyper
+  unregister_code (KC_LSFT);
+  unregister_code (KC_LCTL); 
+  unregister_code (KC_LALT); 
+  unregister_code (KC_LGUI); 
+}
+
+void register_ctrl_a (void) {
+  register_code(KC_LCTL);
+  register_code(KC_A);
+}
+
+void unregister_ctrl_a (void) {
+  unregister_code(KC_LCTL);
+  unregister_code(KC_A);
+}
+
+void register_alt_f7 (void) { 
+  register_code (KC_LALT); 
+  register_code (KC_F7);
+}
+
+void unregister_alt_f7 (void) { 
+  unregister_code (KC_LALT); 
+  unregister_code (KC_F7);
+}
+
+void register_shift_f6 (void) { 
+  register_code (KC_LSFT); 
+  register_code (KC_F6);
+}
+
+void unregister_shift_f6 (void) { 
+  unregister_code (KC_LSFT); 
+  unregister_code (KC_F6);
+}
+
+void register_ctrl_shift (void) { 
+  register_code (KC_LSFT); 
+  register_code (KC_LCTRL);
+}
+
+void unregister_ctrl_shift (void) { 
+  unregister_code (KC_LSFT); 
+  unregister_code (KC_LCTRL);
+}
+
+void register_alt_shift (void) { 
+  register_code (KC_LSFT); 
+  register_code (KC_LALT);
+}
+
+void unregister_alt_shift (void) { 
+  unregister_code (KC_LSFT); 
+  unregister_code (KC_LALT);
+}
+
+// To activate SINGLE_HOLD, you will need to hold for 200ms first. 
+// This tap dance favors keys that are used frequently in typing like 'f'
+int cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
+    if (state->interrupted) {
+      //     if (!state->pressed) return SINGLE_TAP; 
+      //need "permissive hold" here.
+      //     else return SINsGLE_HOLD; 
+      //If the interrupting key is released before the tap-dance key, then it is a single HOLD
+      //However, if the tap-dance key is released first, then it is a single TAP
+      //But how to get access to the state of the interrupting key????
+      return SINGLE_TAP;
+    }
+    else {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+  }
+  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
+  //with single tap.
+  else if (state->count == 2) {
+    if (state->interrupted) return DOUBLE_SINGLE_TAP;
+    else if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP; 
+  } 
+  else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
+  else if (state->count == 3) return TRIPLE_HOLD;
+  else return 8; //magic number. At some point this method will expand to work for more presses
+}
+
+//This works well if you want this key to work as a "fast modifier". It favors being held over being tapped.
+int hold_cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    if (state->interrupted) {
+      if (!state->pressed) return SINGLE_TAP; 
+      else return SINGLE_HOLD; 
+    }
+    else {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+  }
+  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
+  //with single tap.
+  else if (state->count == 2) {
+    if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP; 
+  } 
+  else if (state->count == 3) {
+    if (!state->pressed) return TRIPLE_TAP;
+    else return TRIPLE_HOLD;
+  }
+  else return 8; //magic number. At some point this method will expand to work for more presses
+}
+
+
+static xtap htap_state = { 
+  .is_press_action = true,
+  .state = 0
+};
+
+void h_finished (qk_tap_dance_state_t *state, void *user_data) {
+  htap_state.state = cur_dance(state);
+  switch (htap_state.state) {
+    case SINGLE_TAP: register_code(KC_H); break;
+    case SINGLE_HOLD: layer_on(8); register_code(KC_LALT); break;
+    case DOUBLE_TAP: layer_invert(8); register_code(KC_LALT); break;
+    // case DOUBLE_HOLD: register_code(KC_LALT);
+    case DOUBLE_SINGLE_TAP: register_code(KC_H);unregister_code(KC_H);register_code(KC_H);
+  }
+}
+
+void h_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (htap_state.state) {
+    case SINGLE_TAP: unregister_code(KC_H); break;
+    case SINGLE_HOLD: layer_off(8); unregister_code(KC_LALT); break;
+    case DOUBLE_TAP: unregister_code(KC_LALT);break;
+    // case DOUBLE_HOLD: unregister_code(KC_LALT);
+    case DOUBLE_SINGLE_TAP: unregister_code(KC_H);
+  }
+  htap_state.state = 0;
+}
+
+
+/**************** QUAD FUNCTION FOR TAB ****************/
+// TAB, ALT + SHIFT, TAB TAB, CTRL + SHIFT
+static xtap tab_state = { 
+  .is_press_action = true,
+  .state = 0
+};
+
+void tab_finished (qk_tap_dance_state_t *state, void *user_data) {
+  tab_state.state = cur_dance(state);
+  switch (tab_state.state) {
+    case SINGLE_TAP: register_code(KC_TAB); break;  //send tab on single press
+    case SINGLE_HOLD: register_ctrl_shift(); break;
+    case DOUBLE_HOLD: register_alt_shift(); break; //alt shift on single hold
+    case DOUBLE_TAP: register_code(KC_TAB); unregister_code(KC_TAB); register_code(KC_TAB); break; //tab tab
+    case TRIPLE_TAP: register_code(KC_LSHIFT) ;register_code(KC_ESC); break;
+    case TRIPLE_HOLD: register_code(KC_LSHIFT); register_code(KC_LGUI); break;
+  }
+}   
+
+void tab_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (tab_state.state) {
+    case SINGLE_TAP: unregister_code(KC_TAB); break; //unregister tab
+    case DOUBLE_HOLD: unregister_alt_shift(); break; //let go of alt shift
+    case DOUBLE_TAP: unregister_code(KC_TAB); break;
+    case SINGLE_HOLD: unregister_ctrl_shift(); break;
+    case TRIPLE_TAP: unregister_code(KC_LSHIFT); unregister_code(KC_ESC); break;
+    case TRIPLE_HOLD: unregister_code(KC_LSHIFT); unregister_code(KC_LGUI); break;
+  }
+  tab_state.state = 0;
+}
+/**************** QUAD FUNCTION FOR TAB ****************/
+
+//*************** SUPER COMMA *******************//
+// Assumption: we don't care about trying to hit ,, quickly
+//*************** SUPER COMMA *******************//
+static xtap comma_state = { 
+  .is_press_action = true,
+  .state = 0
+};
+
+void comma_finished (qk_tap_dance_state_t *state, void *user_data) {
+  comma_state.state = hold_cur_dance(state); //Use the dance that favors being held
+  switch (comma_state.state) {
+    case SINGLE_TAP: register_code(KC_COMMA); break;  
+    case SINGLE_HOLD: layer_on(1); break; //turn on symbols layer
+    case DOUBLE_TAP: layer_invert(4); break; //toggle numbers layer
+    case DOUBLE_HOLD: layer_on(2); break;
+    case TRIPLE_TAP: register_code(KC_CALCULATOR); break;
+    case TRIPLE_HOLD: layer_on(3);
+  }
+}   
+
+void comma_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (comma_state.state) {
+    case SINGLE_TAP: unregister_code(KC_COMMA); break; //unregister comma
+    case SINGLE_HOLD: layer_off(1); break; 
+    case DOUBLE_TAP: ;break;
+    case DOUBLE_HOLD: layer_off(2); break;
+    case TRIPLE_TAP: unregister_code(KC_CALCULATOR); break;
+    case TRIPLE_HOLD: layer_off(3);
+  }
+  comma_state.state = 0;
+}
+//*************** SUPER COMMA *******************//
+//*************** SUPER COMMA *******************//
+
+
+//*************** F3 TAP DANCE *******************//
+//Good example for accessing multiple layers from the same key.
+static xtap S1_state = { 
+  .is_press_action = true,
+  .state = 0
+};
+
+void bt_finished (qk_tap_dance_state_t *state, void *user_data) {
+  S1_state.state = cur_dance(state);
+  switch (S1_state.state) {
+    case SINGLE_TAP: register_code(KC_F3); break;
+    case SINGLE_HOLD: layer_on(4); break;
+    case DOUBLE_TAP: layer_invert(4); break;
+    case DOUBLE_HOLD: layer_on(5); break;
+    case DOUBLE_SINGLE_TAP: layer_invert(4); break;
+  }
+}
+
+void bt_reset (qk_tap_dance_state_t *state, void *user_data) {
+  switch (S1_state.state) {
+    case SINGLE_TAP: unregister_code(KC_F3); break;
+    case SINGLE_HOLD: layer_off(4); break;
+    case DOUBLE_TAP: break; //already inverted. Don't do anything.
+    case DOUBLE_HOLD: layer_off(5); break;
+    case DOUBLE_SINGLE_TAP: break;
+  }
+  S1_state.state = 0;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case KC_SECRET_1 ... KC_SECRET_5:
+    if (!record->event.pressed) {
+      send_string(secret[keycode - KC_SECRET_1]);
+    }
+    return false;
+    break;
+  }
+  return true;
+}
--- a/users/gordon/gordon.h
+++ b/users/gordon/gordon.h
@@ -0,0 +1,157 @@
+#ifndef GORDON
+#define GORDON
+
+#include "quantum.h"
+#include "process_keycode/process_tap_dance.h"
+
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define ________ KC_TRNS
+#define _________ KC_TRNS
+#define XXXXXXX KC_NO
+
+// KC codes that are too long
+#define DOLLAR KC_DOLLAR
+#define LSQUIGLY KC_LBRACKET
+#define RSQUIGLY KC_RBRACKET
+#define NUMLOCK KC_NUMLOCK
+#define CAPLOCK KC_CAPSLOCK
+#define BK_SLASH KC_BSLASH
+#define ASTERSK KC_KP_ASTERISK
+ 
+// Navigation
+#define SNAPLEFT  LGUI(KC_LEFT)
+#define SNAPRGHT  LGUI(KC_RIGHT)
+#define SNAPUP    LGUI(KC_UP)
+#define SNAPDOWN  LGUI(KC_DOWN)
+#define PREVTAB   LCTL(LSFT(KC_TAB))
+#define NEXTTAB   LCTL(KC_TAB)
+#define WORKRIGHT LCTL(LGUI(KC_RIGHT))
+#define WORKLEFT  LCTL(LGUI(KC_LEFT))
+
+// KC/modifier hold
+#define CTRL_F   CTL_T(KC_F)
+#define CTRL_J   CTL_T(KC_J)
+#define CTRL_Z   CTL_T(KC_Z)
+#define ALT_V    ALT_T(KC_V)
+#define ALT_M    ALT_T(KC_M)
+#define WIN_G    GUI_T(KC_G)
+#define WIN_H    GUI_T(KC_H)
+#define HYPER_X  ALL_T(KC_X)
+#define HYPE_DOT ALL_T(KC_DOT)
+#define MEH_S    MEH_T(KC_S)
+#define MEH_L    MEH_T(KC_L)
+#define ALT_HOME ALT_T(KC_HOME)
+
+
+// KC/Layer Hold
+#define NAV_E    LT(_NAV,KC_E)
+#define NUMPAD_D LT(_NUMPAD,KC_D)
+#define MOUSE_C  LT(_MOUSE,KC_C)
+#define SYMB_BSP LT(_SYMBOLS,KC_BSPACE)
+#define COL_MOUS LT(_MOUSE,KC_SCOLON)
+#define SPAC_SYM LT(_SYMBOLS,KC_SPACE)
+
+// Double Modifier ONLY hold
+#define ALT_SHFT LSFT(KC_LALT)
+#define CTR_SHFT LSFT(KC_LCTL)
+
+// KC/Double modifier Hold
+#define CTR_SH_W MT(MOD_LCTL|MOD_LSFT,KC_W)
+#define CTR_AL_R MT(MOD_LCTL|MOD_LALT,KC_R)
+
+//MISC
+#define PRINTSCR KC_PSCREEN
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+typedef struct {
+  bool is_press_action;
+  int state;
+} xtap;
+
+enum {
+  SINGLE_TAP = 1,
+  SINGLE_HOLD = 2,
+  DOUBLE_TAP = 3,
+  DOUBLE_HOLD = 4,
+  DOUBLE_SINGLE_TAP = 5, //send two single taps
+  TRIPLE_TAP = 6,
+  TRIPLE_HOLD = 7
+};
+
+enum gordon_layers
+{
+  _QWERTY = 0,
+  _SYMBOLS,
+  _MOUSE,
+  _NUMPAD,
+  _NAV,
+  _MACROS,
+  _FUNCTION,
+  _TEXTNAV
+};
+
+
+
+void register_hyper (void);
+void unregister_hyper (void);
+
+void register_ctrl_a (void); 
+void unregister_ctrl_a (void); 
+
+void register_alt_f7 (void); 
+void unregister_alt_f7 (void);
+
+void register_shift_f6 (void); 
+void unregister_shift_f6 (void); 
+
+void register_ctrl_shift (void); 
+void unregister_ctrl_shift (void); 
+
+void register_alt_shift (void); 
+void unregister_alt_shift (void);
+
+int cur_dance (qk_tap_dance_state_t *state); 
+int hold_cur_dance (qk_tap_dance_state_t *state); 
+
+void x_finished (qk_tap_dance_state_t *state, void *user_data);
+void x_reset (qk_tap_dance_state_t *state, void *user_data);
+
+void h_finished (qk_tap_dance_state_t *state, void *user_data);
+void h_reset (qk_tap_dance_state_t *state, void *user_data);
+
+void tab_finished (qk_tap_dance_state_t *state, void *user_data);
+void tab_reset (qk_tap_dance_state_t *state, void *user_data);
+
+void comma_finished (qk_tap_dance_state_t *state, void *user_data);
+void comma_reset (qk_tap_dance_state_t *state, void *user_data);
+
+void bt_finished (qk_tap_dance_state_t *state, void *user_data);
+void bt_reset (qk_tap_dance_state_t *state, void *user_data);
+
+// Macro Declarations
+enum {
+  INFOQM,
+  TIL_SLASH,
+  DEREF,
+  EQRIGHT,
+  TILD3,
+  TICK3,
+  ALTTAB_START,
+  ALTTAB_END
+};
+
+enum secret_strings {
+  KC_SECRET_1 = SAFE_RANGE,
+  KC_SECRET_2,
+  KC_SECRET_3,
+  KC_SECRET_4,
+  KC_SECRET_5,
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
+
+#endif
--- a/users/gordon/readme.md
+++ b/users/gordon/readme.md
@@ -0,0 +1,14 @@
+Copyright <year> <name> <email> @<github_username>
+
+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/>.
--- a/users/gordon/rules.mk
+++ b/users/gordon/rules.mk
@@ -0,0 +1 @@
+SRC += gordon.c
Author	SHA1	Message	Date
skullydazed	5836d1a06a	Fix up the ARM audio support (#2136 ) * Get audio working on clueboard/60 * add keys for music mode * Change doubles to floats * add keys for all the songs * revert to the default startup sound * Remove music mode until we can figure out why it crashes	2018-01-13 23:38:25 -05:00
manofinterests	fd359e23e8	Update info.json	2018-01-12 20:24:48 -08:00
Jack Humbert	4aef0318aa	Update info.json	2018-01-12 20:47:39 -05:00
Marco Scannadinari	8209304904	Reset color after submodule warning message Fixes leaking bold text	2018-01-12 13:25:05 -05:00
noisebomb44	6bbe2366ec	Update ergodone.c	2018-01-12 13:24:30 -05:00
Kaleb Elwert	3be81a2daf	Fix call to memset for various keyboards	2018-01-12 13:23:38 -05:00
chancellorr	586a5e8d1d	Adding my Tada68 Keymap.	2018-01-12 13:20:53 -05:00
Daniel Gordon	383a3c1e08	Add Daniel Gordon's Ergodox Infinity and Chimera * gordon.c defines many aliases for KC codes. * gordon.c defines many advanced tap dance functions. * This is a squashed commit of about 6 months of work on chimera and ergodox infinity changes. * Ignore the change-id below. Change-Id: I83927139e8a80fe08992ae91ec7d62571498f7f7	2018-01-12 13:14:19 -05:00