summaryrefslogtreecommitdiff
path: root/keyboards/planck/keymaps/zach
diff options
context:
space:
mode:
authorZach Nielsen <nielsen.zac@gmail.com>2016-11-10 12:59:55 -0800
committerZach Nielsen <nielsen.zac@gmail.com>2016-11-10 12:59:55 -0800
commit4c0aa02b2e476a8f939586a0da2f28f2a44c83c3 (patch)
treeddabdd0bd1613030c9b6b834244ea45e83272c49 /keyboards/planck/keymaps/zach
parentc07ef5c6abd7875c19c4bcbe3bcaecd123862fd3 (diff)
Missed some stuff. Added a song (stole it from reddit).
Diffstat (limited to 'keyboards/planck/keymaps/zach')
-rw-r--r--keyboards/planck/keymaps/zach/Makefile2
-rw-r--r--keyboards/planck/keymaps/zach/config.h3
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c61
3 files changed, 5 insertions, 61 deletions
diff --git a/keyboards/planck/keymaps/zach/Makefile b/keyboards/planck/keymaps/zach/Makefile
index b0009147ac..977f1a9013 100644
--- a/keyboards/planck/keymaps/zach/Makefile
+++ b/keyboards/planck/keymaps/zach/Makefile
@@ -16,7 +16,7 @@ USB_6KRO_ENABLE = no # 6key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
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
UNICODEMAP_ENABLE = yes # Enable extended unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/keyboards/planck/keymaps/zach/config.h b/keyboards/planck/keymaps/zach/config.h
index 1be800545a..7deb9ebfe8 100644
--- a/keyboards/planck/keymaps/zach/config.h
+++ b/keyboards/planck/keymaps/zach/config.h
@@ -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 */
//#define LOCKING_SUPPORT_ENABLE
+#undef LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
//#define LOCKING_RESYNC_ENABLE
+#undef LOCKING_RESYNC_ENABLE
/* key combination for command */
#define IS_COMMAND() ( \
@@ -70,6 +72,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
+#undef NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index f01929f5d7..7d14dcf3f0 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -3,7 +3,6 @@
#include "eeconfig.h"
#include "action_layer.h"
#include "keymap_colemak.h"
-#include "extra_functions.c"
extern keymap_config_t keymap_config;
// Fillers to make layering more clear
@@ -249,7 +248,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- #ifndef TAP_DANCE_ENABLE
case RAISE:
if(record->event.pressed){
layer_on(_RAISE);
@@ -270,7 +268,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- #endif
case SHFT_CAP:
if(record->event.pressed){
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;
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:
if (record->event.pressed) {
tap_random_base64();
@@ -507,7 +448,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
};
-#ifdef AUDIO_ENABLE
void matrix_init_user(void){ // Run once at startup
#ifdef AUDIO_ENABLE
_delay_ms(50); // gets rid of tick
@@ -515,6 +455,7 @@ void matrix_init_user(void){ // Run once at startup
#endif
}
+#ifdef AUDIO_ENABLE
void play_goodbye_tone(void){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);