Tidy 40percentclub boards (#4403)

* Remove unnecessary re-definitions for XXXXXXX and _______

* Update 6lit to use KC_NO in layout macros

* Update rules.mk to follow current template

* Remove use of deprecated function action_get_macro - unused and contents were from old template

* Remove use of deprecated function action_get_macro - all code was commented out

* Remove use of deprecated function action_get_macro - convert macro to use process_record_user

* Convert keymap to consistent use of _______

* fix use of old style header guards

* Swap KC_NO for XXXXXXX macro since the swap to the macro for KC_TRANS

* Resolve use of ?= in rules.mk files

* Remove duplication of rules.mk and config.h in gherkin mjt keymap

* Remove unnecessary #includes

* Align layout macros so foobar can use gherkin keymaps

* Align 6lit layout macros with foobar

* Remove ifndef QUANTUM_DIR from keymaps

keyboards/40percentclub/4x4/4x4.h

@@ -1,6 +1,4 @@
-
-#ifndef FOURX4_H
-#define FOURX4_H
+#pragma once
 
 #include "quantum.h"
 #define ___ KC_NO
@@ -58,5 +56,3 @@
     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
 }
-
-#endif

keyboards/40percentclub/4x4/keymaps/default/keymap.c

@@ -6,9 +6,6 @@
 #define NUM 2
 #define DIR 3
 
-// Readability keycodes
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Single 4x4 board only
@@ -65,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [NUM] = LAYOUT_ortho_4x16(
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS, _______,
-  _______, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______, _______
   ),
 
@@ -90,23 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  keyevent_t event = record->event;
-    (void)event;
-
-  switch (id) {
-
-  }
-  return MACRO_NONE;
-}
-
-
 void matrix_init_user(void) {
 
 }

keyboards/40percentclub/4x4/rules.mk

@@ -36,24 +36,30 @@ F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-# OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
 BOOTLOADER = caterina
 
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
@@ -68,7 +74,7 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
+HD44780_ENABLE = no 				# Enable support for HD44780 based LCDs (+400)
 
 #FIXME: Community keymap build are currently failing due to missing functionality
 #LAYOUTS = ortho_4x4  ortho_4x8  ortho_4x12  ortho_4x16

keyboards/40percentclub/5x5/5x5.h

@@ -1,6 +1,4 @@
-
-#ifndef FIVEX5_H
-#define FIVEX5_H
+#pragma once
 
 #include "quantum.h"
 #define ___ KC_NO
@@ -53,5 +51,3 @@
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e}, \
     { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, K4d, K4e} \
 }
-
-#endif

keyboards/40percentclub/5x5/keymaps/default/keymap.c

@@ -6,9 +6,6 @@
 #define NUM 2
 #define DIR 3
 
-// Readability keycodes
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Single 5x5 board only
@@ -74,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS,
-  _______, KC_F11,  KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT,
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT,
   _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______
   ),
 
@@ -102,25 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
 
 void matrix_init_user(void) {
 

keyboards/40percentclub/5x5/rules.mk

@@ -36,24 +36,31 @@ F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-# OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
 BOOTLOADER = caterina
 
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
@@ -68,7 +75,7 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
+HD44780_ENABLE = no 				# Enable support for HD44780 based LCDs (+400)
 
 #FIXME: Community keymap build are currently failing due to missing functionality
 #LAYOUTS = ortho_5x5  ortho_5x10  ortho_5x15

keyboards/40percentclub/6lit/6lit.h

@@ -16,10 +16,10 @@
 #pragma once
 
 #include "quantum.h"
-#define ________ KC_NO
+#define ___ KC_NO
 
 #ifndef FLIP_HALF
-#define LAYOUT_split( \
+#define LAYOUT_ortho_2x6( \
 	L00, L01, L02, R00, R01, R02, \
 	L10, L11, L12, R10, R11, R12  \
 ) { \
@@ -29,7 +29,7 @@
 	{ R12, R11, R10 }, \
 }
 #else
-#define LAYOUT_split( \
+#define LAYOUT_ortho_2x6( \
 	L00, L01, L02, R00, R01, R02, \
 	L10, L11, L12, R10, R11, R12  \
 ) { \
@@ -40,15 +40,18 @@
 }
 #endif
 
-#define LAYOUT_macro( \
+#define LAYOUT_ortho_2x3( \
 	L00, L01, L02, \
 	L10, L11, L12  \
 ) { \
 	{ L00, L01, L02 }, \
 	{ L10, L11, L12 }, \
+	{ ___, ___, ___ }, \
+  { ___, ___, ___ }, \
 }
 
-#define LAYOUT LAYOUT_macro
+#define LAYOUT_macro LAYOUT_ortho_2x3
+#define LAYOUT_split LAYOUT_ortho_2x6
 
 #ifdef USE_I2C
   #error "I2C not Supported"

keyboards/40percentclub/foobar/foobar.h

@@ -19,7 +19,7 @@
 #define ___ KC_NO
 
 #ifndef FLIP_HALF
-#define LAYOUT_split( \
+#define LAYOUT_ortho_3x10( \
 	L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
 	L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
 	L20, L21, L22, L23, L24, R20, R21, R22, R23, R24  \
@@ -32,7 +32,7 @@
 	{ R24, R23, R22, R21, R20 }  \
 }
 #else
-#define LAYOUT_split( \
+#define LAYOUT_ortho_3x10( \
 	L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
 	L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
 	L20, L21, L22, L23, L24, R20, R21, R22, R23, R24  \
@@ -46,7 +46,7 @@
 }
 #endif
 
-#define LAYOUT_macro( \
+#define LAYOUT_ortho_3x5( \
 	L00, L01, L02, L03, L04, \
   L10, L11, L12, L13, L14, \
   L20, L21, L22, L23, L24  \
@@ -59,7 +59,8 @@
   { ___, ___, ___, ___, ___ }  \
 }
 
-#define LAYOUT LAYOUT_macro
+#define LAYOUT_macro LAYOUT_ortho_3x5
+#define LAYOUT_split LAYOUT_ortho_3x10
 
 #ifdef USE_I2C
   #error "I2C not Supported"

keyboards/40percentclub/foobar/keymaps/default/keymap.c

@@ -15,7 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-#define _______ KC_TRNS
 #define FN1_Q LT(1, KC_Q)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

keyboards/40percentclub/foobar/rules.mk

@@ -81,3 +81,5 @@ HD44780_ENABLE = no 		    # Enable support for HD44780 based LCDs (+400)
 
 # Enable generic behavior for split boards
 SPLIT_KEYBOARD = yes
+
+LAYOUTS = ortho_3x10

keyboards/40percentclub/gherkin/config.h

@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -50,5 +49,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
-#endif

keyboards/40percentclub/gherkin/gherkin.h

@@ -1,5 +1,4 @@
-#ifndef GHERKIN_H
-#define GHERKIN_H
+#pragma once
 
 #include "quantum.h"
 
@@ -14,5 +13,3 @@
 	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
 	{ K40,   K41,   K42,   K43,   K44,   K45 }  \
 }
-
-#endif

keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h

@@ -1,7 +1,5 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
+#pragma once
 
-#include "../../config.h"
 #define RGB_DI_PIN F6
 #define RGBLED_NUM 10
 #define RGBLIGHT_ANIMATIONS
@@ -9,5 +7,3 @@
 #undef BACKLIGHT_LEVELS
 #endif
 #define BACKLIGHT_LEVELS 3
-
-#endif

keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk

@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
-
 USER_NAME := bbaserdem-nouserspace
 
 STENO_ENABLE = no      # Additional protocols for Stenography(+1700), requires VIRTSER

keyboards/40percentclub/gherkin/keymaps/default/keymap.c

@@ -1,6 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#define _______ KC_TRNS
 #define FN1_Q LT(1, KC_Q)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -19,16 +18,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  keyevent_t event = record->event;
-    (void)event;
-
-  switch (id) {
-
-  }
-  return MACRO_NONE;
-}
-
 void matrix_init_user(void) {
 }
 

keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h

@@ -1,7 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once
 
 #undef RGB_DI_PIN
 #undef RGBLED_NUM
@@ -11,5 +8,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-#endif

keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c

@@ -12,10 +12,9 @@ enum custom_keycodes {
   PS = SAFE_RANGE,
   AI,
   PR,
+  MACRO_0,
 };
 
-#define _______ KC_TRNS
-
 #define PS TO(0)
 #define AI TO(1)
 #define PR TO(2)
@@ -72,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // Illustrator layer
   [_AI] = LAYOUT_ortho_3x10(
-    _______, M(0),    RULER,   _______, KC_G,    _______, _______, KC_Q,  KC_MINS, KC_PLUS,
+    _______, MACRO_0, RULER,   _______, KC_G,    _______, _______, KC_Q,  KC_MINS, KC_PLUS,
     _______, _______, _______, KC_E,    _______, _______, _______, SHAPE, KC_O,    OPEN,
     _______, _______, _______, _______, _______, _______, _______, KC_M,  KC_SLSH, PR
   ),
@@ -133,20 +132,14 @@ void matrix_scan_user(void) {
   #endif
 }
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  keyevent_t event = record->event;
-    (void)event;
-
-  switch (id) {
-    case 0:
-      // Save for Web Macro.
-      return MACRO(D(LSFT), D(LALT), D(LCTL), T(S), U(LCTL), U(LALT), U(LSFT), END);
-  }
-  return MACRO_NONE;
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  }
-  return true;
-}
+	if (record->event.pressed) {
+		switch(keycode) {
+			case MACRO_0:
+        // Save for Web Macro.
+				SEND_STRING(SS_LSFT(SS_LALT(SS_LCTRL("s"))));
+				return false;
+		}
+	}
+	return true;
+};

keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk

@@ -1,7 +1,3 @@
 BACKLIGHT_ENABLE = yes
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif

keyboards/40percentclub/gherkin/keymaps/mjt/config.h

@@ -1,169 +1,7 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
+#pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x6060
-#define DEVICE_VER   0x0001
+#undef MANUFACTURER
+#undef DESCRIPTION
 #define MANUFACTURER    Some Guy
-#define PRODUCT         Gherkin
 #define DESCRIPTION     30 percent disaster
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// These are with USB on the left.
-// #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
-// original from TMK:  #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4 }
-// #define MATRIX_COL_PINS { D0, D4, F6, D7, E6, B4 }
-
-// these are with USB on the right.
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, E6, D7, F6, D4, D0 }
-
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_PIN B5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define AUDIO_VOICES
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
-  keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1     H
-//#define MAGIC_KEY_HELP2     SLASH
-//#define MAGIC_KEY_DEBUG     D
-//#define MAGIC_KEY_DEBUG_MATRIX  X
-//#define MAGIC_KEY_DEBUG_KBD   K
-//#define MAGIC_KEY_DEBUG_MOUSE  M
-//#define MAGIC_KEY_VERSION    V
-//#define MAGIC_KEY_STATUS     S
-//#define MAGIC_KEY_CONSOLE    C
-//#define MAGIC_KEY_LAYER0_ALT1  ESC
-//#define MAGIC_KEY_LAYER0_ALT2  GRAVE
-//#define MAGIC_KEY_LAYER0     0
-//#define MAGIC_KEY_LAYER1     1
-//#define MAGIC_KEY_LAYER2     2
-//#define MAGIC_KEY_LAYER3     3
-//#define MAGIC_KEY_LAYER4     4
-//#define MAGIC_KEY_LAYER5     5
-//#define MAGIC_KEY_LAYER6     6
-//#define MAGIC_KEY_LAYER7     7
-//#define MAGIC_KEY_LAYER8     8
-//#define MAGIC_KEY_LAYER9     9
-//#define MAGIC_KEY_BOOTLOADER   PAUSE
-//#define MAGIC_KEY_LOCK      CAPS
-//#define MAGIC_KEY_EEPROM     E
-//#define MAGIC_KEY_NKRO      N
-//#define MAGIC_KEY_SLEEP_LED   Z
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif

keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c

@@ -12,7 +12,6 @@ enum {
   TD_C_LALT = 2,
   TD_A_TAB = 3,
   TD_Q_ESC = 4,
-//   M(0)
 };
 
 //Friendly Layer Names
@@ -37,10 +36,6 @@ enum gherkin_keycodes {
   EXT_PLV
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_ortho_3x10(
     TD(TD_Q_ESC),   KC_W,               KC_E,           KC_R,  KC_T,               KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,
@@ -171,30 +166,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-
-/*
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  keyevent_t event = record->event;
-
-  switch (id) {
-        case 0: {
-            if (record->event.pressed) {
-                key_timer = timer_read(); // if the key is being pressed, we start the timer.
-            }
-            else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down").
-                if (timer_elapsed(key_timer) > 150) { // 150 being 150ms, the threshhold we pick for counting something as a tap.
-                    return MACRO( D(LSFT), END  );
-                }
-                else {
-                    return MACRO( T(N), END  );
-                }
-            }
-            break;
-        }
-      }
-  return MACRO_NONE;
-}*/
-
 void matrix_init_user(void) {
     #ifdef AUDIO_ENABLE
         startup_user();

keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk

@@ -1,29 +1,2 @@
-## not sure where this stuff goes ##
-MCU = atmega32u4
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = yes           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE=yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+AUDIO_ENABLE = yes          # Audio output on port C6
+TAP_DANCE_ENABLE = yes

keyboards/40percentclub/gherkin/keymaps/steno/config.h

@@ -1,12 +1,7 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once
 
 #define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-
-#endif

keyboards/40percentclub/gherkin/keymaps/steno/rules.mk

@@ -1,8 +1,4 @@
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
-
-STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
+STENO_ENABLE = yes     # Additional protocols for Stenography(+1700), requires VIRTSER
 
 BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no   # Mouse keys(+4700)
@@ -13,4 +9,4 @@ SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no       # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no

keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h

@@ -1,6 +1,3 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
-#include "../../config.h"
-
-#endif
+// place overrides here

keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c

@@ -4,8 +4,6 @@
 #define ST_BOLT QK_STENO_BOLT
 #define ST_GEM  QK_STENO_GEMINI
 
-#define XXXXXXX KC_NO
-
 enum keyboard_layers {
   _QWERTY,
   _RAISE,

keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk

@@ -1,6 +1,2 @@
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
-
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER

keyboards/40percentclub/gherkin/rules.mk

@@ -33,25 +33,40 @@ ARCH = AVR8
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
-BOOTLOADER = caterina
-
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
 # Build Options
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MOUSEKEY_ENABLE = yes	  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	  # Audio control and System control(+450)
+CONSOLE_ENABLE = no	    # Console for debug(+400)
+COMMAND_ENABLE = no     # Commands for debug and configuration
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		    # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no

keyboards/40percentclub/luddite/rules.mk

@@ -33,25 +33,40 @@ ARCH = AVR8
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
-BOOTLOADER = caterina
-
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
 # Build Options
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MOUSEKEY_ENABLE = yes	  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	  # Audio control and System control(+450)
+CONSOLE_ENABLE = no			# Console for debug(+400)
+COMMAND_ENABLE = no     # Commands for debug and configuration
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes				# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes

keyboards/40percentclub/mf68/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"
 
@@ -158,5 +157,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif

keyboards/40percentclub/mf68/keymaps/default/keymap.c

@@ -51,18 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
   )
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};

keyboards/40percentclub/mf68/keymaps/factory/keymap.c

@@ -57,18 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
   )
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};

keyboards/40percentclub/mf68/mf68.h

@@ -1,5 +1,4 @@
-#ifndef MF68_H
-#define MF68_H
+#pragma once
 
 #include "quantum.h"
 
@@ -36,5 +35,3 @@
     KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, \
     KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74 \
 )
-
-#endif

keyboards/40percentclub/mf68/rules.mk

@@ -1,4 +1,3 @@
-
 # MCU name
 MCU = atmega32u4
 
@@ -15,7 +14,6 @@ MCU = atmega32u4
 #     software delays.
 F_CPU = 16000000
 
-
 #
 # LUFA specific
 #
@@ -39,30 +37,42 @@ F_USB = $(F_CPU)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes        # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+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
+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
-BACKLIGHT_ENABLE ?= yes      # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI controls
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no            # MIDI controls
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
 
-LAYOUTS = 68_ansi
+LAYOUTS = 68_ansi

keyboards/40percentclub/mf68_ble/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"
 
@@ -158,5 +157,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif

keyboards/40percentclub/mf68_ble/keymaps/default/keymap.c

@@ -51,18 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /*`ctrl-+-gui-+-alt-+----------space---------------+-fn---+-alt-+ctrl-'   `left+down+rght' */
   )
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};

keyboards/40percentclub/mf68_ble/mf68_ble.h

@@ -1,5 +1,4 @@
-#ifndef MF68_BLE_H
-#define MF68_BLE_H
+#pragma once
 
 #include "quantum.h"
 
@@ -36,5 +35,3 @@
     KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, \
     KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74 \
 )
-
-#endif

keyboards/40percentclub/mf68_ble/rules.mk

@@ -1,4 +1,3 @@
-
 # MCU name
 MCU = atmega32u4
 
@@ -39,29 +38,42 @@ F_USB = $(F_CPU)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes        # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+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
+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
-BACKLIGHT_ENABLE ?= no      # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI controls
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
-BLUETOOTH = AdafruitBLE
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no            # MIDI controls
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+
+BLUETOOTH = AdafruitBLE

keyboards/40percentclub/nano/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"
 
@@ -41,5 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define TAPPING_TERM 200
-
-#endif

keyboards/40percentclub/nano/keymaps/default/keymap.c

@@ -3,7 +3,6 @@
 #define _MAIN 0
 #define _FN 1
 
-#define _______ KC_TRNS
 #define KC_X0 LT(_FN, KC_ESC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

keyboards/40percentclub/nano/keymaps/spooka/keymap.c

@@ -2,8 +2,6 @@
 
 #define _MAIN 0
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MAIN] = LAYOUT(
      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,

keyboards/40percentclub/nano/nano.h

@@ -1,5 +1,4 @@
-#ifndef NANO_H
-#define NANO_H
+#pragma once
 
 #include "quantum.h"
 
@@ -10,5 +9,3 @@
     { k01, k02, k03, k04 }, \
     { k05, k06, k07, k08 } \
 }
-
-#endif

keyboards/40percentclub/nano/rules.mk

@@ -1,7 +1,4 @@
-SRC = matrix.c
-
 # MCU name
-#MCU = at90usb1287
 MCU = atmega32u4
 
 # Processor frequency.
@@ -40,16 +37,28 @@ F_USB = $(F_CPU)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
@@ -67,4 +76,7 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+# custom matrix setup
+SRC = matrix.c
 CUSTOM_MATRIX = yes

keyboards/40percentclub/tomato/config.h

@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -44,5 +43,3 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-
-#endif

keyboards/40percentclub/tomato/keymaps/default/keymap.c

@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT_ortho_3x10
     ( KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0
     , KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10
-    , KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DEL, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+    , _______,_______,_______,_______,KC_DEL, _______,_______,_______,_______,_______
     ),
   /* Level 2: Symbols Layer
    * ,-------------------------------------------------------------------------------.
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
   LAYOUT_ortho_3x10
     ( KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN
-    , KC_F11,  KC_F12,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_GRAVE
-    , KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+    , KC_F11,  KC_F12,_______,_______,_______,_______,_______,_______,_______,KC_GRAVE
+    , _______,_______,_______,_______,_______,_______,_______,_______,_______,_______
     ),
   /* Level 3: RGB Layer
    * ,-------------------------------------------------------------------------------.
@@ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '-------------------------------------------------------------------------------'
    */
   LAYOUT_ortho_3x10
-    ( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,KC_BSLS
-    , KC_TAB, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_COMM,KC_DOT, KC_SLSH,KC_SCLN,KC_QUOT
-    , KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT
+    ( _______,_______,_______,_______,_______,KC_MINS,KC_EQL, KC_LBRC,KC_RBRC,KC_BSLS
+    , KC_TAB, _______,_______,_______,_______,KC_COMM,KC_DOT, KC_SLSH,KC_SCLN,KC_QUOT
+    , _______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT
     ),
   /* Level 4: RGB Layer
    * ,-------------------------------------------------------------------------------.
@@ -78,9 +78,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '-------------------------------------------------------------------------------'
    */
   LAYOUT_ortho_3x10
-    ( KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE
-    , KC_TAB, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LT,  KC_GT,  KC_QUES,KC_COLN,KC_DQUO
-    , KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDN,KC_END
+    ( _______,_______,_______,_______,_______,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE
+    , KC_TAB, _______,_______,_______,_______,KC_LT,  KC_GT,  KC_QUES,KC_COLN,KC_DQUO
+    , _______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_PGDN,KC_END
     ),
   /* Level 5: RGB Layer
    * ,-------------------------------------------------------------------------------.
@@ -92,27 +92,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * '-------------------------------------------------------------------------------'
    */
   LAYOUT_ortho_3x10
-    ( KC_CALC,KC_WSCH,KC_MAIL,KC_MYCM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
-    , RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,KC_NO,  KC_NO,  RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD
-    , KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
+    ( KC_CALC,KC_WSCH,KC_MAIL,KC_MYCM,_______,_______,_______,_______,_______,_______
+    , RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,XXXXXXX,XXXXXXX,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD
+    , _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______
     ),
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-          } else {
-            unregister_code(KC_RSFT);
-          }
-        break;
-      }
-    return MACRO_NONE;
-};
-
 void matrix_init_user(void) {
 }
 

keyboards/40percentclub/tomato/rules.mk

@@ -37,21 +37,37 @@ F_USB = $(F_CPU)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 
-# Boot Section Size in *bytes*
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
 BOOTLOADER = caterina
 
 
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
 # Build Options
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+MOUSEKEY_ENABLE = yes	  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	  # Audio control and System control(+450)
+CONSOLE_ENABLE = no			# Console for debug(+400)
+COMMAND_ENABLE = no    	# Commands for debug and configuration
+SLEEP_LED_ENABLE = no  	# Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes				# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes
 

keyboards/40percentclub/tomato/tomato.h

@@ -1,5 +1,4 @@
-#ifndef GHERKIN_H
-#define GHERKIN_H
+#pragma once
 
 #include "quantum.h"
 
@@ -14,5 +13,3 @@
 	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
 	{ K40,   K41,   K42,   K43,   K44,   K45 }  \
 }
-
-#endif

keyboards/40percentclub/ut47/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"
 
@@ -83,5 +82,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   else
 #       error "USART configuration is needed."
 #endif
-
-#endif

keyboards/40percentclub/ut47/keymaps/default/config.h

@@ -14,11 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
 #include "config_common.h"
 
 // place overrides here
-
-#endif

keyboards/40percentclub/ut47/keymaps/default/keymap.c

@@ -18,7 +18,6 @@
   #include "protocol/serial.h"
 #endif
 
-#define _______ KC_TRNS
 #define LT3_TAB LT(3, KC_TAB)
 #define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
 

keyboards/40percentclub/ut47/keymaps/non-us/config.h

@@ -14,11 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
 #include "config_common.h"
 
 // place overrides here
-
-#endif

keyboards/40percentclub/ut47/keymaps/non-us/keymap.c

@@ -18,7 +18,6 @@
   #include "protocol/serial.h"
 #endif
 
-#define _______ KC_TRNS
 #define LT3_TAB LT(3, KC_TAB)
 #define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
 

keyboards/40percentclub/ut47/keymaps/nordic/keymap.c

@@ -21,7 +21,6 @@
 
 #include "keymap_norwegian.h"
 
-#define _______ KC_TRNS
 #define LT3_TAB LT(3, KC_TAB)
 #define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
 #define CTRADEL LALT(LCTL(KC_DEL))

keyboards/40percentclub/ut47/keymaps/rgb/config.h

@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
 #include "config_common.h"
 
@@ -23,5 +22,3 @@
 #define RGBLIGHT_ANIMATIONS
 #define RGB_DI_PIN D3    // The pin the LED strip is connected to
 #define RGBLED_NUM 7     // Number of LEDs in your strip
-
-#endif

keyboards/40percentclub/ut47/keymaps/rgb/keymap.c

@@ -18,7 +18,6 @@
   #include "protocol/serial.h"
 #endif
 
-#define _______ KC_TRNS
 #define LT3_TAB LT(3, KC_TAB)
 #define MT_RSFT_ENT MT(MOD_RSFT, KC_ENT)
 

keyboards/40percentclub/ut47/rules.mk

@@ -1,5 +1,4 @@
 # MCU name
-#MCU = at90usb1286
 MCU = atmega32u4
 
 # Processor frequency.
@@ -38,12 +37,26 @@ F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
-# Bootloader
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
 BOOTLOADER = caterina
 
-# custom matrix setup
-CUSTOM_MATRIX = yes
-SRC += matrix.c protocol/serial_uart.c
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
 
 # Build Options
 #   change yes to no to disable
@@ -51,12 +64,12 @@ SRC += matrix.c protocol/serial_uart.c
 BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no        # Console for debug(+400)
+CONSOLE_ENABLE = no         # Console for debug(+400)
 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 = yes            # USB Nkey Rollover
+NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
 UNICODE_ENABLE = no         # Unicode
@@ -64,6 +77,10 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 
+# custom matrix setup
+CUSTOM_MATRIX = yes
+SRC += matrix.c protocol/serial_uart.c
+
 ifeq ($(strip $(LED_ENABLE)), yes)
   OPT_DEFS += -DLED_ENABLE
   SRC += led.c

keyboards/40percentclub/ut47/ut47.h

@@ -13,8 +13,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 UT47_H
-#define UT47_H
+#pragma once
 
 #include "quantum.h"
 
@@ -45,5 +44,3 @@
   )
 
 #define LAYOUT_kc_ut47 LAYOUT_kc
-
-#endif