diff options
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/sixkeyboard | |
parent | 971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (diff) | |
download | qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.tar.gz qmk_firmware-41c50bb653b840c595fb31541729d892f68666e6.zip |
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
Diffstat (limited to 'keyboards/sixkeyboard')
-rw-r--r-- | keyboards/sixkeyboard/config.h | 5 | ||||
-rw-r--r-- | keyboards/sixkeyboard/sixkeyboard.h | 24 |
2 files changed, 5 insertions, 24 deletions
diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h index b8fcb8d7d..8f215aece 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 | |||
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 | ||
@@ -104,5 +103,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
104 | #define NO_ACTION_ONESHOT | 103 | #define NO_ACTION_ONESHOT |
105 | //#define NO_ACTION_MACRO | 104 | //#define NO_ACTION_MACRO |
106 | //#define NO_ACTION_FUNCTION | 105 | //#define NO_ACTION_FUNCTION |
107 | |||
108 | #endif | ||
diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h index 353e2a78c..3f563af6d 100644 --- a/keyboards/sixkeyboard/sixkeyboard.h +++ b/keyboards/sixkeyboard/sixkeyboard.h | |||
@@ -1,20 +1,7 @@ | |||
1 | #ifndef SIXKEYBOARD_H | 1 | #pragma once |
2 | #define SIXKEYBOARD_H | ||
3 | 2 | ||
4 | #include "quantum.h" | 3 | #include "quantum.h" |
5 | 4 | ||
6 | // This macro is an example of using a non-standard row-column matrix. The | ||
7 | // keyboard in question had 11 rows and 8 columns, but the rows were not all | ||
8 | // horizontal, and the columns were not all vertical. For example, row 2 | ||
9 | // contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and | ||
10 | // "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", | ||
11 | // "Left Alt", "Up Arrow", and "Down Arrow". | ||
12 | // | ||
13 | // The macro makes programming the keys easier and in a more straight-forward | ||
14 | // manner because it realigns the keys into a 6x15 sensible keyboard layout | ||
15 | // instead of the obtuse 11x8 matrix. | ||
16 | |||
17 | |||
18 | /* | 5 | /* |
19 | * ┌───┬───┬───┐ | 6 | * ┌───┬───┬───┐ |
20 | * │ A │ B │ C │ | 7 | * │ A │ B │ C │ |
@@ -24,11 +11,8 @@ | |||
24 | */ | 11 | */ |
25 | #define LAYOUT_ortho_2x3( \ | 12 | #define LAYOUT_ortho_2x3( \ |
26 | k00, k01, k02, \ | 13 | k00, k01, k02, \ |
27 | k10, k11, k12 \ | 14 | k10, k11, k12 \ |
28 | ) { \ | 15 | ) { \ |
29 | { k00, k01, k02 }, \ | 16 | { k00, k01, k02 }, \ |
30 | { k10, k11, k12 } \ | 17 | { k10, k11, k12 } \ |
31 | } | 18 | } |
32 | |||
33 | |||
34 | #endif | ||