Meira updates for bluetooth and audio (#2731)

* Add audio output

* Update Miera to fix bluetooth issues, bootloader definition.

* Added keymap with audio example

* Cleanup Meira audio code

13 files changed, 347 insertions, 44 deletions

diff --git a/keyboards/meira/config.h b/keyboards/meira/config.h
index b9bdd426a0..5e9dd6837e 100644
--- a/keyboards/meira/config.h
+++ b/keyboards/meira/config.h
@@ -35,11 +35,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION CUSTOM_MATRIX
 
+#ifdef BACKLIGHT_ENABLE
 #define BACKLIGHT_LEVELS 10
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
+#endif
 
+#ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 15    // Number of LEDs
+#endif
 
 #endif
diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index ea26bedfa0..b7cdfe8bdb 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/meira/featherble/config.h
@@ -36,6 +36,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_EN_PIN D2
 #define UNUSED_PINS
 
+#define QMK_SPEAKER B5
+#define B5_AUDIO
+#define AUDIO_VOICES
+
 #define CATERINA_BOOTLOADER
 
  
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/meira/featherble/rules.mk
index 3f32ba890b..e27608983f 100644
--- a/keyboards/meira/featherble/rules.mk
+++ b/keyboards/meira/featherble/rules.mk
@@ -1,3 +1,3 @@
 BLUETOOTH_ENABLE = yes
 F_CPU = 8000000
-
+BLUETOOTH = AdafruitBLE
diff --git a/keyboards/meira/keymaps/cole/config.h b/keyboards/meira/keymaps/cole/config.h
new file mode 100644
index 0000000000..90c490e836
--- /dev/null
+++ b/keyboards/meira/keymaps/cole/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2017 Cole Markham, WoodKeys.click
+ *
+ * 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/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+// place overrides here
+#define MUSIC_MASK (keycode != KC_NO)
+#ifdef AUDIO_ENABLE
+   #define STARTUP_SONG SONG(IMPERIAL_MARCH)
+   // Disable music mode to keep the firmware size down
+   #define NO_MUSIC_MODE
+
+#endif
+
+#endif
diff --git a/keyboards/meira/keymaps/cole/keymap.c b/keyboards/meira/keymaps/cole/keymap.c
new file mode 100644
index 0000000000..b1c230d926
--- /dev/null
+++ b/keyboards/meira/keymaps/cole/keymap.c
@@ -0,0 +1,253 @@
+/* Copyright 2017 Cole Markham
+ *
+ * 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/>.
+ */
+#include "meira.h"
+#include "lighting.h"
+
+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+#endif
+
+#define _QWERTY 0
+#define _COLEMAK 1
+#define _DVORAK 2
+#define _LOWER 3
+#define _RAISE 4
+#define _ADJUST 16
+
+
+#ifndef BLUETOOTH_ENABLE
+#define OUT_BT KC_TRNS
+#endif
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+// define variables for reactive RGB
+bool TOG_STATUS = false;
+int RGB_current_mode;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        /* Qwerty
+         * ,-----------------------------------------------------------------------------------.
+         * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+         * |------+------+------+------+------+-------------+------+------+------+------+------|
+         * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+         * |------+------+------+------+------+------|------+------+------+------+------+------|
+         * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+         * |------+------+------+------+------+------+------+------+------+------+------+------|
+         * |Adjust| Ctrl | Ctrl  | Alt  |Lower | Cmd  |Space |Raise | Left | Down |  Up  |Right |
+         * `-----------------------------------------------------------------------------------'
+         */
+        [_QWERTY] = KEYMAP( \
+                KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+                KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+                KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_ENT, \
+                ADJUST,  KC_LCTL, KC_LALT, KC_LALT, LOWER,   KC_LGUI,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+        ),
+
+        /* Lower
+         * ,-----------------------------------------------------------------------------------.
+         * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+         * |------+------+------+------+------+-------------+------+------+------+------+------|
+         * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
+         * |------+------+------+------+------+------|------+------+------+------+------+------|
+         * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
+         * |------+------+------+------+------+------+------+------+------+------+------+------|
+         * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+         * `-----------------------------------------------------------------------------------'
+         */
+        [_LOWER] = KEYMAP( \
+                _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
+                KC_TILD,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+                _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, KC_QUOT, \
+                _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
+        ),
+
+        /* Raise
+         * ,-----------------------------------------------------------------------------------.
+         * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+         * |------+------+------+------+------+-------------+------+------+------+------+------|
+         * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+         * |------+------+------+------+------+------|------+------+------+------+------+------|
+         * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
+         * |------+------+------+------+------+------+------+------+------+------+------+------|
+         * |      |      |      |      |      |             |      | Home | PgUp | PgDn | End  |
+         * `-----------------------------------------------------------------------------------'
+         */
+        [_RAISE] = KEYMAP( \
+                _______,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, \
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+                _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
+                _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
+        ),
+
+        /* Adjust (Lower + Raise)
+         * ,-----------------------------------------------------------------------------------.
+         * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+         * |------+------+------+------+------+-------------+------+------+------+------+------|
+         * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
+         * |------+------+------+------+------+------|------+------+------+------+------+------|
+         * |      |      |      |      |      |      |      |      |      |      |      |      |
+         * |------+------+------+------+------+------+------+------+------+------+------+------|
+         * |      |      |      |      |      |             |      |      |      |      |      |
+         * `-----------------------------------------------------------------------------------'
+         */
+        [_ADJUST] =  KEYMAP( \
+                RESET, _______,   _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \
+                BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  _______, _______, _______,  _______, _______,  _______, _______, \
+                BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+                _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, OUT_AUTO, OUT_USB, OUT_BT \
+        )
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+// Setting ADJUST layer RGB back to default
+void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
+  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_mode(RGB_current_mode);
+#endif
+    layer_on(layer3);
+  } else {
+    layer_off(layer3);
+  }
+}
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+          } else {
+            unregister_code(KC_RSFT);
+          }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOWER:
+        if (record->event.pressed) {
+            //not sure how to have keyboard check mode and set it to a variable, so my work around
+            //uses another variable that would be set to true after the first time a reactive key is pressed.
+            if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
+            } else {
+                TOG_STATUS = !TOG_STATUS;
+#ifdef RGBLIGHT_ENABLE
+                rgblight_mode(16);
+#endif
+            }
+            layer_on(_LOWER);
+            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
+        } else {
+#ifdef RGBLIGHT_ENABLE
+            rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
+#endif
+            TOG_STATUS = false;
+            layer_off(_LOWER);
+            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
+        }
+        return false;
+        break;
+    case RAISE:
+        if (record->event.pressed) {
+            //not sure how to have keyboard check mode and set it to a variable, so my work around
+            //uses another variable that would be set to true after the first time a reactive key is pressed.
+            if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
+            } else {
+                TOG_STATUS = !TOG_STATUS;
+#ifdef RGBLIGHT_ENABLE
+                rgblight_mode(15);
+#endif
+            }
+            layer_on(_RAISE);
+            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
+        } else {
+#ifdef RGBLIGHT_ENABLE
+            rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
+#endif
+            layer_off(_RAISE);
+            TOG_STATUS = false;
+            update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
+        }
+        return false;
+        break;
+    case ADJUST:
+        // FIXME add RGB feedback
+        if (record->event.pressed) {
+            layer_on(_ADJUST);
+        } else {
+            layer_off(_ADJUST);
+        }
+        return false;
+        break;
+    case BL_TOGG:
+#ifdef BACKLIGHT_ENABLE
+        if (record->event.pressed) {
+            print("Enabling backlight\n");
+            backlight_init_ports();
+        }
+#endif
+        return false;
+        break;
+    case BL_STEP:
+        if (record->event.pressed) {
+#ifdef BACKLIGHT_ENABLE
+            backlight_step();
+#endif
+
+        }
+        return false;
+        break;
+        //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
+#ifdef RGBLIGHT_ENABLE
+    case RGB_MOD:
+        if (record->event.pressed) {
+            rgblight_mode(RGB_current_mode);
+            rgblight_step();
+            RGB_current_mode = rgblight_config.mode;
+        }
+        return false;
+        break;
+#endif
+  }
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/meira/keymaps/cole/readme.md b/keyboards/meira/keymaps/cole/readme.md
new file mode 100644
index 0000000000..be84048813
--- /dev/null
+++ b/keyboards/meira/keymaps/cole/readme.md
@@ -0,0 +1 @@
+# The default keymap for meira
diff --git a/keyboards/meira/keymaps/cole/rules.mk b/keyboards/meira/keymaps/cole/rules.mk
new file mode 100644
index 0000000000..8f8d53e57a
--- /dev/null
+++ b/keyboards/meira/keymaps/cole/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_ENABLE = yes           # Audio output on port C6
+EXTRAFLAGS+=-flto # -4-7k
\ No newline at end of file
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/meira/keymaps/default/config.h
index 97210115b9..5f5844a70a 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/meira/keymaps/default/config.h
@@ -20,5 +20,15 @@
 #include "../../config.h"
 
 // place overrides here
+#define MUSIC_MASK (keycode != KC_NO)
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
 
 #endif
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index dd55859a58..4bbd014cb7 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -37,6 +37,17 @@ enum custom_keycodes {
   ADJUST,
 };
 
+#ifdef AUDIO_ENABLE
+
+float tone_my_startup[][2] = SONG(ODE_TO_JOY);
+float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
+
+float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
+float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
+float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
+
+#endif /* AUDIO_ENABLE */
+
 // define variables for reactive RGB
 bool TOG_STATUS = false;
 int RGB_current_mode;
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c
index 2ae53e00a3..3ff62a080b 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -22,30 +22,10 @@
 
 extern void backlight_set(uint8_t level);
 
-#ifdef AUDIO_ENABLE
-    float tone_startup[][2] = SONG(STARTUP_SOUND);
-    float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
-#endif
-
-
-void shutdown_user(void) {
-    #ifdef AUDIO_ENABLE
-        PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
-    _delay_ms(150);
-    stop_all_notes();
-    #endif
-}
-
-
 void matrix_init_kb(void)
 {
     debug_enable=true;
     print("meira matrix_init_kb\n");
-#ifdef AUDIO_ENABLE
-    _delay_ms(20); // gets rid of tick
-    PLAY_NOTE_ARRAY(tone_startup, false, 0);
-#endif
-
 
 #ifdef ISSI_ENABLE
     issi_init();
diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h
index 35c5ba419d..8cdcd09fe2 100644
--- a/keyboards/meira/meira.h
+++ b/keyboards/meira/meira.h
@@ -54,6 +54,7 @@ void reset_keyboard_kb(void);
 
 #define LAYOUT_ortho_4x12 KEYMAP
 #define KC_LAYOUT_ortho_4x12 KC_KEYMAP
+#define LAYOUT_kc_ortho_4x12 KC_KEYMAP
 
 #endif
 
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/meira/promicro/rules.mk
index 3c81f1b344..22e49971f1 100644
--- a/keyboards/meira/promicro/rules.mk
+++ b/keyboards/meira/promicro/rules.mk
@@ -1 +1,14 @@
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
 BLUETOOTH_ENABLE = no
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index e898146abd..d3e45fc8d0 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -4,19 +4,6 @@ SRC += matrix.c TWIlib.c issi.c lighting.c
 #MCU = at90usb1286
 MCU = atmega32u4
 
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
 
 #
 # LUFA specific
@@ -37,6 +24,12 @@ ARCH = AVR8
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 
+# Bootloader
+#     This definition is optional, and if your keyboard supports multiple bootloaders of
+#     different sizes, comment this out, and the correct address will be loaded 
+#     automatically (+60). See bootloader.mk for all options.
+BOOTLOADER = caterina
+
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
@@ -54,10 +47,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+CONSOLE_ENABLE = no        # Console for debug(+400)
+COMMAND_ENABLE = no        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -74,13 +67,13 @@ ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be di
 
 CUSTOM_MATRIX = yes
 
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
+#ifeq ($(strip $(ISSI_ENABLE)), yes)
+#    TMK_COMMON_DEFS += -DISSI_ENABLE
+#endif
+#
+#ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+#    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+#endif
 
 DEFAULT_FOLDER = meira/promicro
 LAYOUTS = ortho_4x12