refactor

src/keyboard/controller.h

@@ -10,7 +10,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "./matrix.h"
 #include "./controller/mcp23018.h"
 #include "./controller/teensy-2-0.h"
 

src/keyboard/layout.h

@@ -13,7 +13,6 @@
 #include <avr/pgmspace.h>
 #include "../lib/keyboard.h"
 #include "../lib/key-functions/public.h"
-#include "./matrix.h"
 #include "./controller.h"
 
 typedef void (*void_funptr_t)(void);

src/keyboard/matrix.h

@@ -6,18 +6,11 @@
  * Project located at <https://github.com/benblazak/ergodox-firmware>
  * ------------------------------------------------------------------------- */
 
+#pragma once
 
-#ifndef KEYBOARD__ERGODOX__MATRIX_h
-	#define KEYBOARD__ERGODOX__MATRIX_h
+// --------------------------------------------------------------------
 
-	// --------------------------------------------------------------------
-
-	#define KB_ROWS      6  // must match real life
-	#define KB_COLUMNS  14  // must match real life
-
-	// --------------------------------------------------------------------
-
-	/* mapping from spatial position to matrix position
+/* mapping from spatial position to matrix position
  * - spatial position: where the key is spatially, relative to other
  *   keys both on the keyboard and in the layout
  * - matrix position: the coordinate in the matrix to which a key is
@@ -45,7 +38,7 @@
  * right hand : rows 0..5, cols 7..D
  * --------------------------------------------------------------------
  */
-	#define KB_MATRIX_LAYER(					\
+#define KB_MATRIX_LAYER(					\
 		/* for unused positions */			\
 		na,						\
 								\
@@ -69,8 +62,8 @@
 		k09,k17,k18,					\
 		k0C,k0B,k0A )					\
 								\
-	/* matrix positions */						\
-	{{  na,k01,k02,k03,k04,k05,k06, k07,k08,k09,k0A,k0B,k0C, na },	\
+/* matrix positions */						\
+{{  na,k01,k02,k03,k04,k05,k06, k07,k08,k09,k0A,k0B,k0C, na },	\
  { k10,k11,k12,k13,k14,k15,k16, k17,k18,k19,k1A,k1B,k1C,k1D },	\
  { k20,k21,k22,k23,k24,k25,k26, k27,k28,k29,k2A,k2B,k2C,k2D },	\
  { k30,k31,k32,k33,k34,k35, na,  na,k38,k39,k3A,k3B,k3C,k3D },	\
@@ -78,7 +71,7 @@
  { k50,k51,k52,k53,k54,k55,k56, k57,k58,k59,k5A,k5B,k5C,k5D }}
 
 
-	#define KB_MATRIX_LAYER_SET_ALL(na, kxx)		\
+#define KB_MATRIX_LAYER_SET_ALL(na, kxx)		\
 	LAYER(						\
 		na,					\
 							\
@@ -99,6 +92,3 @@
 		kxx,kxx,				\
 		kxx,kxx,kxx,				\
 		kxx,kxx,kxx )				\
-
-#endif
-

src/keyboard/options.h

@@ -6,13 +6,11 @@
  * Project located at <https://github.com/benblazak/ergodox-firmware>
  * ------------------------------------------------------------------------- */
 
+#pragma once
 
-#ifndef KEYBOARD__ERGODOX__OPTIONS_h
-	#define KEYBOARD__ERGODOX__OPTIONS_h
+// --------------------------------------------------------------------
 
-	// --------------------------------------------------------------------
-
-	/*
+/*
  * DRIVE_ROWS and DRIVE_COLUMNS
  * - Select which pins will drive (alternate between hi-Z and drive
  *   low) and which will be inputs
@@ -32,9 +30,10 @@
  *   #define  TEENSY__DRIVE_ROWS       1
  *   #define  MCP23018__DRIVE_ROWS     1
  */
-	#define  TEENSY__DRIVE_ROWS       0
-	#define  TEENSY__DRIVE_COLUMNS    1
-	#define  MCP23018__DRIVE_ROWS     0
-	#define  MCP23018__DRIVE_COLUMNS  1
+#define  TEENSY__DRIVE_ROWS       0
+#define  TEENSY__DRIVE_COLUMNS    1
+#define  MCP23018__DRIVE_ROWS     0
+#define  MCP23018__DRIVE_COLUMNS  1
 
-#endif
+#define KB_ROWS      6  // must match real life
+#define KB_COLUMNS  14  // must match real life

src/lib/key-functions/public.h

@@ -14,7 +14,6 @@
 #include <stdint.h>
 #include "../../main.h"
 #include "../../keyboard/layout.h"
-#include "../../keyboard/matrix.h"
 #include "../../lib-other/pjrc/usb_keyboard/usb_keyboard.h"
 #include "../../lib/keyboard.h"
 

src/main.h

@@ -15,7 +15,6 @@
 #include "./lib/key-functions/public.h"
 #include "./keyboard/controller.h"
 #include "./keyboard/layout.h"
-#include "./keyboard/matrix.h"
 
 // --------------------------------------------------------------------