Added CM/DK

1 files changed, 202 insertions, 96 deletions

diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index f88d5117c9..380e69ee93 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -1,55 +1,66 @@
 #include "atomic.h"
 #include "action_layer.h"
+#include "eeconfig.h"
 #include "led.h"
 
 #ifdef AUDIO_ENABLE
-#include "audio.h"
-#include "song_list.h"
+	#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
-#define M_RS 2
-#define M_FN 3
-#define M_T1 4
-#define M_T2 5
-#define M_T3 6
-#define M_T4 7
-#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
-#define ___T___ KC_TRNS
-#define XXXXXXX KC_NO
-
-/*
+#define LAYER_QWERTY         0
+#define LAYER_COLEMAK        1
+#define LAYER_DVORAK         2
+#define LAYER_LOWER          3
+#define LAYER_RAISE          4
+#define LAYER_ADJUST         5
+#define LAYER_FUNCTION       6
+#define LAYER_MUSIC          7
+
+#define MACRO_QWERTY         0
+#define MACRO_COLEMAK        1
+#define MACRO_DVORAK         2
+#define MACRO_LOWER          3
+#define MACRO_RAISE          4
+#define MACRO_FUNCTION       5
+#define MACRO_TIMBRE_1       6
+#define MACRO_TIMBRE_2       7
+#define MACRO_TIMBRE_3       8
+#define MACRO_TIMBRE_4       9
+#define MACRO_TEMPO_U       10
+#define MACRO_TEMPO_D       11
+#define MACRO_TONE_DEFAULT  12
+#define MACRO_MUSIC_ON      13
+#define MACRO_MUSIC_OFF     14
+#define MACRO_AUDIO_ON      15
+#define MACRO_AUDIO_OFF     16
+
+#define M_QWRTY             M(MACRO_QWERTY)
+#define M_COLMK             M(MACRO_COLEMAK)
+#define M_DVORK             M(MACRO_DVORAK)
+#define M_LOWER             M(MACRO_LOWER)
+#define M_RAISE             M(MACRO_RAISE)
+#define M_FUNCT             M(MACRO_FUNCTION)
+#define TIMBR_1             M(MACRO_TIMBRE_1)
+#define TIMBR_2             M(MACRO_TIMBRE_2)
+#define TIMBR_3             M(MACRO_TIMBRE_3)
+#define TIMBR_4             M(MACRO_TIMBRE_4)
+#define TMPO_UP             M(MACRO_TEMPO_U)
+#define TMPO_DN             M(MACRO_TEMPO_D)
+#define TMPO_DF             M(MACRO_TONE_DEFAULT)
+
+
+#define MUS_ON              M(MACRO_MUSIC_ON)
+#define MUS_OFF             M(MACRO_MUSIC_OFF)
+#define AUD_OFF             M(MACRO_AUDIO_OFF)
+#define AUD_ON              M(MACRO_AUDIO_ON)
+
+
+#define _______             KC_TRNS
+#define ___T___             KC_TRNS
+#define XXXXXXX             KC_NO
+
+/* QWERTY
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
  * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
@@ -64,55 +75,109 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QW] = { /* QWERTY */
+ [LAYER_QWERTY] = { /* QWERTY */
   { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX  },
   { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
   { KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  XXXXXXX, KC_PGUP  },
   { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX, KC_UP,   KC_PGDN  },
-  { KC_LCTL, KC_LGUI, M(M_FN), KC_LALT, M(M_RS), KC_SPC,  XXXXXXX, M(M_LW), KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
+  { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC,  XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
+ },
+
+ /* COLEMAK
+ * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+ * | TAB    | Q      | W      | F      | P      | G      | J      | L      | U      | Y      | ;      | [      | ]      | \      | DEL    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
+ * | CAPS   | A      | R      | S      | T      | D      | H      | N      | E      | I      | O      | '      | XXXXXX . ENTER  | PG UP  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
+ * | LSHIFT | Z      | X      | C      | V      | B      | K      | M      | ,      | .      | /      | XXXXXX . RSHIFT | UP     | PG DN  |
+ * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | LCTRL  | LWIN   | FN     | LALT   | RAISED | XXXXXX . SPACE  | LOWER  | RALT   | HOME   | END    | RCTRL  | LEFT   | DOWN   | RIGHT  |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+ [LAYER_COLEMAK] = { /* COLEMAK */
+  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC  },
+  { KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
+  { KC_CAPS, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP  },
+  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
+  { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC,  XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
+ },
+
+/* DVORAK
+ * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | XXXXXX . BACKSP |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+ * | TAB    | '      | ,      | .      | P      | Y      | F      | G      | C      | R      | L      | [      | ]      | \      | DEL    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
+ * | CAPS   | A      | O      | E      | U      | I      | D      | H      | T      | N      | S      | /      | XXXXXX . ENTER  | PG UP  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
+ * | LSHIFT | ;      | Q      | J      | K      | X      | B      | M      | W      | V      | Z      | XXXXXX . RSHIFT | UP     | PG DN  |
+ * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | LCTRL  | LWIN   | FN     | LALT   | RAISED | XXXXXX . SPACE  | LOWER  | RALT   | HOME   | END    | RCTRL  | LEFT   | DOWN   | RIGHT  |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+ [LAYER_DVORAK] = { /* DVORAK */
+  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC  },
+  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
+  { KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP  },
+  { KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
+  { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC,  XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
  },
- [_LW] = { /* LOWERED */
+
+
+ [LAYER_LOWER] = { /* LOWERED */
   { KC_GRV,  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_INS   },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
- [_RS] = { /* RAISED */
+
+ [LAYER_RAISE] = { /* RAISED */
   { KC_TILD, 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_INS   },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
- [_FN] = { /* FUNCTION */
+
+ [LAYER_FUNCTION] = { /* FUNCTION */
   { 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  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
   { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
  },
- [_AD] = { /* ADJUST */
+
+ [LAYER_ADJUST] = { /* 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___  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
+  { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
  },
-[_MUSIC] = {
+
+ [LAYER_MUSIC] = {
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-}
-
+ },
 };
 
 #ifdef AUDIO_ENABLE
 
 float tone_my_startup[][2] = SONG(ODE_TO_JOY);
 float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
+
+float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
+float tone_dvorak[][2]     = SONG(COLEMAK_SOUND);
+float tone_colemak[][2]    = SONG(DVORAK_SOUND);
+
 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);
@@ -124,7 +189,7 @@ float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
 
 #endif /* AUDIO_ENABLE */
 
-
+/*
 void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
 {
 	if (order)
@@ -152,71 +217,111 @@ void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t l
 		}
 	}
 }
+*/
 
+void persistant_default_layer_set(uint16_t default_layer)
+{
+	eeconfig_write_default_layer(default_layer);
+	default_layer_set(default_layer);
+}
 
 const uint16_t PROGMEM fn_actions[] = {
 };
 
-
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
 
 	// MACRODOWN only works in this function
 	switch(id)
 	{
-		case M_LW:
-			if (record->event.pressed) {
-				layer_on(_LW);
-				update_tri_layer(_LW, _RS, _AD);
-			} else {
-				layer_off(_LW);
-				update_tri_layer(_LW, _RS, _AD);
+
+		case MACRO_QWERTY:
+			if (record->event.pressed)
+			{
+				persistant_default_layer_set(1UL<<LAYER_QWERTY);
+				PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
+			}
+			break;
+
+		case MACRO_COLEMAK:
+			if (record->event.pressed)
+			{
+				persistant_default_layer_set(1UL<<LAYER_COLEMAK);
+				PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
+			}
+			break;
+
+		case MACRO_DVORAK:
+			if (record->event.pressed)
+			{
+				persistant_default_layer_set(1UL<<LAYER_DVORAK);
+				PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
+			}
+			break;
+
+
+		case MACRO_LOWER:
+			if (record->event.pressed)
+			{
+				layer_on(LAYER_LOWER);
+				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+			}
+			else
+			{
+				layer_off(LAYER_LOWER);
+				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
 			}
 			break;
-		case M_RS:
-			if (record->event.pressed) {
-				layer_on(_RS);
-				update_tri_layer(_LW, _RS, _AD);
-			} else {
-				layer_off(_RS);
-				update_tri_layer(_LW, _RS, _AD);
+
+		case MACRO_RAISE:
+			if (record->event.pressed)
+			{
+				layer_on(LAYER_RAISE);
+				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+			}
+			else
+			{
+				layer_off(LAYER_RAISE);
+				update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
 			}
 			break;
 
-		case M_FN:
-			if (record->event.pressed) {
-				layer_on(_FN);
-			} else {
-				layer_off(_FN);
+		case MACRO_FUNCTION:
+			if (record->event.pressed)
+			{
+				layer_on(LAYER_FUNCTION);
+			}
+			else
+			{
+				layer_off(LAYER_FUNCTION);
 			}
 			break;
 
-		case M_T1:
+		case MACRO_TIMBRE_1:
 			if (record->event.pressed) set_timbre(TIMBRE_12);
 			break;
 
-		case M_T2:
+		case MACRO_TIMBRE_2:
 			if (record->event.pressed) set_timbre(TIMBRE_25);
 			break;
 
-		case M_T3:
+		case MACRO_TIMBRE_3:
 			if (record->event.pressed) set_timbre(TIMBRE_50);
 			break;
 
-		case M_T4:
+		case MACRO_TIMBRE_4:
 			if (record->event.pressed) set_timbre(TIMBRE_75);
 			break;
 
-
-		case M_TU:
+		case MACRO_TEMPO_U:
 			if (record->event.pressed) increase_tempo(10);
 			break;
 
-		case M_TD:
+		case MACRO_TEMPO_D:
 			if (record->event.pressed) decrease_tempo(10);
 			break;
 
-		case M_DF:
+		case MACRO_TONE_DEFAULT:
 			if (record->event.pressed)
 			{
 				set_timbre(TIMBRE_DEFAULT);
@@ -224,40 +329,41 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 			}
 			break;
 
-		case M_AUDIO_OFF:
-			if (record->event.pressed) {
+		case MACRO_AUDIO_OFF:
+			if (record->event.pressed)
+			{
 				#ifdef AUDIO_ENABLE
-				audio_off();
+					audio_off();
 				#endif
 			}
 			break;
 
-		case M_AUDIO_ON:
+		case MACRO_AUDIO_ON:
 			if (record->event.pressed)
 			{
 				#ifdef AUDIO_ENABLE
-				audio_on();
+					audio_on();
 				PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
 				#endif
 			}
 			break;
 
-		case M_MUSIC_ON:
+		case MACRO_MUSIC_ON:
 			if (record->event.pressed)
 			{
 				#ifdef AUDIO_ENABLE
-				PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
-				layer_on(_MUSIC);
+					PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+					layer_on(LAYER_MUSIC);
 				#endif
 			}
 			break;
 
-		case M_MUSIC_OFF:
+		case MACRO_MUSIC_OFF:
 			if (record->event.pressed)
 			{
 				#ifdef AUDIO_ENABLE
-				layer_off(_MUSIC);
-				stop_all_notes();
+					layer_off(LAYER_MUSIC);
+					stop_all_notes();
 				#endif
 			}
 			break;
@@ -278,7 +384,7 @@ int offset = 7;
 
 void process_action_user(keyrecord_t *record)
 {
-	if (IS_LAYER_ON(_MUSIC))
+	if (IS_LAYER_ON(LAYER_MUSIC))
 	{
 		if (record->event.pressed)
 		{