summaryrefslogtreecommitdiff
path: root/keyboard/planck/keymaps
diff options
context:
space:
mode:
authorIBNobody <protospherex@gmail.com>2016-04-15 13:09:42 -0500
committerIBNobody <protospherex@gmail.com>2016-04-15 13:09:42 -0500
commit39e520c010072aa17c0bcb2c5bfbbee08e010170 (patch)
tree4f9b28ad7bc26f2b62ee2bd966b04cbd0f1f5e79 /keyboard/planck/keymaps
parent66c1024bd328b687fba0645f70469094e75d624c (diff)
parentee2ee7f4f049dda385a9db7dddd8e7e91681315b (diff)
Prepping for merge with new_defaults
Diffstat (limited to 'keyboard/planck/keymaps')
-rw-r--r--keyboard/planck/keymaps/default/keymap.c49
-rw-r--r--keyboard/planck/keymaps/default/makefile.mk2
2 files changed, 24 insertions, 27 deletions
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index 97ba5d285e..dee2840f2d 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -2,9 +2,6 @@
// this is the style you want to emulate.
#include "planck.h"
-#ifdef BACKLIGHT_ENABLE
- #include "backlight.h"
-#endif
#include "action_layer.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
@@ -150,30 +147,30 @@ const uint16_t PROGMEM fn_actions[] = {
#ifdef AUDIO_ENABLE
float tone_qw[][2] = {
- {440.0*pow(2.0,(67)/12.0), 400},
- {440.0*pow(2.0,(60)/12.0), 400},
- {0, 800},
- {440.0*pow(2.0,(67)/12.0), 1600}
+ {440.0*pow(2.0,(59)/12.0), 8},
+ {440.0*pow(2.0,(60)/12.0), 8},
+ {0, 4},
+ {440.0*pow(2.0,(67)/12.0), 16}
};
float tone_cm[][2] = {
- {440.0*pow(2.0,(67)/12.0), 400},
- {440.0*pow(2.0,(60)/12.0), 400},
- {0, 800},
- {440.0*pow(2.0,(67)/12.0), 1000},
- {0, 200},
- {440.0*pow(2.0,(67)/12.0), 1000}
+ {440.0*pow(2.0,(59)/12.0), 8},
+ {440.0*pow(2.0,(60)/12.0), 8},
+ {0, 4},
+ {440.0*pow(2.0,(67)/12.0), 16},
+ {0, 4},
+ {440.0*pow(2.0,(71)/12.0), 16}
};
float tone_dv[][2] = {
- {440.0*pow(2.0,(67)/12.0), 400},
- {440.0*pow(2.0,(60)/12.0), 400},
- {0, 800},
- {440.0*pow(2.0,(67)/12.0), 800},
- {0, 200},
- {440.0*pow(2.0,(67)/12.0), 800},
- {0, 200},
- {440.0*pow(2.0,(67)/12.0), 800}
+ {440.0*pow(2.0,(59)/12.0), 8},
+ {440.0*pow(2.0,(60)/12.0), 8},
+ {0, 4},
+ {440.0*pow(2.0,(67)/12.0), 16},
+ {0, 4},
+ {440.0*pow(2.0,(69)/12.0), 16},
+ {0, 4},
+ {440.0*pow(2.0,(67)/12.0), 16}
};
#endif
@@ -249,11 +246,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE
float start_up[][2] = {
- {440.0*pow(2.0,(67)/12.0), 650},
- {440.0*pow(2.0,(64)/12.0), 450},
- {440.0*pow(2.0,(55)/12.0), 450},
- {440.0*pow(2.0,(60)/12.0), 450},
- {440.0*pow(2.0,(64)/12.0), 1000}
+ {440.0*pow(2.0,(67)/12.0), 12},
+ {440.0*pow(2.0,(64)/12.0), 8},
+ {440.0*pow(2.0,(55)/12.0), 8},
+ {440.0*pow(2.0,(60)/12.0), 8},
+ {440.0*pow(2.0,(64)/12.0), 20}
};
#endif
diff --git a/keyboard/planck/keymaps/default/makefile.mk b/keyboard/planck/keymaps/default/makefile.mk
index 628167ff66..8cbec4a1f5 100644
--- a/keyboard/planck/keymaps/default/makefile.mk
+++ b/keyboard/planck/keymaps/default/makefile.mk
@@ -1 +1 @@
-AUDIO_ENABLE = yes \ No newline at end of file
+AUDIO_ENABLE = yes \ No newline at end of file