1 files changed, 12 insertions, 102 deletions
diff --git a/keyboards/dz60/keymaps/marianas/keymap.h b/keyboards/dz60/keymaps/marianas/keymap.h
index 00e51cea2..bb1ea68c7 100644
--- a/keyboards/dz60/keymaps/marianas/keymap.h
+++ b/keyboards/dz60/keymaps/marianas/keymap.h
@@ -1,105 +1,15 @@
-#include "quantum.h"
+#include QMK_KEYBOARD_H
 
-//Control
-#define MO_FNLR MO(FN_LAYER)
-#define BACKSPC KC_BSPC
-#define ENTER_OR_SQL LT(SQLMACROS,KC_ENT)
-#define ESCAP KC_ESC
-#define PSCR KC_PSCREEN
-#define SCRL KC_SCROLLLOCK
-#define PAUS KC_PAUSE
-#define NSRT KC_INSERT
-#define HOME KC_HOME
-#define PGUP KC_PGUP
-#define PGDN KC_PGDN
-#define END_ KC_END
-#define DELT KC_DELETE
-#define UPUP KC_UP
-#define D_WN KC_DOWN
-#define LEFT KC_LEFT
-#define RGHT KC_RIGHT
 
-//KEYPAD
-#define KP_1 KC_KP_1
-#define KP_2 KC_KP_2
-#define KP_3 KC_KP_3
-#define KP_4 KC_KP_4
-#define KP_5 KC_KP_5
-#define KP_6 KC_KP_6
-#define KP_7 KC_KP_7
-#define KP_8 KC_KP_8
-#define KP_9 KC_KP_9
-#define KP_0 KC_KP_0
-#define NMLK KC_NUMLOCK
-#define STAR KC_KP_ASTERISK
-#define KSSH KC_KP_SLASH
-#define KMIN KC_KP_MINUS
-#define PLUS KC_KP_PLUS
-#define KNTR KC_KP_ENTER
-#define KDOT KC_KP_DOT
+enum marianas_layers {
+  QWERTY,
+/*
+  COLEMAK,
+  DVORAK,
+*/
+  NAV_CLUSTER,
+  GAMING,
+  SQLMACROS,
+  FN_LAYER
+};
 
-//Modifiers
-#define CTLL KC_LCTL
-#define LEFTSHFT KC_LSPO
-#define WINL KC_LGUI
-#define ALTL KC_LALT
-#define CTLR KC_RCTL
-#define RIGHT_SHIFT__PAREN KC_RSPC
-#define WINR KC_RGUI
-#define ALTR KC_RALT
-#define APPR KC_APP
-
-
-//Punctuation
-#define CMMA KC_COMM
-#define PRRD KC_DOT
-#define SLSH KC_SLSH
-#define QUOT KC_QUOT
-#define COLN KC_SCLN
-#define LBRC KC_LBRC
-#define RBRC KC_RBRC
-#define EQUL KC_EQL
-#define MNUS KC_MINS
-#define BSLASH KC_BSLS
-
-//Layers
-#define QWRTY TO(QWERTY)
-#define NAVS TO(NAV_CLUSTER)
-#define GAME TO(GAMING)
-
-//Space
-#define ____ KC_TRNS
-#define _____ KC_TRNS
-#define ______ KC_TRNS
-#define _______ KC_TRNS
-#define ________ KC_TRNS
-#define ___________ KC_TRNS
-#define _________________ KC_TRNS
-#define SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE KC_SPC
-#define KCNO KC_NO
-
-
-
-
-
-#define macroTapsLen 32
-#define tableNameListLen 32
-#define charCountLen 32
-
-void initStringData(void);
-uint32_t layer_state_set_user(uint32_t state);
-bool containsCode(uint16_t kc);
-bool lastCodeIs(uint16_t kc);
-bool last2CodeAre(uint16_t kc);
-bool last2CodesAre(uint16_t kc, uint16_t kc2);
-void addKeyCode(uint16_t kc);
-void eraseKeyCodes(void);
-void eraseCharCounts(void);
-void printTableAbbreviation(void);
-void eraseTableAbbreviation(void);
-void printString(char* str);
-void printStringAndQueueChar(char* str);
-void ReplaceString(char *orig, char *repl);
-void deletePrev(void);
-void processSmartMacroTap(uint16_t kc);
-bool process_record_user(uint16_t keycode, keyrecord_t *record);