Change keyboard level include guards to `pragma once` (#14248)

* Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
author: Ryan <fauxpark@gmail.com> 2021-09-01 19:03:14 +1000
committer: GitHub <noreply@github.com> 2021-09-01 19:03:14 +1000
commit: 41c50bb653b840c595fb31541729d892f68666e6 (patch)
tree: ba05c7c9654f7be1104b20f3195dd2cf288e004e /keyboards/eco
parent: 971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff)
download: qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.tar.gz
qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.zip
6 files changed, 30 insertions, 51 deletions
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index db1c61ab4..e5258e3a0 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/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
+#pragma once
-#define CONFIG_H
 #include "config_common.h"
@@ -68,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef SUBPROJECT_rev2
    #include "rev2/config.h"
 #endif
-#endif
diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h
index 211e41fe8..885bf982d 100644
--- a/keyboards/eco/eco.h
+++ b/keyboards/eco/eco.h
@@ -1,13 +1,9 @@
-#ifndef ECO_H
+#pragma once
-#define ECO_H
-#ifdef KEYBOARD_eco_rev1
+#if defined(KEYBOARD_eco_rev1)
-    #include "rev1.h"
+#    include "rev1.h"
-#endif
+#elif defined(KEYBOARD_eco_rev2)
-#ifdef KEYBOARD_eco_rev2
+#    include "rev2.h"
-    #include "rev2.h"
 #endif
 #include "quantum.h"
-#endif
diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h
index 1e97a703d..65cb050d6 100644
--- a/keyboards/eco/rev1/config.h
+++ b/keyboards/eco/rev1/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 REV1_CONFIG_H
+#pragma once
-#define REV1_CONFIG_H
 #include "../config.h"
@@ -26,5 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B1, B6, B2, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
 #define UNUSED_PINS
-#endif
diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h
index 132760fbe..a6ceafb81 100644
--- a/keyboards/eco/rev1/rev1.h
+++ b/keyboards/eco/rev1/rev1.h
@@ -1,21 +1,17 @@
-#ifndef REV1_H
+#pragma once
-#define REV1_H
 #include "../eco.h"
 #include "quantum.h"
 #define LAYOUT( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \
-    ) \
+) { \
-    { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-        { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-        { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-        { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \
-        { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }  \
+}
-    }
-#endif
diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h
index 83f2defc9..bbc0492e0 100644
--- a/keyboards/eco/rev2/config.h
+++ b/keyboards/eco/rev2/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 REV2_CONFIG_H
+#pragma once
-#define REV2_CONFIG_H
 #include "../config.h"
@@ -26,5 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D7, B5, B4, E6 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }
 #define UNUSED_PINS
-#endif
diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h
index 881bcc77b..a6ceafb81 100644
--- a/keyboards/eco/rev2/rev2.h
+++ b/keyboards/eco/rev2/rev2.h
@@ -1,21 +1,17 @@
-#ifndef REV2_H
+#pragma once
-#define REV2_H
 #include "../eco.h"
 #include "quantum.h"
 #define LAYOUT( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \
-    ) \
+) { \
-    { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-        { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-        { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
-        { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \
-        { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }  \
+}
-    }
-#endif
author	Ryan <fauxpark@gmail.com>	2021-09-01 19:03:14 +1000
committer	GitHub <noreply@github.com>	2021-09-01 19:03:14 +1000
commit	41c50bb653b840c595fb31541729d892f68666e6 (patch)
tree	ba05c7c9654f7be1104b20f3195dd2cf288e004e /keyboards/eco
parent	971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff)
download	qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.tar.gz qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.zip

diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index db1c61ab4..e5258e3a0 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15	along with this program. If not, see <http://www.gnu.org/licenses/>.	15	along with this program. If not, see <http://www.gnu.org/licenses/>.
16	*/	16	*/
17		17
18	#ifndef CONFIG_H	18	#pragma once
19	#define CONFIG_H
20		19
21	#include "config_common.h"	20	#include "config_common.h"
22		21
@@ -68,5 +67,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
68	#ifdef SUBPROJECT_rev2	67	#ifdef SUBPROJECT_rev2
69	#include "rev2/config.h"	68	#include "rev2/config.h"
70	#endif	69	#endif
71
72	#endif


diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 211e41fe8..885bf982d 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h
@@ -1,13 +1,9 @@
1	#ifndef ECO_H	1	#pragma once
2	#define ECO_H
3		2
4	#ifdef KEYBOARD_eco_rev1	3	#if defined(KEYBOARD_eco_rev1)
5	#include "rev1.h"	4	# include "rev1.h"
6	#endif	5	#elif defined(KEYBOARD_eco_rev2)
7	#ifdef KEYBOARD_eco_rev2	6	# include "rev2.h"
8	#include "rev2.h"
9	#endif	7	#endif
10		8
11	#include "quantum.h"	9	#include "quantum.h"
12
13	#endif


diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h index 1e97a703d..65cb050d6 100644 --- a/keyboards/eco/rev1/config.h +++ b/keyboards/eco/rev1/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15	along with this program. If not, see <http://www.gnu.org/licenses/>.	15	along with this program. If not, see <http://www.gnu.org/licenses/>.
16	*/	16	*/
17		17
18	#ifndef REV1_CONFIG_H	18	#pragma once
19	#define REV1_CONFIG_H
20		19
21	#include "../config.h"	20	#include "../config.h"
22		21
@@ -26,5 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26	#define MATRIX_ROW_PINS { B1, B6, B2, B3 }	25	#define MATRIX_ROW_PINS { B1, B6, B2, B3 }
27	#define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }	26	#define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
28	#define UNUSED_PINS	27	#define UNUSED_PINS
29
30	#endif


diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h index 132760fbe..a6ceafb81 100644 --- a/keyboards/eco/rev1/rev1.h +++ b/keyboards/eco/rev1/rev1.h
@@ -1,21 +1,17 @@
1	#ifndef REV1_H	1	#pragma once
2	#define REV1_H
3		2
4	#include "../eco.h"	3	#include "../eco.h"
5		4
6	#include "quantum.h"	5	#include "quantum.h"
7		6
8	#define LAYOUT( \	7	#define LAYOUT( \
9	k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \	8	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
10	k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \	9	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
11	k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \	10	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
12	k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \	11	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \
13	) \	12	) { \
14	{ \	13	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
15	{ k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \	14	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
16	{ k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \	15	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
17	{ k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \	16	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \
18	{ k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \	17	}
19	}
20
21	#endif


diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h index 83f2defc9..bbc0492e0 100644 --- a/keyboards/eco/rev2/config.h +++ b/keyboards/eco/rev2/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
15	along with this program. If not, see <http://www.gnu.org/licenses/>.	15	along with this program. If not, see <http://www.gnu.org/licenses/>.
16	*/	16	*/
17		17
18	#ifndef REV2_CONFIG_H	18	#pragma once
19	#define REV2_CONFIG_H
20		19
21	#include "../config.h"	20	#include "../config.h"
22		21
@@ -26,5 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26	#define MATRIX_ROW_PINS { D7, B5, B4, E6 }	25	#define MATRIX_ROW_PINS { D7, B5, B4, E6 }
27	#define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }	26	#define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }
28	#define UNUSED_PINS	27	#define UNUSED_PINS
29
30	#endif


diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h index 881bcc77b..a6ceafb81 100644 --- a/keyboards/eco/rev2/rev2.h +++ b/keyboards/eco/rev2/rev2.h
@@ -1,21 +1,17 @@
1	#ifndef REV2_H	1	#pragma once
2	#define REV2_H
3		2
4	#include "../eco.h"	3	#include "../eco.h"
5		4
6	#include "quantum.h"	5	#include "quantum.h"
7		6
8	#define LAYOUT( \	7	#define LAYOUT( \
9	k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \	8	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
10	k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \	9	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
11	k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \	10	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
12	k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 \	11	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \
13	) \	12	) { \
14	{ \	13	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
15	{ k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \	14	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
16	{ k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \	15	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
17	{ k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \	16	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \
18	{ k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 } \	17	}
19	}
20
21	#endif