summaryrefslogtreecommitdiffstats
path: root/keyboard/atomic/keymaps/pvc
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-04-17 20:14:37 -0500
committerIBNobody <ibnobody@gmail.com>2016-04-17 20:14:37 -0500
commit5c98ad59606ee95b82c27bf2525383a9ec88542b (patch)
tree99124a3567045aff6922a39a7062f27bd38e132a /keyboard/atomic/keymaps/pvc
parent23231fa577f7c6c585124226a83f21a7668e62dd (diff)
Added extra songs, LED indicator notes
Diffstat (limited to 'keyboard/atomic/keymaps/pvc')
-rw-r--r--keyboard/atomic/keymaps/pvc/config.h10
-rw-r--r--keyboard/atomic/keymaps/pvc/keymap.c292
-rw-r--r--keyboard/atomic/keymaps/pvc/makefile.mk2
3 files changed, 174 insertions, 130 deletions
diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h
index 8449fa06de..cb0b78e447 100644
--- a/keyboard/atomic/keymaps/pvc/config.h
+++ b/keyboard/atomic/keymaps/pvc/config.h
@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
-*/
+*/
#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
#define ROWS (int []){ D0, D5, B5, B6, B3 }
@@ -62,17 +62,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/*
+/*
* Force NKRO
*
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
* state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
* makefile for this to work.)
*
* If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset.
*
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
* fully operational during normal computer usage.
*
* For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
@@ -90,7 +90,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* the keyboard. They are best used in combination with the HID Listen program,
* found here: https://www.pjrc.com/teensy/hid_listen.html
*
- * The options below allow the magic key functionality to be changed. This is
+ * The options below allow the magic key functionality to be changed. This is
* useful if your keyboard/keypad is missing keys and you want magic key support.
*
*/
diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index aaef6b041d..563519e4c0 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -1,17 +1,18 @@
#include "atomic.h"
#include "action_layer.h"
+#include "led.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
#include "song_list.h"
#endif
-
#define _QW 0
#define _LW 1
#define _RS 2
#define _AD 3
#define _FN 4
+#define _MUSIC 4
#define M_QW 0
#define M_LW 1
@@ -24,6 +25,24 @@
#define M_TU 8
#define M_TD 9
#define M_DF 10
+#define M_MUSIC_ON 11
+#define M_MUSIC_OFF 12
+#define M_AUDIO_ON 13
+#define M_AUDIO_OFF 14
+
+#define TIMBR_1 M(M_T1)
+#define TIMBR_2 M(M_T2)
+#define TIMBR_3 M(M_T3)
+#define TIMBR_4 M(M_T4)
+#define TMPO_UP M(M_TU)
+#define TMPO_DN M(M_TD)
+#define TMPO_DF M(M_DF)
+
+
+#define MUS_ON M(M_MUSIC_ON)
+#define MUS_OFF M(M_MUSIC_OFF)
+#define AUD_OFF M(M_AUDIO_OFF)
+#define AUD_ON M(M_AUDIO_ON)
#define _______ KC_TRNS
@@ -70,135 +89,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{ KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
{ KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR },
{ KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U },
- { _______, M(M_T1), M(M_T2), M(M_T3), M(M_T4), M(M_TU), M(M_TD), M(M_DF), _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
{ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
},
[_AD] = { /* ADJUST */
+ { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, MUS_ON, MUS_OFF, AUD_ON, AUD_OFF, ___T___, ___T___ },
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
+ { _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+ },
+[_MUSIC] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___ },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- },
-};
-
-
-
-#ifdef AUDIO_ENABLE
+}
-float start_up[][2] = SONG(ODE_TO_JOY);
-
-float tone_lw[][2] = {
-
- Q__NOTE(_C4 ) ,
- Q__NOTE(_CS4 ) ,
- Q__NOTE(_D4 ) ,
- Q__NOTE(_DS4 ) ,
- Q__NOTE(_E4 ) ,
- Q__NOTE(_F4 ) ,
- Q__NOTE(_FS4 ) ,
- Q__NOTE(_G4 ) ,
- Q__NOTE(_GS4 ) ,
- Q__NOTE(_A4 ) ,
- Q__NOTE(_AS4 ) ,
-
- Q__NOTE(_B1 ) ,
-
- Q__NOTE(_C2 ) ,
- Q__NOTE(_CS2 ) ,
- Q__NOTE(_D2 ) ,
- Q__NOTE(_DS2 ) ,
- Q__NOTE(_E2 ) ,
- Q__NOTE(_F2 ) ,
- Q__NOTE(_FS2 ) ,
- Q__NOTE(_G2 ) ,
- Q__NOTE(_GS2 ) ,
- Q__NOTE(_A2 ) ,
- Q__NOTE(_AS2 ) ,
- Q__NOTE(_B2 ) ,
- Q__NOTE(_C3 ) ,
- Q__NOTE(_CS3 ) ,
- Q__NOTE(_D3 ) ,
- Q__NOTE(_DS3 ) ,
- Q__NOTE(_E3 ) ,
- Q__NOTE(_F3 ) ,
- Q__NOTE(_FS3 ) ,
- Q__NOTE(_G3 ) ,
- Q__NOTE(_GS3 ) ,
- Q__NOTE(_A3 ) ,
- Q__NOTE(_AS3 ) ,
- Q__NOTE(_B3 ) ,
- Q__NOTE(_C4 ) ,
- Q__NOTE(_CS4 ) ,
- Q__NOTE(_D4 ) ,
- Q__NOTE(_DS4 ) ,
- Q__NOTE(_E4 ) ,
- Q__NOTE(_F4 ) ,
- Q__NOTE(_FS4 ) ,
- Q__NOTE(_G4 ) ,
- Q__NOTE(_GS4 ) ,
- Q__NOTE(_A4 ) ,
- Q__NOTE(_AS4 ) ,
- Q__NOTE(_B4 ) ,
- Q__NOTE(_C5 ) ,
- Q__NOTE(_CS5 ) ,
- Q__NOTE(_D5 ) ,
- Q__NOTE(_DS5 ) ,
- Q__NOTE(_E5 ) ,
- Q__NOTE(_F5 ) ,
- Q__NOTE(_FS5 ) ,
- Q__NOTE(_G5 ) ,
- Q__NOTE(_GS5 ) ,
- Q__NOTE(_A5 ) ,
- Q__NOTE(_AS5 ) ,
- Q__NOTE(_B5 ) ,
- Q__NOTE(_C6 ) ,
- Q__NOTE(_CS6 ) ,
- Q__NOTE(_D6 ) ,
- Q__NOTE(_DS6 ) ,
- Q__NOTE(_E6 ) ,
- Q__NOTE(_F6 ) ,
- Q__NOTE(_FS6 ) ,
- Q__NOTE(_G6 ) ,
- Q__NOTE(_GS6 ) ,
- Q__NOTE(_A6 ) ,
- Q__NOTE(_AS6 ) ,
- Q__NOTE(_B6 ) ,
- Q__NOTE(_C7 ) ,
- Q__NOTE(_CS7 ) ,
- Q__NOTE(_D7 ) ,
- Q__NOTE(_DS7 ) ,
- Q__NOTE(_E7 ) ,
- Q__NOTE(_F7 ) ,
- Q__NOTE(_FS7 ) ,
- Q__NOTE(_G7 ) ,
- Q__NOTE(_GS7 ) ,
- Q__NOTE(_A7 ) ,
- Q__NOTE(_AS7 ) ,
- Q__NOTE(_B7 ) ,
- Q__NOTE(_C8 ) ,
- Q__NOTE(_CS8 ) ,
- Q__NOTE(_D8 ) ,
- Q__NOTE(_DS8 ) ,
- Q__NOTE(_E8 ) ,
- Q__NOTE(_F8 ) ,
- Q__NOTE(_FS8 ) ,
- Q__NOTE(_G8 ) ,
- Q__NOTE(_GS8 ) ,
- Q__NOTE(_A8 ) ,
- Q__NOTE(_AS8 ) ,
- Q__NOTE(_B8 ) ,
};
-float tone_rs[][2] = SONG(ROCK_A_BYE_BABY);
+#ifdef AUDIO_ENABLE
-void matrix_init_user(void) {
- init_notes();
- PLAY_NOTE_ARRAY(start_up, false, STACCATO);
- println("Matrix Init");
-}
+float tone_my_startup[][2] = SONG(ODE_TO_JOY);
+float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
+float tone_audio_on[][2] = SONG(CLOSE_ENCOUNTERS_5_NOTE);
+float tone_music_on[][2] = SONG(DOE_A_DEER);
+float tone_caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND);
+float tone_caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND);
+float tone_numlk_on[][2] = SONG(NUM_LOCK_ON_SOUND);
+float tone_numlk_off[][2] = SONG(NUM_LOCK_OFF_SOUND);
+float tone_scroll_on[][2] = SONG(SCROLL_LOCK_ON_SOUND);
+float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
-#endif
+#endif /* AUDIO_ENABLE */
void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
@@ -242,9 +166,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
case M_LW:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_lw, false, STACCATO);
- #endif
layer_on(_LW);
update_tri_layer(_LW, _RS, _AD);
} else {
@@ -254,9 +175,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break;
case M_RS:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_rs, false, LEGATO);
- #endif
layer_on(_RS);
update_tri_layer(_LW, _RS, _AD);
} else {
@@ -306,9 +224,135 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
break;
+ case M_AUDIO_OFF:
+ if (record->event.pressed) {
+ #ifdef AUDIO_ENABLE
+ audio_off();
+ #endif
+ }
+ break;
+
+ case M_AUDIO_ON:
+ if (record->event.pressed)
+ {
+ #ifdef AUDIO_ENABLE
+ audio_on();
+ PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+ #endif
+ }
+ break;
+
+ case M_MUSIC_ON:
+ if (record->event.pressed)
+ {
+ #ifdef AUDIO_ENABLE
+ PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+ layer_on(_MUSIC);
+ #endif
+ }
+ break;
+
+ case M_MUSIC_OFF:
+ if (record->event.pressed)
+ {
+ #ifdef AUDIO_ENABLE
+ layer_off(_MUSIC);
+ stop_all_notes();
+ #endif
+ }
+ break;
+
default:
break;
}
return MACRO_NONE;
-}; \ No newline at end of file
+};
+
+
+#ifdef AUDIO_ENABLE
+
+uint8_t starting_note = 0x0C;
+int offset = 7;
+
+
+void process_action_user(keyrecord_t *record)
+{
+ if (IS_LAYER_ON(_MUSIC))
+ {
+ if (record->event.pressed)
+ {
+ play_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)), 0xF);
+ }
+ 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)));
+ }
+ }
+}
+
+
+void matrix_init_user(void)
+{
+ init_notes();
+ play_startup_tone();
+ println("Matrix Init");
+}
+
+void led_set_user(uint8_t usb_led)
+{
+ static uint8_t old_usb_led = 0;
+ static bool first_run = true;
+
+ // Skip first execution to avoid beeps caused by LED states being detected on power-up
+ if (!first_run)
+ {
+
+ if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+ {
+ // If CAPS LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+ {
+ // If CAPS LK LED is turning off...
+ PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+ }
+ else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+ {
+ // If NUM LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+ {
+ // If NUM LED is turning off...
+ PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+ }
+ else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+ {
+ // If SCROLL LK LED is turning on...
+ PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO);
+ }
+ else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+ {
+ // If SCROLL LED is turning off...
+ PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+ }
+ }
+ old_usb_led = usb_led;
+ first_run = false;
+}
+
+
+void play_startup_tone()
+{
+ PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
+}
+
+void play_goodbye_tone()
+{
+ PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
+ _delay_ms(2000);
+}
+
+#endif /* AUDIO_ENABLE */
diff --git a/keyboard/atomic/keymaps/pvc/makefile.mk b/keyboard/atomic/keymaps/pvc/makefile.mk
index d469966501..eefa42855f 100644
--- a/keyboard/atomic/keymaps/pvc/makefile.mk
+++ b/keyboard/atomic/keymaps/pvc/makefile.mk
@@ -1,7 +1,7 @@
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = yes # Console for debug(+400)
+CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality