Merge branch 'master' of https://github.com/ishtob/qmk_firmware

keyboards/planck/keymaps/ishtob/macros_public.h

@@ -1,57 +0,0 @@
-enum macro_keycodes {
-  KC_CITRIX,
-  KC_MPASS,
-  KC_META,
-  KC_RTQ6H,
-  KC_DAYRN,
-  KC_3DRN,
-  KC_AUTODC,
-  KC_EMAIL,
-  KC_EMAIL2
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    if (!eeconfig_is_enabled()) {
-      eeconfig_init();
-    }
-
-    switch (id) {
-      //my login macros
-      case KC_CITRIX:
-        if (record->event.pressed){
-          return MACRO (I(1), T(1), END);
-        }
-      case KC_MPASS:
-        if (record->event.pressed){
-          return MACRO (I(1), T(1), END);
-        }
-      case KC_META:
-        if (record->event.pressed){
-          return MACRO (I(1), T(1), END);
-        }
-      //my work macros
-      case KC_RTQ6H:
-        if (record->event.pressed){
-          return MACRO (I(1), T(TAB), T(0), T (3), T(0), T(0), T(TAB), T(DOWN), T(TAB), T(0), T (9), T(0), T(0), T(TAB), T(DOWN), T(TAB), T(1), T (5), T(0), T(0), T(TAB), T(DOWN), T(TAB), T(2), T (1), T(0), T(0), T(TAB), D(LALT), T(O), U(LALT), END);
-        }
-      case KC_AUTODC:
-        if (record->event.pressed){
-          return MACRO (I(1), D(LALT), T(V), U(LALT), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(T), T(TAB),T(N), D(LALT), T(S), U(LALT), END);
-        }
-      case KC_DAYRN:
-        if (record->event.pressed){
-          return MACRO (I(1), T(TAB), T(TAB), T(TAB), T(TAB), T(TAB), T(1), D(LALT), T(S), U(LALT), END);
-        }
-      //Ops macros
-      case KC_EMAIL:
-        if (record->event.pressed){
-          return MACRO (I(1), T(1), END);        }        
-      case KC_EMAIL2:
-        if (record->event.pressed){
-          return MACRO (I(1), T(1), END);
-        }  
-    }
-
-    return MACRO_NONE;
-} 

keyboards/planck/keymaps/ishtob/readme.md

@@ -2,7 +2,7 @@
 
 #Ishtob's personal planck layout
 
-THis is the default layout used with my planck light, though the rest of the keymap could also be used for the full sized planck or let's split.
+This is the default layout used with my planck light, though the rest of the keymap could also be used for the full sized planck or let's split.
 
 
 Main difference with the default layout:
@@ -14,8 +14,3 @@ Main difference with the default layout:
 * Capslock is on the base layer as it is used quite often with my work's software
 
 * Numbers layer on lower is positioned to resemble a numpad with 5 taking the location of J for the homing bump and easier entry
-
-
-# Secret Macros
-
-`macros_public.h` contains a list of macros that can be replaced with passwords or other sensative private macros. `macros_private.h` will be used if it exsists in the folder during compiling and will ignore `macros_public.h` The private macros can be excluded from git commits by adding it to the exclusion list.