Merge branch 'master' into taamas

5 files changed, 9 insertions, 46 deletions

diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h
index b438ceea9e..a4d19a5ca1 100644
--- a/keyboards/sixkeyboard/config.h
+++ b/keyboards/sixkeyboard/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"
 
@@ -63,7 +62,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/sixkeyboard/keymaps/default/keymap.c b/keyboards/sixkeyboard/keymaps/default/keymap.c
index 0c9b519353..7fdf3d64c1 100644
--- a/keyboards/sixkeyboard/keymaps/default/keymap.c
+++ b/keyboards/sixkeyboard/keymaps/default/keymap.c
@@ -4,8 +4,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_2x3(
-    KC_A, KC_B, KC_C, \
-    KC_D, KC_E, KC_F  \
+    KC_A, KC_B, KC_C,
+    KC_D, KC_E, KC_F
   )
 };
 
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 64b46e9b0c..36ae05fb42 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -114,11 +114,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
@@ -134,13 +129,3 @@ matrix_row_t matrix_get_row(uint8_t row)
 void matrix_print(void)
 {
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk
index 1ce62d90d0..3e1b51fa86 100644
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -5,15 +5,14 @@ MCU = atmega16u2
 BOOTLOADER = atmel-dfu
 
 # Build Options
-#   comment out to disable the options.
+#   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no		# Mouse keys
 EXTRAKEY_ENABLE = no		# Audio control and System control
 CONSOLE_ENABLE = no		# Console for debug
 COMMAND_ENABLE = no		# Commands for debug and configuration
-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
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 CUSTOM_MATRIX = yes
diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h
index 353e2a78c8..3f563af6d1 100644
--- a/keyboards/sixkeyboard/sixkeyboard.h
+++ b/keyboards/sixkeyboard/sixkeyboard.h
@@ -1,20 +1,7 @@
-#ifndef SIXKEYBOARD_H
-#define SIXKEYBOARD_H
+#pragma once
 
 #include "quantum.h"
 
-// This macro is an example of using a non-standard row-column matrix. The
-// keyboard in question had 11 rows and 8 columns, but the rows were not all
-// horizontal, and the columns were not all vertical. For example, row 2
-// contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and
-// "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B",
-// "Left Alt", "Up Arrow", and "Down Arrow".
-//
-// The macro makes programming the keys easier and in a more straight-forward
-// manner because it realigns the keys into a 6x15 sensible keyboard layout
-// instead of the obtuse 11x8 matrix.
-
-
 /*
  * ┌───┬───┬───┐
  * │ A │ B │ C │
@@ -24,11 +11,8 @@
  */
 #define LAYOUT_ortho_2x3( \
     k00, k01, k02, \
-    k10, k11, k12  \
-  ) { \
+    k10, k11, k12 \
+) { \
     { k00, k01, k02 }, \
-    { k10, k11, k12 }  \
+    { k10, k11, k12 } \
 }
-
-
-#endif