Merge branch 'master' into taamas

5 files changed, 71 insertions, 103 deletions

diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h
index 34624d2b6a..58bc794ee8 100644
--- a/keyboards/meme/config.h
+++ b/keyboards/meme/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -106,7 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif
diff --git a/keyboards/meme/keymaps/default/config.h b/keyboards/meme/keymaps/default/config.h
deleted file mode 100644
index a3ed4f762a..0000000000
--- a/keyboards/meme/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
diff --git a/keyboards/meme/keymaps/default/keymap.c b/keyboards/meme/keymaps/default/keymap.c
index f7df8aa4fc..4ae5749205 100644
--- a/keyboards/meme/keymaps/default/keymap.c
+++ b/keyboards/meme/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_spicy(\
+[0] = LAYOUT_spicy(
     KC_GESC, 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_BSLS, KC_BSPC, KC_INS,
     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_RCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
diff --git a/keyboards/meme/meme.h b/keyboards/meme/meme.h
index 4c4b29a046..36c533ea9d 100644
--- a/keyboards/meme/meme.h
+++ b/keyboards/meme/meme.h
@@ -13,90 +13,85 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef MEME_H
-#define MEME_H
+
+#pragma once
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 #define LAYOUT_spicy( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \
-    K80, K90, K81,           K92,                     K85, K95, K86, K96, K87, K97 \
-)\
-{\
-  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \
-  {K10, K11,   K12,   K13,   K14,   K15,   K16,   K17}, \
-  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \
-  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \
-  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \
-  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \
-  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \
-  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \
-  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \
-  {K90, KC_NO, K92,   KC_NO, KC_NO, K95,   K96,   K97}, \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \
+    k80, k90, k81,           k92,                     k85, k95, k86, k96, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
+    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
+    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
+    { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \
 }
 
 #define LAYOUT_normie( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06,      K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \
-    K80, K90, K81,           K92,                     K85, K95, K86, K96, K87, K97 \
-)\
-{\
-  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \
-  {K10, K11,   K12,   K13,   K14,   K15,   KC_NO, K17}, \
-  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \
-  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \
-  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \
-  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \
-  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \
-  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \
-  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \
-  {K90, KC_NO, K92,   KC_NO, KC_NO, K95,   K96,   K97}, \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,      k07, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \
+    k80, k90, k81,           k92,                     k85, k95, k86, k96, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, XXX, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
+    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
+    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
+    { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \
 }
 
 #define LAYOUT_dank( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06,      K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \
-    K80, K90, K81,           K92,                     K85,      K86, K96, K87, K97 \
-)\
-{\
-  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \
-  {K10, K11,   K12,   K13,   K14,   K15,   KC_NO, K17}, \
-  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \
-  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \
-  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \
-  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \
-  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \
-  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \
-  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \
-  {K90, KC_NO, K92,   KC_NO, KC_NO, KC_NO, K96,   K97}, \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,      k07, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \
+    k80, k90, k81,           k92,                     k85,      k86, k96, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, XXX, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
+    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
+    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
+    { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \
 }
 
 #define LAYOUT_meme( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \
-    K80, K90, K81,           K92,                     K85,      K86, K96, K87, K97 \
-)\
-{\
-  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \
-  {K10, K11,   K12,   K13,   K14,   K15,   K16,   K17}, \
-  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \
-  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \
-  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \
-  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \
-  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \
-  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \
-  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \
-  {K90, KC_NO, K92,   KC_NO, KC_NO, KC_NO, K96,   K97}, \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \
+    k80, k90, k81,           k92,                     k85,      k86, k96, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \
+    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \
+    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \
+    { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \
 }
-
-
-#endif
diff --git a/keyboards/meme/rules.mk b/keyboards/meme/rules.mk
index 9008320b15..a95b6c06d8 100644
--- a/keyboards/meme/rules.mk
+++ b/keyboards/meme/rules.mk
@@ -12,9 +12,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output