From d5b72e7bde5ede25f7d5699b50b7d9eb6f31ba92 Mon Sep 17 00:00:00 2001
From: IBNobody <ibnobody@gmail.com>
Date: Sun, 17 Apr 2016 12:54:32 -0500
Subject: Fixed many compiler warnings related to print being disabled

---
 tmk_core/common/action.c         |  8 ++++----
 tmk_core/common/action_layer.c   | 12 ++++++------
 tmk_core/common/action_macro.c   |  8 ++++----
 tmk_core/common/action_tapping.c | 11 ++++++-----
 tmk_core/common/command.c        | 25 ++++++++++++++++---------
 tmk_core/common/print.h          | 12 ++++++------
 6 files changed, 42 insertions(+), 34 deletions(-)

(limited to 'tmk_core/common')

diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f9e6c17dc3..0162fbd632 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -27,11 +27,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_util.h"
 #include "action.h"
 
-#ifdef DEBUG_ACTION
+//#ifdef DEBUG_ACTION
 #include "debug.h"
-#else
-#include "nodebug.h"
-#endif
+//#else
+//#include "nodebug.h"
+//#endif
 
 
 void action_exec(keyevent_t event)
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index e817c0d515..845fbbb210 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -4,14 +4,14 @@
 #include "util.h"
 #include "action_layer.h"
 
-#ifdef DEBUG_ACTION
+//#ifdef DEBUG_ACTION
 #include "debug.h"
-#else
-#include "nodebug.h"
-#endif
+//#else
+//#include "nodebug.h"
+//#endif
 
 
-/* 
+/*
  * Default Layer State
  */
 uint32_t default_layer_state = 0;
@@ -52,7 +52,7 @@ void default_layer_xor(uint32_t state)
 
 
 #ifndef NO_ACTION_LAYER
-/* 
+/*
  * Keymap Layer State
  */
 uint32_t layer_state = 0;
diff --git a/tmk_core/common/action_macro.c b/tmk_core/common/action_macro.c
index 7726b11907..cc78c82327 100644
--- a/tmk_core/common/action_macro.c
+++ b/tmk_core/common/action_macro.c
@@ -19,11 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_macro.h"
 #include "wait.h"
 
-#ifdef DEBUG_ACTION
+//#ifdef DEBUG_ACTION
 #include "debug.h"
-#else
-#include "nodebug.h"
-#endif
+//#else
+//#include "nodebug.h"
+//#endif
 
 
 #ifndef NO_ACTION_MACRO
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c
index 826c233096..6b6fa1dfe2 100644
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@@ -6,11 +6,11 @@
 #include "keycode.h"
 #include "timer.h"
 
-#ifdef DEBUG_ACTION
+//#ifdef DEBUG_ACTION
 #include "debug.h"
-#else
-#include "nodebug.h"
-#endif
+//#else
+//#include "nodebug.h"
+//#endif
 
 #ifndef NO_ACTION_TAPPING
 
@@ -139,7 +139,7 @@ bool process_tapping(keyrecord_t *keyp)
                     if (event.pressed) {
                         tapping_key.tap.interrupted = true;
                     }
-                    // enqueue 
+                    // enqueue
                     return false;
                 }
             }
@@ -324,6 +324,7 @@ bool waiting_buffer_typed(keyevent_t event)
     return false;
 }
 
+__attribute__((unused))
 bool waiting_buffer_has_anykey_pressed(void)
 {
     for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index b4cd3ca56b..7572b95979 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -122,7 +122,7 @@ static void command_common_help(void)
 		STR(MAGIC_KEY_VERSION     ) ":	Version\n"
 		STR(MAGIC_KEY_STATUS      ) ":	Status\n"
 		STR(MAGIC_KEY_CONSOLE     ) ":	Activate Console Mode\n"
-		
+
 #if MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
 		STR(MAGIC_KEY_LAYER0      ) ":	Switch to Layer 0\n"
 		STR(MAGIC_KEY_LAYER1      ) ":	Switch to Layer 1\n"
@@ -136,11 +136,11 @@ static void command_common_help(void)
 		STR(MAGIC_KEY_LAYER9      ) ":	Switch to Layer 9\n"
 #endif
 
-#if MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS							
+#if MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
 		                            "F1-F10:	Switch to Layer 0-9 (F10 = L0)\n"
 #endif
 
-#if MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS							
+#if MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
 		                            "0-9:	Switch to Layer 0-9\n"
 #endif
 
@@ -251,6 +251,7 @@ static void print_status(void)
 #ifdef BOOTMAGIC_ENABLE
 static void print_eeconfig(void)
 {
+#ifndef NO_PRINT
     print("default_layer: "); print_dec(eeconfig_read_default_layer()); print("\n");
 
     debug_config_t dc;
@@ -279,9 +280,12 @@ static void print_eeconfig(void)
     print("backlight_config.raw: "); print_hex8(bc.raw); print("\n");
     print(".enable: "); print_dec(bc.enable); print("\n");
     print(".level: "); print_dec(bc.level); print("\n");
-#endif
+#endif /* BACKLIGHT_ENABLE */
+
+#endif /* !NO_PRINT */
+
 }
-#endif
+#endif /* BOOTMAGIC_ENABLE */
 
 static bool command_common(uint8_t code)
 {
@@ -305,7 +309,7 @@ static bool command_common(uint8_t code)
 #ifdef BOOTMAGIC_ENABLE
 
 		// print stored eeprom config
-        case MAGIC_KC(MAGIC_KEY_EEPROM):        
+        case MAGIC_KC(MAGIC_KEY_EEPROM):
             print("eeconfig:\n");
             print_eeconfig();
             break;
@@ -369,7 +373,7 @@ static bool command_common(uint8_t code)
             break;
 
         // debug matrix toggle
-        case MAGIC_KC(MAGIC_KEY_DEBUG_MATRIX): 
+        case MAGIC_KC(MAGIC_KEY_DEBUG_MATRIX):
             debug_matrix = !debug_matrix;
             if (debug_matrix) {
                 print("\nmatrix: on\n");
@@ -380,7 +384,7 @@ static bool command_common(uint8_t code)
             break;
 
         // debug keyboard toggle
-        case MAGIC_KC(MAGIC_KEY_DEBUG_KBD): 
+        case MAGIC_KC(MAGIC_KEY_DEBUG_KBD):
             debug_keyboard = !debug_keyboard;
             if (debug_keyboard) {
                 print("\nkeyboard: on\n");
@@ -551,6 +555,7 @@ static uint8_t mousekey_param = 0;
 
 static void mousekey_param_print(void)
 {
+#ifndef NO_PRINT
     print("\n\t- Values -\n");
     print("1: delay(*10ms): "); pdec(mk_delay); print("\n");
     print("2: interval(ms): "); pdec(mk_interval); print("\n");
@@ -558,6 +563,8 @@ static void mousekey_param_print(void)
     print("4: time_to_max: "); pdec(mk_time_to_max); print("\n");
     print("5: wheel_max_speed: "); pdec(mk_wheel_max_speed); print("\n");
     print("6: wheel_time_to_max: "); pdec(mk_wheel_time_to_max); print("\n");
+#endif /* !NO_PRINT */
+
 }
 
 //#define PRINT_SET_VAL(v)  print(#v " = "); print_dec(v); print("\n");
@@ -677,7 +684,7 @@ static void mousekey_console_help(void)
           "pgdown:	-10\n"
           "\n"
           "speed = delta * max_speed * (repeat / time_to_max)\n");
-    xprintf("where delta: cursor=%d, wheel=%d\n" 
+    xprintf("where delta: cursor=%d, wheel=%d\n"
             "See http://en.wikipedia.org/wiki/Mouse_keys\n", MOUSEKEY_MOVE_DELTA,  MOUSEKEY_WHEEL_DELTA);
 }
 
diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h
index c0e9e14309..4f3dde65aa 100644
--- a/tmk_core/common/print.h
+++ b/tmk_core/common/print.h
@@ -2,17 +2,17 @@
 /* Very basic print functions, intended to be used with usb_debug_only.c
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2008 PJRC.COM, LLC
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -91,9 +91,9 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
 
 #else   /* NO_PRINT */
 
-#define xprintf
-#define print
-#define println
+#define xprintf(fmt, ...)
+#define print(s)
+#define println(s)
 #define print_set_sendchar(func)
 #define print_dec(data)
 #define print_decs(data)
-- 
cgit v1.2.3


From 5c98ad59606ee95b82c27bf2525383a9ec88542b Mon Sep 17 00:00:00 2001
From: IBNobody <ibnobody@gmail.com>
Date: Sun, 17 Apr 2016 20:14:37 -0500
Subject: Added extra songs, LED indicator notes

---
 keyboard/atomic/atomic.c                |  31 +++-
 keyboard/atomic/keymaps/pvc/config.h    |  10 +-
 keyboard/atomic/keymaps/pvc/keymap.c    | 292 ++++++++++++++++++--------------
 keyboard/atomic/keymaps/pvc/makefile.mk |   2 +-
 keyboard/planck/keymaps/pvc_planck.c    |  24 +--
 keyboard/retro_refit/retro_refit.c      |  32 ++--
 quantum/audio.c                         |  17 +-
 quantum/audio.h                         |   2 +
 quantum/keymap_common.c                 |  14 +-
 quantum/musical_notes.h                 |   5 +
 quantum/song_list.h                     | 104 ++++++++++--
 tmk_core/common/command.c               |   7 +
 12 files changed, 346 insertions(+), 194 deletions(-)

(limited to 'tmk_core/common')

diff --git a/keyboard/atomic/atomic.c b/keyboard/atomic/atomic.c
index 30e8122893..5e31264e68 100644
--- a/keyboard/atomic/atomic.c
+++ b/keyboard/atomic/atomic.c
@@ -2,12 +2,22 @@
 
 __attribute__ ((weak))
 void matrix_init_user(void) {
-	// leave these blank
-}
+	// leave this function blank - it can be defined in a keymap file
+};
 
 __attribute__ ((weak))
 void matrix_scan_user(void) {
-	// leave these blank
+	// leave this function blank - it can be defined in a keymap file
+}
+
+__attribute__ ((weak))
+void process_action_user(keyrecord_t *record) {
+	// leave this function blank - it can be defined in a keymap file
+}
+
+__attribute__ ((weak))
+void led_set_user(uint8_t usb_led) {
+	// leave this function blank - it can be defined in a keymap file
 }
 
 void matrix_init_kb(void) {
@@ -33,4 +43,17 @@ void matrix_scan_kb(void) {
 	// runs every cycle (a lot)
 
 	matrix_scan_user();
-}
\ No newline at end of file
+}
+
+void process_action_kb(keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	process_action_user(record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}
diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h
index 8449fa06de..cb0b78e447 100644
--- a/keyboard/atomic/keymaps/pvc/config.h
+++ b/keyboard/atomic/keymaps/pvc/config.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
-*/ 
+*/
 #define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
 #define ROWS (int []){ D0, D5, B5, B6, B3 }
 
@@ -62,17 +62,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* 
+/*
  * Force NKRO
  *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved 
+ * 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 
+ * 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)
@@ -90,7 +90,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * the keyboard. They are best used in combination with the HID Listen program,
  * found here: https://www.pjrc.com/teensy/hid_listen.html
  *
- * The options below allow the magic key functionality to be changed. This is 
+ * The options below allow the magic key functionality to be changed. This is
  * useful if your keyboard/keypad is missing keys and you want magic key support.
  *
  */
diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index aaef6b041d..563519e4c0 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -1,17 +1,18 @@
 #include "atomic.h"
 #include "action_layer.h"
+#include "led.h"
 
 #ifdef AUDIO_ENABLE
 #include "audio.h"
 #include "song_list.h"
 #endif
 
-
 #define _QW 0
 #define _LW 1
 #define _RS 2
 #define _AD 3
 #define _FN 4
+#define _MUSIC 4
 
 #define M_QW 0
 #define M_LW 1
@@ -24,6 +25,24 @@
 #define M_TU 8
 #define M_TD 9
 #define M_DF 10
+#define M_MUSIC_ON  11
+#define M_MUSIC_OFF 12
+#define M_AUDIO_ON  13
+#define M_AUDIO_OFF 14
+
+#define TIMBR_1 M(M_T1)
+#define TIMBR_2 M(M_T2)
+#define TIMBR_3 M(M_T3)
+#define TIMBR_4 M(M_T4)
+#define TMPO_UP M(M_TU)
+#define TMPO_DN M(M_TD)
+#define TMPO_DF M(M_DF)
+
+
+#define MUS_ON  M(M_MUSIC_ON)
+#define MUS_OFF M(M_MUSIC_OFF)
+#define AUD_OFF M(M_AUDIO_OFF)
+#define AUD_ON  M(M_AUDIO_ON)
 
 
 #define _______ KC_TRNS
@@ -70,135 +89,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
   { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
   { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
-  { _______, M(M_T1), M(M_T2), M(M_T3), M(M_T4), M(M_TU), M(M_TD), M(M_DF), _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
   { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
  },
  [_AD] = { /* ADJUST */
+  { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, MUS_ON,  MUS_OFF, AUD_ON,  AUD_OFF, ___T___, ___T___  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
+  { _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
+  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+ },
+[_MUSIC] = {
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
-};
-
-
-
-#ifdef AUDIO_ENABLE
+}
 
-float start_up[][2] = SONG(ODE_TO_JOY);
-
-float tone_lw[][2] = {
-
-	Q__NOTE(_C4   ) ,
-	Q__NOTE(_CS4  ) ,
-	Q__NOTE(_D4   ) ,
-	Q__NOTE(_DS4  ) ,
-	Q__NOTE(_E4   ) ,
-	Q__NOTE(_F4   ) ,
-	Q__NOTE(_FS4  ) ,
-	Q__NOTE(_G4   ) ,
-	Q__NOTE(_GS4  ) ,
-	Q__NOTE(_A4   ) ,
-	Q__NOTE(_AS4  ) ,
-
-	Q__NOTE(_B1   ) ,
-
-	Q__NOTE(_C2   ) ,
-	Q__NOTE(_CS2  ) ,
-	Q__NOTE(_D2   ) ,
-	Q__NOTE(_DS2  ) ,
-	Q__NOTE(_E2   ) ,
-	Q__NOTE(_F2   ) ,
-	Q__NOTE(_FS2  ) ,
-	Q__NOTE(_G2   ) ,
-	Q__NOTE(_GS2  ) ,
-	Q__NOTE(_A2   ) ,
-	Q__NOTE(_AS2  ) ,
-	Q__NOTE(_B2   ) ,
-	Q__NOTE(_C3   ) ,
-	Q__NOTE(_CS3  ) ,
-	Q__NOTE(_D3   ) ,
-	Q__NOTE(_DS3  ) ,
-	Q__NOTE(_E3   ) ,
-	Q__NOTE(_F3   ) ,
-	Q__NOTE(_FS3  ) ,
-	Q__NOTE(_G3   ) ,
-	Q__NOTE(_GS3  ) ,
-	Q__NOTE(_A3   ) ,
-	Q__NOTE(_AS3  ) ,
-	Q__NOTE(_B3   ) ,
-	Q__NOTE(_C4   ) ,
-	Q__NOTE(_CS4  ) ,
-	Q__NOTE(_D4   ) ,
-	Q__NOTE(_DS4  ) ,
-	Q__NOTE(_E4   ) ,
-	Q__NOTE(_F4   ) ,
-	Q__NOTE(_FS4  ) ,
-	Q__NOTE(_G4   ) ,
-	Q__NOTE(_GS4  ) ,
-	Q__NOTE(_A4   ) ,
-	Q__NOTE(_AS4  ) ,
-	Q__NOTE(_B4   ) ,
-	Q__NOTE(_C5   ) ,
-	Q__NOTE(_CS5  ) ,
-	Q__NOTE(_D5   ) ,
-	Q__NOTE(_DS5  ) ,
-	Q__NOTE(_E5   ) ,
-	Q__NOTE(_F5   ) ,
-	Q__NOTE(_FS5  ) ,
-	Q__NOTE(_G5   ) ,
-	Q__NOTE(_GS5  ) ,
-	Q__NOTE(_A5   ) ,
-	Q__NOTE(_AS5  ) ,
-	Q__NOTE(_B5   ) ,
-	Q__NOTE(_C6   ) ,
-	Q__NOTE(_CS6  ) ,
-	Q__NOTE(_D6   ) ,
-	Q__NOTE(_DS6  ) ,
-	Q__NOTE(_E6   ) ,
-	Q__NOTE(_F6   ) ,
-	Q__NOTE(_FS6  ) ,
-	Q__NOTE(_G6   ) ,
-	Q__NOTE(_GS6  ) ,
-	Q__NOTE(_A6   ) ,
-	Q__NOTE(_AS6  ) ,
-	Q__NOTE(_B6   ) ,
-	Q__NOTE(_C7   ) ,
-	Q__NOTE(_CS7  ) ,
-	Q__NOTE(_D7   ) ,
-	Q__NOTE(_DS7  ) ,
-	Q__NOTE(_E7   ) ,
-	Q__NOTE(_F7   ) ,
-	Q__NOTE(_FS7  ) ,
-	Q__NOTE(_G7   ) ,
-	Q__NOTE(_GS7  ) ,
-	Q__NOTE(_A7   ) ,
-	Q__NOTE(_AS7  ) ,
-	Q__NOTE(_B7   ) ,
-	Q__NOTE(_C8   ) ,
-	Q__NOTE(_CS8  ) ,
-	Q__NOTE(_D8   ) ,
-	Q__NOTE(_DS8  ) ,
-	Q__NOTE(_E8   ) ,
-	Q__NOTE(_F8   ) ,
-	Q__NOTE(_FS8  ) ,
-	Q__NOTE(_G8   ) ,
-	Q__NOTE(_GS8  ) ,
-	Q__NOTE(_A8   ) ,
-	Q__NOTE(_AS8  ) ,
-	Q__NOTE(_B8   ) ,
 };
 
-float tone_rs[][2] = SONG(ROCK_A_BYE_BABY);
+#ifdef AUDIO_ENABLE
 
-void matrix_init_user(void) {
-	init_notes();
-	PLAY_NOTE_ARRAY(start_up, false, STACCATO);
-	println("Matrix Init");
-}
+float tone_my_startup[][2] = SONG(ODE_TO_JOY);
+float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
+float tone_audio_on[][2]   = SONG(CLOSE_ENCOUNTERS_5_NOTE);
+float tone_music_on[][2]   = SONG(DOE_A_DEER);
+float tone_caps_on[][2]    = SONG(CAPS_LOCK_ON_SOUND);
+float tone_caps_off[][2]   = SONG(CAPS_LOCK_OFF_SOUND);
+float tone_numlk_on[][2]   = SONG(NUM_LOCK_ON_SOUND);
+float tone_numlk_off[][2]  = SONG(NUM_LOCK_OFF_SOUND);
+float tone_scroll_on[][2]  = SONG(SCROLL_LOCK_ON_SOUND);
+float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
 
-#endif
+#endif /* AUDIO_ENABLE */
 
 
 void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
@@ -242,9 +166,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 	{
 		case M_LW:
 			if (record->event.pressed) {
-				#ifdef AUDIO_ENABLE
-				PLAY_NOTE_ARRAY(tone_lw, false, STACCATO);
-				#endif
 				layer_on(_LW);
 				update_tri_layer(_LW, _RS, _AD);
 			} else {
@@ -254,9 +175,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			break;
 		case M_RS:
 			if (record->event.pressed) {
-				#ifdef AUDIO_ENABLE
-				PLAY_NOTE_ARRAY(tone_rs, false, LEGATO);
-				#endif
 				layer_on(_RS);
 				update_tri_layer(_LW, _RS, _AD);
 			} else {
@@ -306,9 +224,135 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			}
 			break;
 
+		case M_AUDIO_OFF:
+			if (record->event.pressed) {
+				#ifdef AUDIO_ENABLE
+				audio_off();
+				#endif
+			}
+			break;
+
+		case M_AUDIO_ON:
+			if (record->event.pressed)
+			{
+				#ifdef AUDIO_ENABLE
+				audio_on();
+				PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+				#endif
+			}
+			break;
+
+		case M_MUSIC_ON:
+			if (record->event.pressed)
+			{
+				#ifdef AUDIO_ENABLE
+				PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+				layer_on(_MUSIC);
+				#endif
+			}
+			break;
+
+		case M_MUSIC_OFF:
+			if (record->event.pressed)
+			{
+				#ifdef AUDIO_ENABLE
+				layer_off(_MUSIC);
+				stop_all_notes();
+				#endif
+			}
+			break;
+
 		default:
 			break;
 
 	}
 	return MACRO_NONE;
-};
\ No newline at end of file
+};
+
+
+#ifdef AUDIO_ENABLE
+
+uint8_t starting_note = 0x0C;
+int offset = 7;
+
+
+void process_action_user(keyrecord_t *record)
+{
+	if (IS_LAYER_ON(_MUSIC))
+	{
+		if (record->event.pressed)
+		{
+			play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
+		}
+		else
+		{
+			stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
+		}
+	}
+}
+
+
+void matrix_init_user(void)
+{
+	init_notes();
+	play_startup_tone();
+	println("Matrix Init");
+}
+
+void led_set_user(uint8_t usb_led)
+{
+	static uint8_t old_usb_led = 0;
+	static bool first_run = true;
+
+	// Skip first execution to avoid beeps caused by LED states being detected on power-up
+	if (!first_run)
+	{
+
+		if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+		{
+				// If CAPS LK LED is turning on...
+				PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
+	    }
+		else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+	    {
+				// If CAPS LK LED is turning off...
+				PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+	    }
+		else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+		{
+				// If NUM LK LED is turning on...
+				PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
+	    }
+		else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+	    {
+				// If NUM LED is turning off...
+				PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+	    }
+		else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+		{
+				// If SCROLL LK LED is turning on...
+				PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
+	    }
+		else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+	    {
+				// If SCROLL LED is turning off...
+				PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+	    }
+	}
+	old_usb_led = usb_led;
+	first_run = false;
+}
+
+
+void play_startup_tone()
+{
+	PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
+}
+
+void play_goodbye_tone()
+{
+	PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
+	_delay_ms(2000);
+}
+
+#endif /* AUDIO_ENABLE */
diff --git a/keyboard/atomic/keymaps/pvc/makefile.mk b/keyboard/atomic/keymaps/pvc/makefile.mk
index d469966501..eefa42855f 100644
--- a/keyboard/atomic/keymaps/pvc/makefile.mk
+++ b/keyboard/atomic/keymaps/pvc/makefile.mk
@@ -1,7 +1,7 @@
 BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = yes # Console for debug(+400)
+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 = no  # Enable keyboard backlight functionality
diff --git a/keyboard/planck/keymaps/pvc_planck.c b/keyboard/planck/keymaps/pvc_planck.c
index 20bb5d86d7..1de8acb1ea 100644
--- a/keyboard/planck/keymaps/pvc_planck.c
+++ b/keyboard/planck/keymaps/pvc_planck.c
@@ -131,8 +131,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_FN] = {
   {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
-  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    MG_H, 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, XXXXXXX},
   {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
 }
 };
@@ -142,16 +142,6 @@ const uint16_t PROGMEM fn_actions[] = {
 };
 
 
-int tri_layer = 0;
-void update_tri_layer(int layer) {
-  if (tri_layer > 1) {
-    layer_on(layer);
-  } else {
-    layer_off(layer);
-  }
-}
-
-
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
 	// MACRODOWN only works in this function
@@ -161,13 +151,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			if (record->event.pressed) {
 				print("RS_DN");
 				layer_on(_RS);
-				tri_layer++;
-				update_tri_layer(_FN);
+				update_tri_layer(_RS, _LW, _FN);
 			} else {
 				print("RS_UP");
 				layer_off(_RS);
-				tri_layer--;
-				update_tri_layer(_FN);
+				update_tri_layer(_RS, _LW, _FN);
 				phex(layer_state);
 			}
 			break;
@@ -176,13 +164,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			if (record->event.pressed) {
 				print("LW_DN");
 				layer_on(_LW);
-				tri_layer++;
-				update_tri_layer(_FN);
+				update_tri_layer(_RS, _LW, _FN);
 			} else {
 				print("LW_UP");
 				layer_off(_LW);
-				tri_layer--;
-				update_tri_layer(_FN);
+				update_tri_layer(_RS, _LW, _FN);
 			}
 			break;
 
diff --git a/keyboard/retro_refit/retro_refit.c b/keyboard/retro_refit/retro_refit.c
index 0b13eb8301..78b6edca75 100644
--- a/keyboard/retro_refit/retro_refit.c
+++ b/keyboard/retro_refit/retro_refit.c
@@ -2,39 +2,39 @@
 
 __attribute__ ((weak))
 void matrix_init_user(void) {
-	// leave this function blank - it can be defined in a keymap file
+    // leave this function blank - it can be defined in a keymap file
 };
 
 __attribute__ ((weak))
 void matrix_scan_user(void) {
-	// leave this function blank - it can be defined in a keymap file
+    // leave this function blank - it can be defined in a keymap file
 };
 
 __attribute__ ((weak))
 void led_set_user(uint8_t usb_led) {
-	// leave this function blank - it can be defined in a keymap file
+    // leave this function blank - it can be defined in a keymap file
 };
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	
-	// Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS)
-	DDRD |= (1<<6);
-	PORTD |= (1<<6);
-	
-	matrix_init_user();
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+
+    // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS)
+    DDRD |= (1<<6);
+    PORTD |= (1<<6);
+
+    matrix_init_user();
 };
 
 void amatrix_scan_kb(void) {
     // put your looping keyboard code here
     // runs every cycle (a lot)
 
-	matrix_scan_user();
+    matrix_scan_user();
 };
 
 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
         // output low
@@ -62,7 +62,7 @@ void led_set_kb(uint8_t usb_led) {
         // Hi-Z
         DDRC &= ~(1<<6);
         PORTC &= ~(1<<6);
-    }	
-	
-	led_set_user(usb_led);
+    }
+
+    led_set_user(usb_led);
 };
\ No newline at end of file
diff --git a/quantum/audio.c b/quantum/audio.c
index 3ccd5ab9bc..6023669739 100644
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@ -351,7 +351,7 @@ void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest)
 
 if (audio_config.enable) {
 
-    if (note)
+    if (note || notes)
         stop_all_notes();
 
     notes_pointer = np;
@@ -406,7 +406,7 @@ void play_note(double freq, int vol) {
 
 if (audio_config.enable && voices < 8) {
 
-    if (notes)
+    if (note || notes)
         stop_all_notes();
     #ifdef PWM_AUDIO
         freq = freq / SAMPLE_RATE;
@@ -471,3 +471,16 @@ void increase_tempo(uint8_t tempo_change)
 		}
 }
 
+//------------------------------------------------------------------------------
+// Override these functions in your keymap file to play different tunes on
+// startup and bootloader jump
+__attribute__ ((weak))
+void play_startup_tone()
+{
+}
+
+__attribute__ ((weak))
+void play_goodbye_tone()
+{
+}
+//------------------------------------------------------------------------------
diff --git a/quantum/audio.h b/quantum/audio.h
index 05d314c940..44cafccd68 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -44,5 +44,7 @@ void decrease_tempo(uint8_t tempo_change);
 #define NOTE_ARRAY_SIZE(x) ((int)(sizeof(x) / (sizeof(x[0]))))
 #define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style));
 
+void play_goodbye_tone(void);
+void play_startup_tone(void);
 
 #endif
\ No newline at end of file
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 2001438b90..4ee290ad03 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -34,12 +34,6 @@ extern keymap_config_t keymap_config;
 #include <inttypes.h>
 #ifdef AUDIO_ENABLE
     #include "audio.h"
-
-    #ifndef TONE_GOODBYE
-    	#define TONE_GOODBYE OLKB_GOODBYE
-    #endif /*! TONE_GOODBYE */
-
-    float tone_goodbye[][2] = SONG(TONE_GOODBYE);
 #endif /* AUDIO_ENABLE */
 
 static action_t keycode_to_action(uint16_t keycode);
@@ -47,7 +41,7 @@ static action_t keycode_to_action(uint16_t keycode);
 /* converts key to action */
 action_t action_for_key(uint8_t layer, keypos_t key)
 {
-	// 16bit keycodes - important
+    // 16bit keycodes - important
     uint16_t keycode = keymap_key_to_keycode(layer, key);
 
     switch (keycode) {
@@ -190,7 +184,7 @@ static action_t keycode_to_action(uint16_t keycode)
         case RESET: ; // RESET is 0x5000, which is why this is here
             clear_keyboard();
             #ifdef AUDIO_ENABLE
-                PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+                play_goodbye_tone();
             #endif
             _delay_ms(250);
             #ifdef ATREUS_ASTAR
@@ -303,7 +297,7 @@ static action_t keycode_to_action(uint16_t keycode)
 /* translates key to keycode */
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
 {
-	// Read entire word (16bits)
+    // Read entire word (16bits)
     return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]);
 }
 
@@ -315,7 +309,7 @@ action_t keymap_fn_to_action(uint16_t keycode)
 
 action_t keymap_func_to_action(uint16_t keycode)
 {
-	// For FUNC without 8bit limit
+    // For FUNC without 8bit limit
     return (action_t){ .code = pgm_read_word(&fn_actions[(int)keycode]) };
 }
 
diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index ccdc34f270..b08d16a6fa 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -51,7 +51,10 @@
 
 
 // Notes - # = Octave
+
 #define NOTE_REST         0.00
+
+/* These notes are currently bugged
 #define NOTE_C0          16.35
 #define NOTE_CS0         17.32
 #define NOTE_D0          18.35
@@ -75,6 +78,8 @@
 #define NOTE_GS1         51.91
 #define NOTE_A1          55.00
 #define NOTE_AS1         58.27
+*/
+
 #define NOTE_B1          61.74
 #define NOTE_C2          65.41
 #define NOTE_CS2         69.30
diff --git a/quantum/song_list.h b/quantum/song_list.h
index b626c3fa6b..e992bd18a2 100644
--- a/quantum/song_list.h
+++ b/quantum/song_list.h
@@ -4,20 +4,98 @@
 #define SONG_LIST_H
 
 #define ODE_TO_JOY                                          \
-	Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \
-	Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \
-	Q__NOTE(_C4), Q__NOTE(_C4), Q__NOTE(_D4), Q__NOTE(_E4), \
-	QD_NOTE(_E4), E__NOTE(_D4), H__NOTE(_D4),
+    Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \
+    Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \
+    Q__NOTE(_C4), Q__NOTE(_C4), Q__NOTE(_D4), Q__NOTE(_E4), \
+    QD_NOTE(_E4), E__NOTE(_D4), H__NOTE(_D4),
 
 #define ROCK_A_BYE_BABY                            \
-	QD_NOTE(_B4), E__NOTE(_D4), Q__NOTE(_B5),      \
-	H__NOTE(_A5), Q__NOTE(_G5),                    \
-	QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5),      \
-	H__NOTE(_FS5),
-
-#define OLKB_GOODBYE \
-	E__NOTE(_E7),    \
-	E__NOTE(_A6),    \
-	ED_NOTE(_E6),
+    QD_NOTE(_B4), E__NOTE(_D4), Q__NOTE(_B5),      \
+    H__NOTE(_A5), Q__NOTE(_G5),                    \
+    QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5),      \
+    H__NOTE(_FS5),
+
+#define CLOSE_ENCOUNTERS_5_NOTE  \
+	Q__NOTE(_D5),                \
+	Q__NOTE(_E5),                \
+	Q__NOTE(_C5),                \
+	Q__NOTE(_C4),                \
+	Q__NOTE(_G4),
+
+#define DOE_A_DEER              \
+	QD_NOTE(_C4), E__NOTE(_D4), \
+	QD_NOTE(_E4), E__NOTE(_C4), \
+	Q__NOTE(_E4), Q__NOTE(_C4), \
+	Q__NOTE(_E4),
+
+#define GOODBYE_SOUND \
+    E__NOTE(_E7),     \
+    E__NOTE(_A6),     \
+    ED_NOTE(_E6),
+
+#define STARTUP_SOUND  \
+    ED_NOTE(_E7 ),     \
+    E__NOTE(_CS7),     \
+    E__NOTE(_E6 ),     \
+    E__NOTE(_A6 ),     \
+    M__NOTE(_CS7, 20),
+
+#define QWERTY_SOUND \
+    E__NOTE(_GS6 ),  \
+    E__NOTE(_A6  ),  \
+    S__NOTE(_REST),  \
+    Q__NOTE(_E7  ),
+
+#define COLEMAK_SOUND \
+    E__NOTE(_GS6 ),   \
+    E__NOTE(_A6  ),   \
+    S__NOTE(_REST),   \
+    ED_NOTE(_E7  ),   \
+    S__NOTE(_REST),   \
+    ED_NOTE(_GS7 ),
+
+#define DVORAK_SOUND \
+    E__NOTE(_GS6 ),  \
+    E__NOTE(_A6  ),  \
+    S__NOTE(_REST),  \
+    E__NOTE(_E7  ),  \
+    S__NOTE(_REST),  \
+    E__NOTE(_FS7 ),  \
+    S__NOTE(_REST),  \
+    E__NOTE(_E7  ),
+
+#define MUSIC_SCALE_SOUND \
+    E__NOTE(_A5 ),        \
+    E__NOTE(_B5 ),        \
+    E__NOTE(_CS6),        \
+    E__NOTE(_D6 ),        \
+    E__NOTE(_E6 ),        \
+    E__NOTE(_FS6),        \
+    E__NOTE(_GS6),        \
+    E__NOTE(_A6 ),
+
+#define CAPS_LOCK_ON_SOUND \
+    E__NOTE(_A3),          \
+    E__NOTE(_B3),
+
+#define CAPS_LOCK_OFF_SOUND \
+    E__NOTE(_B3),           \
+    E__NOTE(_A3),
+
+#define SCROLL_LOCK_ON_SOUND \
+    E__NOTE(_D4),            \
+    E__NOTE(_E4),
+
+#define SCROLL_LOCK_OFF_SOUND \
+    E__NOTE(_E4),             \
+    E__NOTE(_D4),
+
+#define NUM_LOCK_ON_SOUND \
+    E__NOTE(_D5),         \
+    E__NOTE(_E5),
+
+#define NUM_LOCK_OFF_SOUND \
+    E__NOTE(_E5),          \
+    E__NOTE(_D5),
 
 #endif
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 7572b95979..f06abaf7f0 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -49,6 +49,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   include "usbdrv.h"
 #endif
 
+#ifdef AUDIO_ENABLE
+    #include "audio.h"
+#endif /* AUDIO_ENABLE */
+
 
 static bool command_common(uint8_t code);
 static void command_common_help(void);
@@ -352,6 +356,9 @@ static bool command_common(uint8_t code)
         case MAGIC_KC(MAGIC_KEY_BOOTLOADER):
             clear_keyboard(); // clear to prevent stuck keys
             print("\n\nJumping to bootloader... ");
+            #ifdef AUDIO_ENABLE
+                play_goodbye_tone();
+            #endif
             _delay_ms(1000);
             bootloader_jump(); // not return
             break;
-- 
cgit v1.2.3


From 4b3358acc270772e5605397bab26fb5db981084d Mon Sep 17 00:00:00 2001
From: IBNobody <ibnobody@gmail.com>
Date: Mon, 18 Apr 2016 18:58:37 -0500
Subject: Fixed speaker being on during sleep.

---
 keyboard/atomic/keymaps/pvc/keymap.c | 462 ++++++++++++++++++-----------------
 tmk_core/common/avr/suspend.c        |  12 +-
 2 files changed, 248 insertions(+), 226 deletions(-)

(limited to 'tmk_core/common')

diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index 380e69ee93..36098f1eba 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -4,8 +4,8 @@
 #include "led.h"
 
 #ifdef AUDIO_ENABLE
-	#include "audio.h"
-	#include "song_list.h"
+    #include "audio.h"
+    #include "song_list.h"
 #endif
 
 #define LAYER_QWERTY         0
@@ -56,6 +56,18 @@
 #define AUD_ON              M(MACRO_AUDIO_ON)
 
 
+#define SC_UNDO             LCTL(KC_Z)
+#define SC_REDO             LCTL(KC_Y)
+#define SC_CUT              LCTL(KC_X)
+#define SC_COPY             LCTL(KC_C)
+#define SC_PSTE             LCTL(KC_V)
+#define SC_SELA             LCTL(KC_A)
+#define SC_SAVE             LCTL(KC_S)
+#define SC_OPEN             LCTL(KC_O)
+#define SC_ACLS             LALT(KC_F4)
+#define SC_CCLS             LCTL(KC_F4)
+
+
 #define _______             KC_TRNS
 #define ___T___             KC_TRNS
 #define XXXXXXX             KC_NO
@@ -107,11 +119,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* DVORAK
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | [      | ]      | XXXXXX . BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | [      | ]      | \      | DEL    |
+ * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | /      | =      | \      | DEL    |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
- * | CAPS   | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | /      | XXXXXX . ENTER  | PG UP  |
+ * | CAPS   | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | -      | XXXXXX . ENTER  | PG UP  |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
  * | LSHIFT | ;      | Q      | J      | K      | X      | B      | M      | W      | V      | Z      | XXXXXX . RSHIFT | UP     | PG DN  |
  * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -120,9 +132,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
  [LAYER_DVORAK] = { /* DVORAK */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC  },
-  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP  },
+  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC  },
+  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS, KC_DEL   },
+  { KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,  KC_ENT,  KC_PGUP  },
   { KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
   { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC,  XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
  },
@@ -130,18 +142,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [LAYER_LOWER] = { /* LOWERED */
   { KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
+  { _______, _______, _______, _______, SC_CCLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, SC_REDO, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
+  { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_RAISE] = { /* RAISED */
   { KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, SC_ACLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS   },
+  { _______, SC_SELA, SC_SAVE, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
+  { _______, SC_UNDO, SC_CUT,  SC_COPY, SC_PSTE, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_FUNCTION] = { /* FUNCTION */
@@ -157,7 +169,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 
  [LAYER_MUSIC] = {
@@ -165,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
 };
 
@@ -192,37 +204,37 @@ float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
 /*
 void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
 {
-	if (order)
-	{
-		if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
-		{
-			layer_on(layer3);
-		}
-		else
-		{
-		    layer_off(layer3);
-		    layer_off(layer4);
-		}
-	}
-	else
-	{
-		if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
-		{
-			layer_on(layer4);
-		}
-		else
-		{
-			layer_off(layer3);
-		    layer_off(layer4);
-		}
-	}
+    if (order)
+    {
+        if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+        {
+            layer_on(layer3);
+        }
+        else
+        {
+            layer_off(layer3);
+            layer_off(layer4);
+        }
+    }
+    else
+    {
+        if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
+        {
+            layer_on(layer4);
+        }
+        else
+        {
+            layer_off(layer3);
+            layer_off(layer4);
+        }
+    }
 }
 */
 
 void persistant_default_layer_set(uint16_t default_layer)
 {
-	eeconfig_write_default_layer(default_layer);
-	default_layer_set(default_layer);
+    eeconfig_write_default_layer(default_layer);
+    default_layer_set(default_layer);
 }
 
 const uint16_t PROGMEM fn_actions[] = {
@@ -231,148 +243,148 @@ const uint16_t PROGMEM fn_actions[] = {
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
 
-	// MACRODOWN only works in this function
-	switch(id)
-	{
-
-		case MACRO_QWERTY:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_QWERTY);
-				PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
-			}
-			break;
-
-		case MACRO_COLEMAK:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_COLEMAK);
-				PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
-			}
-			break;
-
-		case MACRO_DVORAK:
-			if (record->event.pressed)
-			{
-				persistant_default_layer_set(1UL<<LAYER_DVORAK);
-				PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
-			}
-			break;
-
-
-		case MACRO_LOWER:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_LOWER);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			else
-			{
-				layer_off(LAYER_LOWER);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			break;
-
-		case MACRO_RAISE:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_RAISE);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			else
-			{
-				layer_off(LAYER_RAISE);
-				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
-			}
-			break;
-
-		case MACRO_FUNCTION:
-			if (record->event.pressed)
-			{
-				layer_on(LAYER_FUNCTION);
-			}
-			else
-			{
-				layer_off(LAYER_FUNCTION);
-			}
-			break;
-
-		case MACRO_TIMBRE_1:
-			if (record->event.pressed) set_timbre(TIMBRE_12);
-			break;
-
-		case MACRO_TIMBRE_2:
-			if (record->event.pressed) set_timbre(TIMBRE_25);
-			break;
-
-		case MACRO_TIMBRE_3:
-			if (record->event.pressed) set_timbre(TIMBRE_50);
-			break;
-
-		case MACRO_TIMBRE_4:
-			if (record->event.pressed) set_timbre(TIMBRE_75);
-			break;
-
-		case MACRO_TEMPO_U:
-			if (record->event.pressed) increase_tempo(10);
-			break;
-
-		case MACRO_TEMPO_D:
-			if (record->event.pressed) decrease_tempo(10);
-			break;
-
-		case MACRO_TONE_DEFAULT:
-			if (record->event.pressed)
-			{
-				set_timbre(TIMBRE_DEFAULT);
-				set_tempo(TEMPO_DEFAULT);
-			}
-			break;
-
-		case MACRO_AUDIO_OFF:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					audio_off();
-				#endif
-			}
-			break;
-
-		case MACRO_AUDIO_ON:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					audio_on();
-				PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
-				#endif
-			}
-			break;
-
-		case MACRO_MUSIC_ON:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
-					layer_on(LAYER_MUSIC);
-				#endif
-			}
-			break;
-
-		case MACRO_MUSIC_OFF:
-			if (record->event.pressed)
-			{
-				#ifdef AUDIO_ENABLE
-					layer_off(LAYER_MUSIC);
-					stop_all_notes();
-				#endif
-			}
-			break;
-
-		default:
-			break;
-
-	}
-	return MACRO_NONE;
+    // MACRODOWN only works in this function
+    switch(id)
+    {
+
+        case MACRO_QWERTY:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_QWERTY);
+                PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
+            }
+            break;
+
+        case MACRO_COLEMAK:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_COLEMAK);
+                PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
+            }
+            break;
+
+        case MACRO_DVORAK:
+            if (record->event.pressed)
+            {
+                persistant_default_layer_set(1UL<<LAYER_DVORAK);
+                PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
+            }
+            break;
+
+
+        case MACRO_LOWER:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_LOWER);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            else
+            {
+                layer_off(LAYER_LOWER);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            break;
+
+        case MACRO_RAISE:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_RAISE);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            else
+            {
+                layer_off(LAYER_RAISE);
+                update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+            }
+            break;
+
+        case MACRO_FUNCTION:
+            if (record->event.pressed)
+            {
+                layer_on(LAYER_FUNCTION);
+            }
+            else
+            {
+                layer_off(LAYER_FUNCTION);
+            }
+            break;
+
+        case MACRO_TIMBRE_1:
+            if (record->event.pressed) set_timbre(TIMBRE_12);
+            break;
+
+        case MACRO_TIMBRE_2:
+            if (record->event.pressed) set_timbre(TIMBRE_25);
+            break;
+
+        case MACRO_TIMBRE_3:
+            if (record->event.pressed) set_timbre(TIMBRE_50);
+            break;
+
+        case MACRO_TIMBRE_4:
+            if (record->event.pressed) set_timbre(TIMBRE_75);
+            break;
+
+        case MACRO_TEMPO_U:
+            if (record->event.pressed) increase_tempo(10);
+            break;
+
+        case MACRO_TEMPO_D:
+            if (record->event.pressed) decrease_tempo(10);
+            break;
+
+        case MACRO_TONE_DEFAULT:
+            if (record->event.pressed)
+            {
+                set_timbre(TIMBRE_DEFAULT);
+                set_tempo(TEMPO_DEFAULT);
+            }
+            break;
+
+        case MACRO_AUDIO_OFF:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    audio_off();
+                #endif
+            }
+            break;
+
+        case MACRO_AUDIO_ON:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    audio_on();
+                PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+                #endif
+            }
+            break;
+
+        case MACRO_MUSIC_ON:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+                    layer_on(LAYER_MUSIC);
+                #endif
+            }
+            break;
+
+        case MACRO_MUSIC_OFF:
+            if (record->event.pressed)
+            {
+                #ifdef AUDIO_ENABLE
+                    layer_off(LAYER_MUSIC);
+                    stop_all_notes();
+                #endif
+            }
+            break;
+
+        default:
+            break;
+
+    }
+    return MACRO_NONE;
 };
 
 
@@ -384,74 +396,74 @@ int offset = 7;
 
 void process_action_user(keyrecord_t *record)
 {
-	if (IS_LAYER_ON(LAYER_MUSIC))
-	{
-		if (record->event.pressed)
-		{
-			play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
-		}
-		else
-		{
-			stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
-		}
-	}
+    if (IS_LAYER_ON(LAYER_MUSIC))
+    {
+        if (record->event.pressed)
+        {
+            play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
+        }
+        else
+        {
+            stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
+        }
+    }
 }
 
 
 void matrix_init_user(void)
 {
-	init_notes();
-	play_startup_tone();
-	println("Matrix Init");
+    init_notes();
+    play_startup_tone();
+    println("Matrix Init");
 }
 
 void led_set_user(uint8_t usb_led)
 {
-	static uint8_t old_usb_led = 0;
+    static uint8_t old_usb_led = 0;
 
-	if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
-	{
-			// If CAPS LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
+    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+    {
+            // If CAPS LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
     {
-			// If CAPS LK LED is turning off...
-			PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+            // If CAPS LK LED is turning off...
+            PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
     }
-	else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
-	{
-			// If NUM LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
+    else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+    {
+            // If NUM LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
     {
-			// If NUM LED is turning off...
-			PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+            // If NUM LED is turning off...
+            PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
     }
-	else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
-	{
-			// If SCROLL LK LED is turning on...
-			PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
+    else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+    {
+            // If SCROLL LK LED is turning on...
+            PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
     }
-	else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+    else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
     {
-			// If SCROLL LED is turning off...
-			PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+            // If SCROLL LED is turning off...
+            PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
     }
-	old_usb_led = usb_led;
+    old_usb_led = usb_led;
 }
 
 
 void play_startup_tone()
 {
-	PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
+    PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
 }
 
 void play_goodbye_tone()
 {
-	PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
-	_delay_ms(2000);
+    PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
+    _delay_ms(2000);
 }
 
 #endif /* AUDIO_ENABLE */
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index c07c2801d5..e295dbe18b 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -9,10 +9,16 @@
 #include "suspend.h"
 #include "timer.h"
 #include "led.h"
+
 #ifdef PROTOCOL_LUFA
-#include "lufa.h"
+	#include "lufa.h"
 #endif
 
+#ifdef AUDIO_ENABLE
+    #include "audio.h"
+#endif /* AUDIO_ENABLE */
+
+
 
 #define wdt_intr_enable(value)   \
 __asm__ __volatile__ (  \
@@ -72,6 +78,10 @@ static void power_down(uint8_t wdto)
 	// Turn off LED indicators
 	led_set(0);
 
+	#ifdef AUDIO_ENABLE
+		stop_all_notes();
+	#endif /* AUDIO_ENABLE */
+
     // TODO: more power saving
     // See PicoPower application note
     // - I/O port input with pullup
-- 
cgit v1.2.3


From 157ddccc2c0b865582fb488ea5346e2996b05468 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 20 Apr 2016 20:11:05 -0400
Subject: start-up sound working, removes tick with some devices

---
 keyboard/preonic/keymaps/default/keymap.c | 2 +-
 tmk_core/common/avr/suspend.c             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tmk_core/common')

diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 16f8a8bf18..267bfab3d7 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -309,7 +309,7 @@ void process_action_user(keyrecord_t *record) {
 }
 
 void matrix_init_user(void) {
-  // audio_init();
+  _delay_ms(10); // gets rid of tick
   play_startup_tone();
 }
 
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index e295dbe18b..4980680198 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -79,7 +79,8 @@ static void power_down(uint8_t wdto)
 	led_set(0);
 
 	#ifdef AUDIO_ENABLE
-		stop_all_notes();
+        // This sometimes disables the start-up noise, so it's been disabled
+		// stop_all_notes();
 	#endif /* AUDIO_ENABLE */
 
     // TODO: more power saving
-- 
cgit v1.2.3


From 620ac4b260fa663d12b11a0b15ac50379523c125 Mon Sep 17 00:00:00 2001
From: Eric Tang <e_l_tang@outlook.com>
Date: Thu, 21 Apr 2016 19:35:18 -0700
Subject: Update functions used to write to EEPROM

---
 keyboard/atomic/keymaps/pvc/keymap.c               |  2 +-
 keyboard/hhkb/rn42/rn42_task.c                     |  2 +-
 keyboard/planck/keymaps/default/keymap.c           |  4 +--
 keyboard/preonic/keymaps/default/keymap.c          |  2 +-
 quantum/audio/audio.c                              |  6 ++---
 quantum/keymap_common.c                            |  2 +-
 quantum/rgblight.c                                 | 20 +++++++--------
 quantum/rgblight.h                                 |  4 +--
 tmk_core/common/avr/eeconfig.c                     | 30 +++++++++++-----------
 tmk_core/common/backlight.c                        | 10 ++++----
 tmk_core/common/bootmagic.c                        |  6 ++---
 tmk_core/common/eeconfig.h                         | 10 ++++----
 .../lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c  |  4 +--
 .../lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c  |  2 +-
 14 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'tmk_core/common')

diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index 36098f1eba..95a26c5b4d 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -233,7 +233,7 @@ void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t l
 
 void persistant_default_layer_set(uint16_t default_layer)
 {
-    eeconfig_write_default_layer(default_layer);
+    eeconfig_update_default_layer(default_layer);
     default_layer_set(default_layer);
 }
 
diff --git a/keyboard/hhkb/rn42/rn42_task.c b/keyboard/hhkb/rn42/rn42_task.c
index 5107fef483..84001b3f1a 100644
--- a/keyboard/hhkb/rn42/rn42_task.c
+++ b/keyboard/hhkb/rn42/rn42_task.c
@@ -219,7 +219,7 @@ static void store_link(uint8_t *eeaddr)
     xprintf("%s(%d)\r\n", s, strlen(s));
     if (strlen(s) == 12) {
         for (int i = 0; i < 12; i++) {
-            eeprom_write_byte(eeaddr+i, *(s+i));
+            eeprom_update_byte(eeaddr+i, *(s+i));
             dprintf("%c ", *(s+i));
         }
         dprint("\r\n");
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index 3239dda71d..19d24f6a0f 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -211,7 +211,7 @@ float goodbye[][2] = SONG(GOODBYE_SOUND);
 
 
 void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_write_default_layer(default_layer);
+  eeconfig_update_default_layer(default_layer);
   default_layer_set(default_layer);
 }
 
@@ -315,7 +315,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             }
             keymap_config.raw = eeconfig_read_keymap();
             keymap_config.nkro = 1;
-            eeconfig_write_keymap(keymap_config.raw);
+            eeconfig_update_keymap(keymap_config.raw);
           }
         break;
         case 11:
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index f0d5ed6030..3a6dfa31a7 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -200,7 +200,7 @@ float goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
 
 void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_write_default_layer(default_layer);
+  eeconfig_update_default_layer(default_layer);
   default_layer_set(default_layer);
 }
 
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 3225557bae..e85370d958 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -85,17 +85,17 @@ uint16_t envelope_index = 0;
 
 void audio_toggle(void) {
     audio_config.enable ^= 1;
-    eeconfig_write_audio(audio_config.raw);
+    eeconfig_update_audio(audio_config.raw);
 }
 
 void audio_on(void) {
     audio_config.enable = 1;
-    eeconfig_write_audio(audio_config.raw);
+    eeconfig_update_audio(audio_config.raw);
 }
 
 void audio_off(void) {
     audio_config.enable = 0;
-    eeconfig_write_audio(audio_config.raw);
+    eeconfig_update_audio(audio_config.raw);
 }
 
 #ifdef VIBRATO_ENABLE
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 43debf4ef6..4b4bd62109 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -245,7 +245,7 @@ static action_t keycode_to_action(uint16_t keycode)
                 keymap_config.swap_lalt_lgui = 0;
                 keymap_config.swap_ralt_rgui = 0;
             }
-            eeconfig_write_keymap(keymap_config.raw);
+            eeconfig_update_keymap(keymap_config.raw);
             break;
         case 0x5100 ... 0x5FFF: ;
             // Layer movement shortcuts
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 2215cf5cdf..5623c65de7 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -107,17 +107,17 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, struct cRGB *led1) {
 uint32_t eeconfig_read_rgblight(void) {
   return eeprom_read_dword(EECONFIG_RGBLIGHT);
 }
-void eeconfig_write_rgblight(uint32_t val) {
-  eeprom_write_dword(EECONFIG_RGBLIGHT, val);
+void eeconfig_update_rgblight(uint32_t val) {
+  eeprom_update_dword(EECONFIG_RGBLIGHT, val);
 }
-void eeconfig_write_rgblight_default(void) {
-	dprintf("eeconfig_write_rgblight_default\n");
+void eeconfig_update_rgblight_default(void) {
+	dprintf("eeconfig_update_rgblight_default\n");
 	rgblight_config.enable = 1;
 	rgblight_config.mode = 1;
 	rgblight_config.hue = 200;
 	rgblight_config.sat = 204;
 	rgblight_config.val = 204;
-	eeconfig_write_rgblight(rgblight_config.raw);
+	eeconfig_update_rgblight(rgblight_config.raw);
 }
 void eeconfig_debug_rgblight(void) {
 	dprintf("rgblight_config eprom\n");
@@ -136,12 +136,12 @@ void rgblight_init(void) {
   if (!eeconfig_is_enabled()) {
 		dprintf("rgblight_init eeconfig is not enabled.\n");
     eeconfig_init();
-		eeconfig_write_rgblight_default();
+		eeconfig_update_rgblight_default();
   }
   rgblight_config.raw = eeconfig_read_rgblight();
 	if (!rgblight_config.mode) {
 		dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n");
-		eeconfig_write_rgblight_default();
+		eeconfig_update_rgblight_default();
 		rgblight_config.raw = eeconfig_read_rgblight();
 	}
 	eeconfig_debug_rgblight(); // display current eeprom values
@@ -189,7 +189,7 @@ void rgblight_mode(uint8_t mode) {
 	} else {
 		rgblight_config.mode = mode;
 	}
-  eeconfig_write_rgblight(rgblight_config.raw);
+  eeconfig_update_rgblight(rgblight_config.raw);
   dprintf("rgblight mode: %u\n", rgblight_config.mode);
 	if (rgblight_config.mode == 1) {
 		rgblight_timer_disable();
@@ -206,7 +206,7 @@ void rgblight_mode(uint8_t mode) {
 
 void rgblight_toggle(void) {
   rgblight_config.enable ^= 1;
-  eeconfig_write_rgblight(rgblight_config.raw);
+  eeconfig_update_rgblight(rgblight_config.raw);
   dprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable);
 	if (rgblight_config.enable) {
 		rgblight_mode(rgblight_config.mode);
@@ -299,7 +299,7 @@ void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val){
 		rgblight_config.hue = hue;
 		rgblight_config.sat = sat;
 		rgblight_config.val = val;
-		eeconfig_write_rgblight(rgblight_config.raw);
+		eeconfig_update_rgblight(rgblight_config.raw);
 		dprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
   }
 }
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index 9e1562328f..37e207578c 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -66,8 +66,8 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b);
 
 #define EECONFIG_RGBLIGHT (uint8_t *)7
 uint32_t eeconfig_read_rgblight(void);
-void eeconfig_write_rgblight(uint32_t val);
-void eeconfig_write_rgblight_default(void);
+void eeconfig_update_rgblight(uint32_t val);
+void eeconfig_update_rgblight_default(void);
 void eeconfig_debug_rgblight(void);
 
 void sethsv(uint16_t hue, uint8_t sat, uint8_t val, struct cRGB *led1);
diff --git a/tmk_core/common/avr/eeconfig.c b/tmk_core/common/avr/eeconfig.c
index 25bb9e849c..c5391f5cf5 100644
--- a/tmk_core/common/avr/eeconfig.c
+++ b/tmk_core/common/avr/eeconfig.c
@@ -5,27 +5,27 @@
 
 void eeconfig_init(void)
 {
-    eeprom_write_word(EECONFIG_MAGIC,          EECONFIG_MAGIC_NUMBER);
-    eeprom_write_byte(EECONFIG_DEBUG,          0);
-    eeprom_write_byte(EECONFIG_DEFAULT_LAYER,  0);
-    eeprom_write_byte(EECONFIG_KEYMAP,         0);
-    eeprom_write_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
+    eeprom_update_word(EECONFIG_MAGIC,          EECONFIG_MAGIC_NUMBER);
+    eeprom_update_byte(EECONFIG_DEBUG,          0);
+    eeprom_update_byte(EECONFIG_DEFAULT_LAYER,  0);
+    eeprom_update_byte(EECONFIG_KEYMAP,         0);
+    eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
 #ifdef BACKLIGHT_ENABLE
-    eeprom_write_byte(EECONFIG_BACKLIGHT,      0);
+    eeprom_update_byte(EECONFIG_BACKLIGHT,      0);
 #endif
 #ifdef AUDIO_ENABLE
-    eeprom_write_byte(EECONFIG_AUDIO,      	   0xFF); // On by default
+    eeprom_update_byte(EECONFIG_AUDIO,      	   0xFF); // On by default
 #endif
 }
 
 void eeconfig_enable(void)
 {
-    eeprom_write_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
+    eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
 }
 
 void eeconfig_disable(void)
 {
-    eeprom_write_word(EECONFIG_MAGIC, 0xFFFF);
+    eeprom_update_word(EECONFIG_MAGIC, 0xFFFF);
 }
 
 bool eeconfig_is_enabled(void)
@@ -34,20 +34,20 @@ bool eeconfig_is_enabled(void)
 }
 
 uint8_t eeconfig_read_debug(void)      { return eeprom_read_byte(EECONFIG_DEBUG); }
-void eeconfig_write_debug(uint8_t val) { eeprom_write_byte(EECONFIG_DEBUG, val); }
+void eeconfig_update_debug(uint8_t val) { eeprom_update_byte(EECONFIG_DEBUG, val); }
 
 uint8_t eeconfig_read_default_layer(void)      { return eeprom_read_byte(EECONFIG_DEFAULT_LAYER); }
-void eeconfig_write_default_layer(uint8_t val) { eeprom_write_byte(EECONFIG_DEFAULT_LAYER, val); }
+void eeconfig_update_default_layer(uint8_t val) { eeprom_update_byte(EECONFIG_DEFAULT_LAYER, val); }
 
 uint8_t eeconfig_read_keymap(void)      { return eeprom_read_byte(EECONFIG_KEYMAP); }
-void eeconfig_write_keymap(uint8_t val) { eeprom_write_byte(EECONFIG_KEYMAP, val); }
+void eeconfig_update_keymap(uint8_t val) { eeprom_update_byte(EECONFIG_KEYMAP, val); }
 
 #ifdef BACKLIGHT_ENABLE
 uint8_t eeconfig_read_backlight(void)      { return eeprom_read_byte(EECONFIG_BACKLIGHT); }
-void eeconfig_write_backlight(uint8_t val) { eeprom_write_byte(EECONFIG_BACKLIGHT, val); }
+void eeconfig_update_backlight(uint8_t val) { eeprom_update_byte(EECONFIG_BACKLIGHT, val); }
 #endif
 
 #ifdef AUDIO_ENABLE
 uint8_t eeconfig_read_audio(void)      { return eeprom_read_byte(EECONFIG_AUDIO); }
-void eeconfig_write_audio(uint8_t val) { eeprom_write_byte(EECONFIG_AUDIO, val); }
-#endif
\ No newline at end of file
+void eeconfig_update_audio(uint8_t val) { eeprom_update_byte(EECONFIG_AUDIO, val); }
+#endif
diff --git a/tmk_core/common/backlight.c b/tmk_core/common/backlight.c
index 558ad9b014..2f6fc1cd6c 100644
--- a/tmk_core/common/backlight.c
+++ b/tmk_core/common/backlight.c
@@ -37,7 +37,7 @@ void backlight_increase(void)
     {
         backlight_config.level++;
         backlight_config.enable = 1;
-        eeconfig_write_backlight(backlight_config.raw);
+        eeconfig_update_backlight(backlight_config.raw);
     }
     dprintf("backlight increase: %u\n", backlight_config.level);
     backlight_set(backlight_config.level);
@@ -49,7 +49,7 @@ void backlight_decrease(void)
     {
         backlight_config.level--;
         backlight_config.enable = !!backlight_config.level;
-        eeconfig_write_backlight(backlight_config.raw);
+        eeconfig_update_backlight(backlight_config.raw);
     }
     dprintf("backlight decrease: %u\n", backlight_config.level);
     backlight_set(backlight_config.level);
@@ -58,7 +58,7 @@ void backlight_decrease(void)
 void backlight_toggle(void)
 {
     backlight_config.enable ^= 1;
-    eeconfig_write_backlight(backlight_config.raw);
+    eeconfig_update_backlight(backlight_config.raw);
     dprintf("backlight toggle: %u\n", backlight_config.enable);
     backlight_set(backlight_config.enable ? backlight_config.level : 0);
 }
@@ -71,7 +71,7 @@ void backlight_step(void)
         backlight_config.level = 0;
     }
     backlight_config.enable = !!backlight_config.level;
-    eeconfig_write_backlight(backlight_config.raw);
+    eeconfig_update_backlight(backlight_config.raw);
     dprintf("backlight step: %u\n", backlight_config.level);
     backlight_set(backlight_config.level);
 }
@@ -80,6 +80,6 @@ void backlight_level(uint8_t level)
 {
     backlight_config.level ^= level;
     backlight_config.enable = !!backlight_config.level;
-    eeconfig_write_backlight(backlight_config.raw);
+    eeconfig_update_backlight(backlight_config.raw);
     backlight_set(backlight_config.level);
 }
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c
index b002a58562..2c1b1adfc5 100644
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@ -52,7 +52,7 @@ void bootmagic(void)
             debug_config.enable = !debug_config.enable;
         }
     }
-    eeconfig_write_debug(debug_config.raw);
+    eeconfig_update_debug(debug_config.raw);
 
     /* keymap config */
     keymap_config.raw = eeconfig_read_keymap();
@@ -80,7 +80,7 @@ void bootmagic(void)
     if (bootmagic_scan_keycode(BOOTMAGIC_HOST_NKRO)) {
         keymap_config.nkro = !keymap_config.nkro;
     }
-    eeconfig_write_keymap(keymap_config.raw);
+    eeconfig_update_keymap(keymap_config.raw);
 
 #ifdef NKRO_ENABLE
     keyboard_nkro = keymap_config.nkro;
@@ -97,7 +97,7 @@ void bootmagic(void)
     if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_6)) { default_layer |= (1<<6); }
     if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { default_layer |= (1<<7); }
     if (default_layer) {
-        eeconfig_write_default_layer(default_layer);
+        eeconfig_update_default_layer(default_layer);
         default_layer_set((uint32_t)default_layer);
     } else {
         default_layer = eeconfig_read_default_layer();
diff --git a/tmk_core/common/eeconfig.h b/tmk_core/common/eeconfig.h
index ddefca1347..ca47e0d2fd 100644
--- a/tmk_core/common/eeconfig.h
+++ b/tmk_core/common/eeconfig.h
@@ -60,22 +60,22 @@ void eeconfig_enable(void);
 void eeconfig_disable(void);
 
 uint8_t eeconfig_read_debug(void);
-void eeconfig_write_debug(uint8_t val);
+void eeconfig_update_debug(uint8_t val);
 
 uint8_t eeconfig_read_default_layer(void);
-void eeconfig_write_default_layer(uint8_t val);
+void eeconfig_update_default_layer(uint8_t val);
 
 uint8_t eeconfig_read_keymap(void);
-void eeconfig_write_keymap(uint8_t val);
+void eeconfig_update_keymap(uint8_t val);
 
 #ifdef BACKLIGHT_ENABLE
 uint8_t eeconfig_read_backlight(void);
-void eeconfig_write_backlight(uint8_t val);
+void eeconfig_update_backlight(uint8_t val);
 #endif
 
 #ifdef AUDIO_ENABLE
 uint8_t eeconfig_read_audio(void);
-void eeconfig_write_audio(uint8_t val);
+void eeconfig_update_audio(uint8_t val);
 #endif
 
 #endif
diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c
index f66a483e6e..58bb338927 100644
--- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c
+++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c
@@ -327,7 +327,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 			else
 			{
 				/* Write the next EEPROM byte from the endpoint */
-				eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
+				eeprom_update_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
 
 				/* Increment the address counter after use */
 				CurrAddress += 2;
@@ -581,7 +581,7 @@ static void CDC_Task(void)
 	else if (Command == AVR109_COMMAND_WriteEEPROM)
 	{
 		/* Read the byte from the endpoint and write it to the EEPROM */
-		eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
+		eeprom_update_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
 
 		/* Increment the address after use */
 		CurrAddress += 2;
diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c
index 0385bfc497..00e673268a 100644
--- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c
+++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c
@@ -370,7 +370,7 @@ void EVENT_USB_Device_ControlRequest(void)
 							}
 
 							/* Read the byte from the USB interface and write to to the EEPROM */
-							eeprom_write_byte((uint8_t*)StartAddr, Endpoint_Read_8());
+							eeprom_update_byte((uint8_t*)StartAddr, Endpoint_Read_8());
 
 							/* Adjust counters */
 							StartAddr++;
-- 
cgit v1.2.3


From 2bbf3d5820734eabbcf47c3072be6fdcaa9e36cc Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Thu, 28 Apr 2016 23:23:33 -0400
Subject: stops forcing debug_action

---
 tmk_core/common/action.c         | 8 ++++----
 tmk_core/common/action_layer.c   | 8 ++++----
 tmk_core/common/action_macro.c   | 8 ++++----
 tmk_core/common/action_tapping.c | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'tmk_core/common')

diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 0162fbd632..f9e6c17dc3 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -27,11 +27,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_util.h"
 #include "action.h"
 
-//#ifdef DEBUG_ACTION
+#ifdef DEBUG_ACTION
 #include "debug.h"
-//#else
-//#include "nodebug.h"
-//#endif
+#else
+#include "nodebug.h"
+#endif
 
 
 void action_exec(keyevent_t event)
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index 845fbbb210..63fa2b5ae4 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -4,11 +4,11 @@
 #include "util.h"
 #include "action_layer.h"
 
-//#ifdef DEBUG_ACTION
+#ifdef DEBUG_ACTION
 #include "debug.h"
-//#else
-//#include "nodebug.h"
-//#endif
+#else
+#include "nodebug.h"
+#endif
 
 
 /*
diff --git a/tmk_core/common/action_macro.c b/tmk_core/common/action_macro.c
index cc78c82327..7726b11907 100644
--- a/tmk_core/common/action_macro.c
+++ b/tmk_core/common/action_macro.c
@@ -19,11 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_macro.h"
 #include "wait.h"
 
-//#ifdef DEBUG_ACTION
+#ifdef DEBUG_ACTION
 #include "debug.h"
-//#else
-//#include "nodebug.h"
-//#endif
+#else
+#include "nodebug.h"
+#endif
 
 
 #ifndef NO_ACTION_MACRO
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c
index 6b6fa1dfe2..e6343e6da7 100644
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@@ -6,11 +6,11 @@
 #include "keycode.h"
 #include "timer.h"
 
-//#ifdef DEBUG_ACTION
+#ifdef DEBUG_ACTION
 #include "debug.h"
-//#else
-//#include "nodebug.h"
-//#endif
+#else
+#include "nodebug.h"
+#endif
 
 #ifndef NO_ACTION_TAPPING
 
-- 
cgit v1.2.3