Missed some stuff. Added a song (stole it from reddit).

This commit is contained in:
Zach Nielsen 2016-11-10 12:59:55 -08:00
parent c07ef5c6ab
commit 4c0aa02b2e
6 changed files with 19 additions and 122 deletions

View file

@ -16,7 +16,7 @@ USB_6KRO_ENABLE = no # 6key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
VARIABLE_TRACE = no # Debug changes to variable values #VARIABLE_TRACE = no # Debug changes to variable values
UNICODE_ENABLE = yes # Unicode UNICODE_ENABLE = yes # Unicode
UNICODEMAP_ENABLE = yes # Enable extended unicode UNICODEMAP_ENABLE = yes # Enable extended unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID

View file

@ -53,8 +53,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
//#define LOCKING_SUPPORT_ENABLE //#define LOCKING_SUPPORT_ENABLE
#undef LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */
//#define LOCKING_RESYNC_ENABLE //#define LOCKING_RESYNC_ENABLE
#undef LOCKING_RESYNC_ENABLE
/* key combination for command */ /* key combination for command */
#define IS_COMMAND() ( \ #define IS_COMMAND() ( \
@ -70,6 +72,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_DEBUG //#define NO_DEBUG
/* disable print */ /* disable print */
//#define NO_PRINT //#define NO_PRINT
#undef NO_PRINT
/* disable action features */ /* disable action features */
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER

View file

@ -3,7 +3,6 @@
#include "eeconfig.h" #include "eeconfig.h"
#include "action_layer.h" #include "action_layer.h"
#include "keymap_colemak.h" #include "keymap_colemak.h"
#include "extra_functions.c"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
// Fillers to make layering more clear // Fillers to make layering more clear
@ -249,7 +248,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#ifndef TAP_DANCE_ENABLE
case RAISE: case RAISE:
if(record->event.pressed){ if(record->event.pressed){
layer_on(_RAISE); layer_on(_RAISE);
@ -270,7 +268,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#endif
case SHFT_CAP: case SHFT_CAP:
if(record->event.pressed){ if(record->event.pressed){
key_timer = timer_read(); // if the key is being pressed, we start the timer. key_timer = timer_read(); // if the key is being pressed, we start the timer.
@ -441,62 +438,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#ifdef TAP_DANCE_ENABLE
case TappyR:
if(record->event.pressed){
if(timer_elapsed32(Rtimer) > 1052){
Rstate = 0;
}
switch(Rstate){
case 0:
Rtimer = timer_read32();
Rstate++;
break;
case 1:
Rtimes[0] = timer_elapsed32(Rtimer);
Rtimer = timer_read32();
Rstate++;
break;
case 2:
Rtimes[1] = timer_elapsed32(Rtimer);
Rtimer = timer_read32();
Rstate++;
break;
case 3:
Rtimes[2] = timer_elapsed32(Rtimer);
Rstate = 0;
break;
}
if(Rstate == 0 && Lstate == 0) rhythm_parse();
}
return false;
break;
case TappyL:
if(record->event.pressed){
if(timer_elapsed32(Ltimer) > 1052){
Lstate = 0;
}
switch(Lstate){
case 0:
Ltimer = timer_read32();
Lstate++;
break;
case 1:
Ltimes[0] = timer_elapsed32(Ltimer);
Ltimer = timer_read32();
Lstate++;
break;
case 2:
Ltimes[1] = timer_elapsed32(Ltimer);
Lstate = 0;
break;
}
if(Rstate == 0 && Lstate == 0) rhythm_parse();
}
return false;
break;
#endif
#endif
case RANDIG: case RANDIG:
if (record->event.pressed) { if (record->event.pressed) {
tap_random_base64(); tap_random_base64();
@ -507,7 +448,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
}; };
#ifdef AUDIO_ENABLE
void matrix_init_user(void){ // Run once at startup void matrix_init_user(void){ // Run once at startup
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(50); // gets rid of tick _delay_ms(50); // gets rid of tick
@ -515,6 +455,7 @@ void matrix_init_user(void){ // Run once at startup
#endif #endif
} }
#ifdef AUDIO_ENABLE
void play_goodbye_tone(void){ void play_goodbye_tone(void){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150); _delay_ms(150);

View file

@ -16,7 +16,7 @@ USB_6KRO_ENABLE = no # 6key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = yes # Audio output on port C6 AUDIO_ENABLE = yes # Audio output on port C6
VARIABLE_TRACE = no # Debug changes to variable values #VARIABLE_TRACE = no # Debug changes to variable values
UNICODE_ENABLE = yes # Unicode UNICODE_ENABLE = yes # Unicode
UNICODEMAP_ENABLE = no # Enable extended unicode UNICODEMAP_ENABLE = no # Enable extended unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID

View file

@ -3,7 +3,6 @@
#include "eeconfig.h" #include "eeconfig.h"
#include "action_layer.h" #include "action_layer.h"
#include "keymap_colemak.h" #include "keymap_colemak.h"
#include "extra_functions.c"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
// Fillers to make layering more clear // Fillers to make layering more clear
@ -249,7 +248,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#ifndef TAP_DANCE_ENABLE
case RAISE: case RAISE:
if(record->event.pressed){ if(record->event.pressed){
layer_on(_RAISE); layer_on(_RAISE);
@ -270,7 +268,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#endif
case SHFT_CAP: case SHFT_CAP:
if(record->event.pressed){ if(record->event.pressed){
key_timer = timer_read(); // if the key is being pressed, we start the timer. key_timer = timer_read(); // if the key is being pressed, we start the timer.
@ -441,62 +438,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
#ifdef TAP_DANCE_ENABLE
case TappyR:
if(record->event.pressed){
if(timer_elapsed32(Rtimer) > 1052){
Rstate = 0;
}
switch(Rstate){
case 0:
Rtimer = timer_read32();
Rstate++;
break;
case 1:
Rtimes[0] = timer_elapsed32(Rtimer);
Rtimer = timer_read32();
Rstate++;
break;
case 2:
Rtimes[1] = timer_elapsed32(Rtimer);
Rtimer = timer_read32();
Rstate++;
break;
case 3:
Rtimes[2] = timer_elapsed32(Rtimer);
Rstate = 0;
break;
}
if(Rstate == 0 && Lstate == 0) rhythm_parse();
}
return false;
break;
case TappyL:
if(record->event.pressed){
if(timer_elapsed32(Ltimer) > 1052){
Lstate = 0;
}
switch(Lstate){
case 0:
Ltimer = timer_read32();
Lstate++;
break;
case 1:
Ltimes[0] = timer_elapsed32(Ltimer);
Ltimer = timer_read32();
Lstate++;
break;
case 2:
Ltimes[1] = timer_elapsed32(Ltimer);
Lstate = 0;
break;
}
if(Rstate == 0 && Lstate == 0) rhythm_parse();
}
return false;
break;
#endif
#endif
case RANDIG: case RANDIG:
if (record->event.pressed) { if (record->event.pressed) {
tap_random_base64(); tap_random_base64();
@ -507,7 +448,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
}; };
#ifdef AUDIO_ENABLE
void matrix_init_user(void){ // Run once at startup void matrix_init_user(void){ // Run once at startup
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(50); // gets rid of tick _delay_ms(50); // gets rid of tick
@ -515,6 +455,7 @@ void matrix_init_user(void){ // Run once at startup
#endif #endif
} }
#ifdef AUDIO_ENABLE
void play_goodbye_tone(void){ void play_goodbye_tone(void){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150); _delay_ms(150);

View file

@ -3,6 +3,10 @@
#ifndef SONG_LIST_H #ifndef SONG_LIST_H
#define SONG_LIST_H #define SONG_LIST_H
#define COIN_SOUND \
E__NOTE(_A5 ),\
HD_NOTE(_E6 ),
#define ODE_TO_JOY \ #define ODE_TO_JOY \
Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \ Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \
Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \ Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \
@ -122,4 +126,12 @@
E__NOTE(_E5), \ E__NOTE(_E5), \
E__NOTE(_D5), E__NOTE(_D5),
#define UNICODE_WINDOWS \
E__NOTE(_B5), \
S__NOTE(_E6),
#define UNICODE_LINUX \
E__NOTE(_E6), \
S__NOTE(_B5),
#endif #endif