summaryrefslogtreecommitdiff
path: root/keyboard/preonic
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-15 23:38:21 -0400
committerJack Humbert <jack.humb@gmail.com>2016-04-15 23:38:21 -0400
commit0faa18eab996c2cfcc5da0b60b702f52335c5854 (patch)
tree33ed4babd10d6e8051edafa48f142e0e78aeeed5 /keyboard/preonic
parent91119636631f24bd1bf97f32c3d39f8828da625f (diff)
audio enable stored in eeprom
Diffstat (limited to 'keyboard/preonic')
-rw-r--r--keyboard/preonic/Makefile4
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c12
2 files changed, 9 insertions, 7 deletions
diff --git a/keyboard/preonic/Makefile b/keyboard/preonic/Makefile
index 664aff7321..e48052c825 100644
--- a/keyboard/preonic/Makefile
+++ b/keyboard/preonic/Makefile
@@ -139,8 +139,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE = YES # MIDI controls
-AUDIO_ENABLE = YES # Audio output on port C6
+MIDI_ENABLE = yes # MIDI controls
+AUDIO_ENABLE = yes # Audio output on port C6
# UNICODE_ENABLE = YES # Unicode
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
# RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with MIDI at the same time.
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 7846707848..3da69c2155 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -59,11 +59,11 @@ const uint16_t PROGMEM fn_actions[] = {
};
float start_up[][2] = {
- {440.0*pow(2.0,(67)/12.0), 600},
- {440.0*pow(2.0,(64)/12.0), 400},
- {440.0*pow(2.0,(55)/12.0), 400},
- {440.0*pow(2.0,(60)/12.0), 400},
- {440.0*pow(2.0,(64)/12.0), 1000},
+ {440.0*pow(2.0,(67)/12.0), 4},
+ {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), 10},
};
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -76,8 +76,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef BACKLIGHT_ENABLE
backlight_step();
#endif
+ audio_toggle();
} else {
unregister_code(KC_RSFT);
+ play_notes(&start_up, 5, false);
}
break;
}