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/launchpad | |
| 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/launchpad')
| -rw-r--r-- | keyboards/launchpad/config.h | 5 | ||||
| -rw-r--r-- | keyboards/launchpad/launchpad.h | 10 | ||||
| -rw-r--r-- | keyboards/launchpad/rev1/rev1.h | 26 |
3 files changed, 15 insertions, 26 deletions
diff --git a/keyboards/launchpad/config.h b/keyboards/launchpad/config.h index e9a13a3bd..327d67016 100644 --- a/keyboards/launchpad/config.h +++ b/keyboards/launchpad/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 | ||
| @@ -65,5 +64,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 65 | #ifdef SUBPROJECT_rev1 | 64 | #ifdef SUBPROJECT_rev1 |
| 66 | #include "rev1/config.h" | 65 | #include "rev1/config.h" |
| 67 | #endif | 66 | #endif |
| 68 | |||
| 69 | #endif | ||
diff --git a/keyboards/launchpad/launchpad.h b/keyboards/launchpad/launchpad.h index 85432de0a..59cf64afe 100644 --- a/keyboards/launchpad/launchpad.h +++ b/keyboards/launchpad/launchpad.h | |||
| @@ -1,11 +1,7 @@ | |||
| 1 | #ifndef LAUNCHPAD_H | 1 | #pragma once |
| 2 | #define LAUNCHPAD_H | ||
| 3 | 2 | ||
| 4 | #ifdef KEYBOARD_launchpad_rev1 | 3 | #if defined(KEYBOARD_launchpad_rev1) |
| 5 | #include "rev1.h" | 4 | # include "rev1.h" |
| 6 | #endif | 5 | #endif |
| 7 | 6 | ||
| 8 | #include "quantum.h" | 7 | #include "quantum.h" |
| 9 | |||
| 10 | |||
| 11 | #endif | ||
diff --git a/keyboards/launchpad/rev1/rev1.h b/keyboards/launchpad/rev1/rev1.h index 6644db830..2ea6e7e77 100644 --- a/keyboards/launchpad/rev1/rev1.h +++ b/keyboards/launchpad/rev1/rev1.h | |||
| @@ -1,21 +1,17 @@ | |||
| 1 | #ifndef REV1_H | 1 | #pragma once |
| 2 | #define REV1_H | ||
| 3 | 2 | ||
| 4 | #include "../launchpad.h" | 3 | #include "../launchpad.h" |
| 5 | 4 | ||
| 6 | #include "quantum.h" | 5 | #include "quantum.h" |
| 7 | 6 | ||
| 8 | #define LAYOUT( \ | 7 | #define LAYOUT( \ |
| 9 | K00, K01, \ | 8 | k00, k01, \ |
| 10 | K10, K11, \ | 9 | k10, k11, \ |
| 11 | K20, K21, \ | 10 | k20, k21, \ |
| 12 | K30, K31 \ | 11 | k30, k31 \ |
| 13 | ) \ | 12 | ) { \ |
| 14 | { \ | 13 | { k00, k01 }, \ |
| 15 | { K00, K01 }, \ | 14 | { k10, k11 }, \ |
| 16 | { K10, K11 }, \ | 15 | { k20, k21 }, \ |
| 17 | { K20, K21 }, \ | 16 | { k30, k31 } \ |
| 18 | { K30, K31 } \ | 17 | } |
| 19 | } | ||
| 20 | |||
| 21 | #endif | ||
