media keys and stuff

diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index 50438a5d5a60497b4150bf2e9e50bb2439802957..1311bb09b6be758b68ea07ac7ce6b365584c59f9 100644 (file)
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B1, B3, B2, B6, B5, B4, E6, D7, C6, D4, D0, D1 }
+#define MATRIX_COL_PINS { B1, B3, B2, B6, B5, B4, D2, D7, C6, D4, D0, D1 }
 #define UNUSED_PINS
 
 #define AUDIO_VOICES

diff --git a/keyboards/planck/keymaps/johannes/keymap.c b/keyboards/planck/keymaps/johannes/keymap.c
index 51c8f7a095b7fd2902bee5017fded53ea5600982..13bb11798d06981c2b8beded34bac8ba46cb4e3d 100644 (file)
--- a/keyboards/planck/keymaps/johannes/keymap.c
+++ b/keyboards/planck/keymaps/johannes/keymap.c
@@ -8,6 +8,10 @@
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
+#define QWERTY 0
+#define LOWER 1
+#define RAISE 2
+#define FUNCTION 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -21,13 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
- */
+ *
 [0] = {
   {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
   {KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
   {KC_LCTRL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
   {TG(1), XXXXXXX, XXXXXXX, KC_LGUI, KC_LSHIFT,   KC_SPC,  M(2),   M(1),   KC_LALT, KC_RALT, XXXXXXX,   M(3)}
-},
+},*/
 
 /* Qwerty
  * ,-----------------------------------------------------------------------------------.
@@ -40,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      | super|shift | Space|Raise | lower|  alt | altgr|      |fn    |
  * `-----------------------------------------------------------------------------------'
  */
-[1] = {
+[QWERTY] = {
   {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
   {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
   {KC_LCTRL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
-  {_______, XXXXXXX, XXXXXXX, KC_LGUI, KC_LSHIFT,    KC_SPC,  M(2),   M(1),   KC_LALT, KC_RALT, XXXXXXX,   M(3)}
+  {_______, XXXXXXX, LT(FUNCTION, KC_MPLY), KC_LGUI, KC_LSHIFT,    KC_SPC,  MO(RAISE),   MO(LOWER),   KC_LALT, KC_RALT, XXXXXXX,   MO(FUNCTION)}
 },
 
 /* Lower
@@ -58,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |Reset |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[2] = {
+[LOWER] = {
   {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
-  {_______, _______,   KC_LCBR,   KC_RCBR,   KC_PLUS,   _______,   _______,   RALT(KC_P), RALT(KC_Q), RALT(KC_P), KC_UNDS, _______},
+  {_______, _______,   KC_LCBR,   KC_RCBR,   KC_PLUS,   _______,   _______,   RALT(KC_W), RALT(KC_Q), RALT(KC_P), KC_UNDS, _______},
   {_______, _______,   _______,   _______,   _______,  _______,  _______,_______, _______,_______, KC_BSLS, _______},
   {_______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
 },
@@ -76,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
-[3] = {
+[RAISE] = {
   {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL},
   {_______,  _______,   KC_LBRC,   KC_RBRC,   KC_EQL,   _______,   KC_LEFT,   KC_DOWN, KC_UP,  KC_RIGHT, KC_MINS, _______},
   {_______, _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, _______, KC_PIPE, _______},
@@ -84,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 },
 
 // Fn-layer
-[4] = {
+[FUNCTION] = {
   {KC_F1,  KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12},
   {_______,  _______,   _______,   _______,   _______,   _______,   _______,   _______, _______,  _______, _______, _______},
-  {_______, _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, _______, _______, _______},
-  {_______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+  {_______, _______,   _______,   _______,   _______,  _______,  KC_MEDIA_PREV_TRACK,  KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_MEDIA_NEXT_TRACK, _______, _______},
+  {_______,   _______, _______, _______, _______, _______, _______, KC_AUDIO_MUTE, _______, _______, _______, _______}
 },
 
 };
@@ -99,52 +103,5 @@ const uint16_t PROGMEM fn_actions[] = {
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
-  switch(id) {
-    case 1:
-      if (record->event.pressed) {
-        layer_on(2);
-      } else {
-        layer_off(2);
-      }
-      break;
-    case 2:
-      if (record->event.pressed) {
-        layer_on(3);
-      } else {
-        layer_off(3);
-      }
-      break;
-         case 3:
-      if (record->event.pressed) {
-        layer_on(4);
-      } else {
-        layer_off(4);
-      }
-      break;
-    case 4: // å
-      if (record->event.pressed) {
-        register_code(KC_RALT);
-        register_code(KC_W);
-      } else {
-        unregister_code(KC_RALT);
-      }
-      break;
-    case 5: // ä
-      if (record->event.pressed) {
-        register_code(KC_RALT);
-        register_code(KC_Q);
-      } else {
-        unregister_code(KC_RALT);
-      }
-      break;
-         case 6: // ö
-      if (record->event.pressed) {
-        register_code(KC_RALT);
-        register_code(KC_P);
-      } else {
-        unregister_code(KC_RALT);
-      }
-      break;
-  }
   return MACRO_NONE;
 };