X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboards%2Fhandwired%2Fgamenum%2Fkeymaps%2Fdefault%2Fkeymap.c;h=237b0fb9272dc9e0d5ff593fbfe6a5659b984c23;hb=f14629ed1cd7c7ec9089604d64f29a99981558e8;hp=6950b741a33adc47a886b29756a9f3b714090a57;hpb=5cac51a773bef7fc8064390ac3ee499121a9611d;p=qmk_firmware.git

diff --git a/keyboards/handwired/gamenum/keymaps/default/keymap.c b/keyboards/handwired/gamenum/keymaps/default/keymap.c
index 6950b741a..237b0fb92 100644
--- a/keyboards/handwired/gamenum/keymaps/default/keymap.c
+++ b/keyboards/handwired/gamenum/keymaps/default/keymap.c
@@ -1,68 +1,59 @@
-#include "gamenum.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 
-#define _______ KC_TRNS
-
 #define DEF 0
 #define HDN 1
 #define OSY 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[DEF] = KEYMAP(
-  KC_FN0,   KC_SLSH, KC_ASTR, KC_MINS, \
-  KC_7,      KC_8,       KC_9,       KC_PLUS, \
-  KC_4,      KC_5,       KC_6, \
-  KC_1,      KC_2,       KC_3, \
-  KC_0,      KC_DOT,  KC_ENT \
-),
-[HDN] = KEYMAP(
-  KC_FN1,   KC_1,  	KC_2,   	KC_3,  \
-  KC_Q,      KC_W, 	KC_E,   	KC_R, \
-  KC_A,      KC_S,  	KC_D, \
-  KC_Z,      KC_X,  	KC_C, \
-  KC_LSFT, KC_LALT,  KC_SPC \
-),
-[OSY] = KEYMAP(
-  KC_A,    	KC_Q, 	KC_1, 	KC_FN2, \
-  KC_S,    	KC_W, 	KC_2, 	KC_LALT, \
-  KC_D,    	KC_E, 	KC_3, \
-  KC_F,   	KC_R, 	KC_4, \
-  KC_SPC, KC_T, 	KC_TAB \
-)
+  [DEF] = LAYOUT(
+    TO(HDN), KC_SLSH, KC_ASTR, KC_MINS, \
+    KC_7,    KC_8,    KC_9,    KC_PLUS, \
+    KC_4,    KC_5,    KC_6,             \
+    KC_1,    KC_2,    KC_3,             \
+    KC_0,             KC_DOT,  KC_ENT   \
+  ),
+  [HDN] = LAYOUT(
+    TO(OSY), KC_1,    KC_2,    KC_3,    \
+    KC_Q,    KC_W,    KC_E,    KC_R,    \
+    KC_A,    KC_S,    KC_D,             \
+    KC_Z,    KC_X,    KC_C,             \
+    KC_LSFT,          KC_LALT, KC_SPC   \
+  ),
+  [OSY] = LAYOUT(
+    KC_A,    KC_Q,    KC_1,    TO(DEF), \
+    KC_S,    KC_W,    KC_2,    KC_LALT, \
+    KC_D,    KC_E,    KC_3,             \
+    KC_F,    KC_R,    KC_4,             \
+    KC_SPC,           KC_T,    KC_TAB   \
+  )
 };
 
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode) {
+    case TO(HDN):
+      if (record->event.pressed) {
+        PORTC |= (1 << 6); // PC6 goes high
+      }
 
-const uint16_t PROGMEM fn_actions[] = {
-		[0] = ACTION_LAYER_SET(HDN, ON_PRESS),
-		[1] = ACTION_LAYER_SET(OSY, ON_PRESS),
-		[2] = ACTION_LAYER_SET(DEF, ON_PRESS),
-};
+      return true;
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  return MACRO_NONE;
-};
+    case TO(OSY):
+      if (record->event.pressed) {
+        PORTC &= ~(1 << 6); // PC6 goes high
+        PORTD |= (1<<4);
+      }
 
+      return true;
 
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-  case KC_FN0:
-      if (record->event.pressed) {
-        PORTC |= (1 << 6); // PC6 goes high 
-     }
-     break;
-  case KC_FN1:
-      if (record->event.pressed) {
-        PORTC &= ~(1 << 6); // PC6 goes high 
-		PORTD |= (1<<4);
-     }
-     break;
-  case KC_FN2:
+    case TO(DEF):
       if (record->event.pressed) {
-        PORTD &= ~(1 << 4); // PC6 goes high 
-     }
-     break;
+        PORTD &= ~(1 << 4); // PC6 goes high
+      }
+
+      return true;
+
+    default:
+      return true;
   }
-  return true;
-}
\ No newline at end of file
+}