summaryrefslogtreecommitdiffstats
path: root/keyboard/planck/keymaps/pete/keymap.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-11 13:31:31 -0400
committerGitHub <noreply@github.com>2016-06-11 13:31:31 -0400
commitd9e4dad0a828a8a904f44dda090a4d6d08fe2948 (patch)
treed6f002712c22e8cf4523e04a9da889c7ec379d6b /keyboard/planck/keymaps/pete/keymap.c
parenta5d638ad3091e2d553eaa04d933df28eeced5a8b (diff)
Makefile redo & other features (#395)
* .build containment implemented * no destructive variable setting - builds in either folder * make from 3 places * cleans before each build * make from root with keyboard=keyboard, keymap=keymap * make from keyboard/keyboard with keymap=keymap * make from keymaps/keymap * only implemented on planck * adds color diag to avr-gcc * makefiles for all plancks, clean-up * quick build-all makefile for plancks * reformatting of make output (colors) * color toggle, tmk path corrections * correct if statement for color * move config.h to main makefile, updates preonic, atomic * format update, all keyboards targets * makefile optional for build all target, alps and arrow_pad updated * alps updated * make planck default, trying out travis recipe for all-keyboards * all-keymaps target, different travis recipe * updates alps64 * updates keyboards to new format * updates clue* projects * all projects updated, specialise EZ .hex, let .hex through * updates travis * automatically find root, keyboard, keymap * silent echo, cleaned-up mass make output * updates all keyboards' .hex files except EZ * Rename Bantam44.c to bantam44.c * Rename Bantam44.h to bantam44.h * nananana * adds six key keyboard * does same to ez as rest * updates send_string example * brings ergodox_ez up to date * updates template/new project script * adds sixkeyboard * adds readme for sixkeyboard * adds sixkeyboard to travis * filenames, gitignore mess * define clock prescaler stuff manually * make quick, size test example * documentation and dfu-no-build
Diffstat (limited to 'keyboard/planck/keymaps/pete/keymap.c')
-rw-r--r--keyboard/planck/keymaps/pete/keymap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboard/planck/keymaps/pete/keymap.c b/keyboard/planck/keymaps/pete/keymap.c
index 57cab65a31..fb2d9692d0 100644
--- a/keyboard/planck/keymaps/pete/keymap.c
+++ b/keyboard/planck/keymaps/pete/keymap.c
@@ -21,6 +21,7 @@ extern keymap_config_t keymap_config;
#define _RAISE 4
#define _FCT 5
#define _SETUP 6
+#define _MUSIC 7
#define _MICMUTE 16
// Macro name shortcuts
@@ -209,7 +210,7 @@ void play_goodbye_tone()
uint8_t starting_note = 0x0C;
int offset = 0;
-void process_action_user(keyrecord_t *record) {
+bool process_action_user(keyrecord_t *record) {
if (IS_LAYER_ON(_MUSIC)) {
if (record->event.pressed) {
@@ -217,7 +218,8 @@ void process_action_user(keyrecord_t *record) {
} 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)));
}
+ return false;
}
-
+ return true;
}
#endif