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/preonic | |
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/preonic')
-rw-r--r-- | keyboards/preonic/config.h | 5 | ||||
-rw-r--r-- | keyboards/preonic/keymaps/badger/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/preonic/rev1/config.h | 5 | ||||
-rw-r--r-- | keyboards/preonic/rev2/config.h | 5 | ||||
-rw-r--r-- | keyboards/preonic/rev3/config.h | 5 |
5 files changed, 5 insertions, 17 deletions
diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index dfd0a8439..8f72de909 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/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 | ||
@@ -78,5 +77,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
78 | //#define NO_ACTION_ONESHOT | 77 | //#define NO_ACTION_ONESHOT |
79 | //#define NO_ACTION_MACRO | 78 | //#define NO_ACTION_MACRO |
80 | //#define NO_ACTION_FUNCTION | 79 | //#define NO_ACTION_FUNCTION |
81 | |||
82 | #endif | ||
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c index 495cf28c4..761beb861 100644 --- a/keyboards/preonic/keymaps/badger/keymap.c +++ b/keyboards/preonic/keymaps/badger/keymap.c | |||
@@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | // if not REV3, just compile the default keymaps | 16 | // if not REV3, just compile the default keymaps |
17 | #ifndef REV3_CONFIG_H | 17 | #ifndef KEYBOARD_preonic_rev3 |
18 | #include "../default/keymap.c" | 18 | #include "../default/keymap.c" |
19 | #else | 19 | #else |
20 | 20 | ||
diff --git a/keyboards/preonic/rev1/config.h b/keyboards/preonic/rev1/config.h index 76b646590..a1091b10e 100644 --- a/keyboards/preonic/rev1/config.h +++ b/keyboards/preonic/rev1/config.h | |||
@@ -15,12 +15,9 @@ 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_common.h" | 20 | #include "config_common.h" |
22 | 21 | ||
23 | #define DEVICE_VER 0x0001 | 22 | #define DEVICE_VER 0x0001 |
24 | #define PRODUCT_ID 0x67F3 | 23 | #define PRODUCT_ID 0x67F3 |
25 | |||
26 | #endif \ No newline at end of file | ||
diff --git a/keyboards/preonic/rev2/config.h b/keyboards/preonic/rev2/config.h index 29fc09184..a62fed485 100644 --- a/keyboards/preonic/rev2/config.h +++ b/keyboards/preonic/rev2/config.h | |||
@@ -15,12 +15,9 @@ 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_common.h" | 20 | #include "config_common.h" |
22 | 21 | ||
23 | #define DEVICE_VER 0x0002 | 22 | #define DEVICE_VER 0x0002 |
24 | #define PRODUCT_ID 0x67F3 | 23 | #define PRODUCT_ID 0x67F3 |
25 | |||
26 | #endif \ No newline at end of file | ||
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 420e7e541..f2c4b3c3d 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h | |||
@@ -15,8 +15,7 @@ | |||
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 REV3_CONFIG_H | 18 | #pragma once |
19 | #define REV3_CONFIG_H | ||
20 | 19 | ||
21 | /* USB Device descriptor parameter */ | 20 | /* USB Device descriptor parameter */ |
22 | #define DEVICE_VER 0x0003 | 21 | #define DEVICE_VER 0x0003 |
@@ -107,5 +106,3 @@ | |||
107 | #define WS2812_PWM_PAL_MODE 1 | 106 | #define WS2812_PWM_PAL_MODE 1 |
108 | #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 | 107 | #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 |
109 | #define WS2812_DMA_CHANNEL 2 | 108 | #define WS2812_DMA_CHANNEL 2 |
110 | |||
111 | #endif | ||