summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-25 00:22:35 -0400
committerJack Humbert <jack.humb@gmail.com>2016-04-25 00:22:35 -0400
commit9fb1e5441fd59496a55d1d171dc7dba5f2ea1c22 (patch)
treec3f9c3d285e30cbeaa9a4ba8a3122e69aa1334b3
parent130a485bf79c4d7b700793a3f21e8527f07e0bb3 (diff)
downloadqmk_firmware-9fb1e5441fd59496a55d1d171dc7dba5f2ea1c22.tar.gz
qmk_firmware-9fb1e5441fd59496a55d1d171dc7dba5f2ea1c22.zip
updates preonic default keymap
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 3a6dfa31a7..95b9718762 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -24,10 +24,8 @@
#define LOWER M(_LOWER)
#define RAISE M(_RAISE)
#define M_BL 5
-#ifdef AUDIO_ENABLE
- #define AUD_OFF M(6)
- #define AUD_ON M(7)
-#endif
+#define AUD_OFF M(6)
+#define AUD_ON M(7)
#define MUS_OFF M(8)
#define MUS_ON M(9)
#define VC_IN M(10)
@@ -163,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
* |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | | |Musoff|Mus on| | | | | | | |
+ * | |Voice-|Voice+|Musoff|Mus on| | | | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
@@ -310,6 +308,16 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
return MACRO_NONE;
};
+
+void matrix_init_user(void) {
+ #ifdef AUDIO_ENABLE
+ _delay_ms(20); // gets rid of tick
+ PLAY_NOTE_ARRAY(start_up, false, 0);
+ #endif
+}
+
+#ifdef AUDIO_ENABLE
+
uint8_t starting_note = 0x0C;
int offset = 7;
@@ -325,18 +333,10 @@ void process_action_user(keyrecord_t *record) {
}
-void matrix_init_user(void) {
- _delay_ms(10); // gets rid of tick
- play_startup_tone();
-}
-
-void play_startup_tone()
-{
- PLAY_NOTE_ARRAY(start_up, false, 0);
-}
-
void play_goodbye_tone()
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150);
-} \ No newline at end of file
+}
+
+#endif \ No newline at end of file