sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* Change keyboard level include guards to `pragma once`

And clean up a lot of layout macros

* Oops

* Remove dangling endif
This commit is contained in:
Ryan
2021-09-01 19:03:14 +10:00
committed by GitHub
parent 971d36bb9e
commit 41c50bb653
308 changed files with 3520 additions and 4568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/converter/sun_usb/config.h
View File

@@ -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
#define CONFIG_H
#pragma once
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x3333
@@ -81,5 +80,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* idle */ \
SERIAL_SOFT_TXD_ON(); \
} while (0)
#endif

55
keyboards/converter/sun_usb/type3/type3.h
View File

@@ -15,11 +15,12 @@ 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 TYPE3_H
#define TYPE3_H
#pragma once
#include "quantum.h"
#define XXX KC_NO
/* Sun type 3 keyboard
,-------. ,-----------------------------------------------------------. ,-----------.
| 01| 03| | 05| 06| 08| 0A| 0C| 0E| 10| 11| 12| 2B| | 15| 16| 17|
@@ -35,32 +36,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
| 77 | 78 | 79 | 7A | 13 |
`-----------------------------------------------------------'
*/
#define LAYOUT( \
K01,K03, K05,K06, K08, K0A, K0C, K0E, K10,K11,K12,K2B, K15,K16,K17, \
K19,K1A, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2D,K2E,K2F, \
K31,K33, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K42, K44,K45,K46, \
K48,K49, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, K5B,K5C,K5D, \
K5F,K61, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E,K6F, K70,K71,K72, \
K77,K78, K79, K7A,K13 \
#define LAYOUT( \
k01, k03, k05, k06, k08, k0A, k0C, k0E, k10, k11, k12, k2B, k15, k16, k17, \
k19, k1A, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k58, k2A, k2D, k2E, k2F, \
k31, k33, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k44, k45, k46, \
k48, k49, k4C, k4D, k4E, k4F, k50, k51, k52, k53, k54, k55, k56, k57, k59, k5B, k5C, k5D, \
k5F, k61, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, \
k77, k78, k79, k7A, k13 \
) { \
{ KC_NO, K01 , KC_NO, K03 , KC_NO, K05 , K06 , KC_NO }, \
{ K08 , KC_NO, K0A , KC_NO, K0C , KC_NO, K0E , KC_NO }, \
{ K10 , K11 , K12 , K13 , KC_NO, K15 , K16 , K17 }, \
{ KC_NO, K19 , K1A , KC_NO, KC_NO, K1D , K1E , K1F }, \
{ K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
{ K28 , K29 , K2A , K2B , KC_NO, K2D , K2E , K2F }, \
{ KC_NO, K31 , KC_NO, K33 , KC_NO, K35 , K36 , K37 }, \
{ K38 , K39 , K3A , K3B , K3C , K3D , K3E , K3F }, \
{ K40 , K41 , K42 , KC_NO, K44 , K45 , K46 , KC_NO }, \
{ K48 , K49 , KC_NO, KC_NO, K4C , K4D , K4E , K4F }, \
{ K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
{ K58 , K59 , KC_NO, K5B , K5C , K5D , KC_NO, K5F }, \
{ KC_NO, K61 , KC_NO, K63 , K64 , K65 , K66 , K67 }, \
{ K68 , K69 , K6A , K6B , K6C , K6D , K6E , K6F }, \
{ K70 , K71 , K72 , KC_NO, KC_NO, KC_NO, KC_NO, K77 }, \
{ K78 , K79 , K7A , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
{ XXX, k01, XXX, k03, XXX, k05, k06, XXX }, \
{ k08, XXX, k0A, XXX, k0C, XXX, k0E, XXX }, \
{ k10, k11, k12, k13, XXX, k15, k16, k17 }, \
{ XXX, k19, k1A, XXX, XXX, k1D, k1E, k1F }, \
{ k20, k21, k22, k23, k24, k25, k26, k27 }, \
{ k28, k29, k2A, k2B, XXX, k2D, k2E, k2F }, \
{ XXX, k31, XXX, k33, XXX, k35, k36, k37 }, \
{ k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
{ k40, k41, k42, XXX, k44, k45, k46, XXX }, \
{ k48, k49, XXX, XXX, k4C, k4D, k4E, k4F }, \
{ k50, k51, k52, k53, k54, k55, k56, k57 }, \
{ k58, k59, XXX, k5B, k5C, k5D, XXX, k5F }, \
{ XXX, k61, XXX, k63, k64, k65, k66, k67 }, \
{ k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
{ k70, k71, k72, XXX, XXX, XXX, XXX, k77 }, \
{ k78, k79, k7A, XXX, XXX, XXX, XXX, XXX } \
}
#endif

144
keyboards/converter/sun_usb/type5/type5.h
View File

@@ -15,11 +15,12 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TYPE5_H
#define TYPE5_H
#pragma once
#include "quantum.h"
#define XXX KC_NO
/* sun type 5 keyboard, JP Unix-style
,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------.
| 76 | | 0F| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30|
@@ -36,30 +37,30 @@
| 5F| 61| | 77 | 13| 78 |*73 | 79 |*74 |*75| 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
`-------' `-----------------------------------------------------------' `-----------' `---------------'
*/
#define LAYOUT_jp_unix( \
K76, K0F, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, K16,K17,K15, K2D,K02,K04,K30, \
K01,K03, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2C,K34,K60, K62,K2E,K2F,K47, \
K19,K1A, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, K42,K4A,K7B, K44,K45,K46,K7D, \
K31,K33, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, K5B,K5C,K5D, \
K48,K49, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, K70,K71,K72,K5A, \
K5F,K61, K77,K13, K78, K73, K79, K74, K75, K7A, K43, K0D, K18,K1B,K1C, K5E, K32 \
#define LAYOUT_jp_unix( \
K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \
K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \
K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
K5F, K61, K77, K13, K78, K73, K79, K74, K75, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
) { \
{ KC_NO, K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \
{ K08 , K09 , K0A , K0B , K0C , K0D , K0E , K0F ,}, \
{ K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \
{ K18 , K19 , K1A , K1B , K1C , K1D , K1E , K1F }, \
{ K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
{ K28 , K29 , K2A , K2B , K2C , K2D , K2E , K2F }, \
{ K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \
{ K38 , K39 , K3A , K3B , K3C , K3D , K3E , K3F }, \
{ K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \
{ K48 , K49 , K4A , KC_NO, K4C , K4D , K4E , K4F }, \
{ K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
{ K58 , K59 , K5A , K5B , K5C , K5D , K5E , K5F }, \
{ K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \
{ K68 , K69 , K6A , K6B , K6C , K6D , K6E , KC_NO }, \
{ K70 , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \
{ K78 , K79 , K7A , K7B , KC_NO, K7D , KC_NO, KC_NO } \
{ XXX, K01, K02, K03, K04, K05, K06, K07 }, \
{ K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
{ K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
{ K50, K51, K52, K53, K54, K55, K56, K57 }, \
{ K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
{ K60, K61, K62, K63, K64, K65, K66, K67 }, \
{ K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
{ K70, K71, K72, K73, K74, K75, K76, K77 }, \
{ K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
}
/* Sun type 5 keyboard, US Unix-style
@@ -78,30 +79,30 @@
| 5F| 61| | 77 | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
`-------' `-----------------------------------------------------------' `-----------' `---------------'
*/
#define LAYOUT_us_unix( \
K76, K0F, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, K16,K17,K15, K2D,K02,K04,K30, \
K01,K03, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2C,K34,K60, K62,K2E,K2F,K47, \
K19,K1A, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, K42,K4A,K7B, K44,K45,K46,K7D, \
K31,K33, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, K5B,K5C,K5D, \
K48,K49, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, K70,K71,K72,K5A, \
K5F,K61, K77,K13, K78, K79, K7A, K43, K0D, K18,K1B,K1C, K5E, K32 \
#define LAYOUT_us_unix( \
K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \
K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \
K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
K5F, K61, K77, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
) { \
{ KC_NO, K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \
{ K08 , K09 , K0A , K0B , K0C , K0D , K0E , K0F ,}, \
{ K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \
{ K18 , K19 , K1A , K1B , K1C , K1D , K1E , K1F }, \
{ K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
{ K28 , K29 , K2A , K2B , K2C , K2D , K2E , K2F }, \
{ K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \
{ K38 , K39 , K3A , K3B , K3C , K3D , K3E , K3F }, \
{ K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \
{ K48 , K49 , K4A , KC_NO, K4C , K4D , K4E , K4F }, \
{ K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
{ K58 , K59 , K5A , K5B , K5C , K5D , K5E , K5F }, \
{ K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \
{ K68 , K69 , K6A , K6B , K6C , K6D , K6E , KC_NO }, \
{ K70 , K71 , K72 , KC_NO, KC_NO, KC_NO, K76 , K77 }, \
{ K78 , K79 , K7A , K7B , KC_NO, K7D , KC_NO, KC_NO } \
{ XXX, K01, K02, K03, K04, K05, K06, K07 }, \
{ K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
{ K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
{ K50, K51, K52, K53, K54, K55, K56, K57 }, \
{ K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
{ K60, K61, K62, K63, K64, K65, K66, K67 }, \
{ K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
{ K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \
{ K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
}
/* Sun type 5 keyboard, US ANSI-style
@@ -120,29 +121,28 @@
| 5F| 61| | 4C | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
`-------' `-----------------------------------------------------------' `-----------' `---------------'
*/
#define LAYOUT_ansi( \
K76, K1D, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, K16,K17,K15, K2D,K02,K04,K30, \
K01,K03, K2A,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29, K2B, K2C,K34,K60, K62,K2E,K2F,K47, \
K19,K1A, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K58, K42,K4A,K7B, K44,K45,K46,K7D, \
K31,K33, K77, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, K5B,K5C,K5D, \
K48,K49, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, K70,K71,K72,K5A, \
K5F,K61, K4C,K13, K78, K79, K7A, K43, K0D, K18,K1B,K1C, K5E, K32 \
#define LAYOUT_ansi( \
K76, K1D, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \
K01, K03, K2A, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2C, K34, K60, K62, K2E, K2F, K47, \
K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K58, K42, K4A, K7B, K44, K45, K46, K7D, \
K31, K33, K77, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \
K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \
K5F, K61, K4C, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \
) { \
{ KC_NO, K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \
{ K08 , K09 , K0A , K0B , K0C , K0D , K0E , KC_NO,}, \
{ K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \
{ K18 , K19 , K1A , K1B , K1C , K1D , K1E , K1F }, \
{ K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \
{ K28 , K29 , K2A , K2B , K2C , K2D , K2E , K2F }, \
{ K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \
{ K38 , K39 , K3A , K3B , K3C , K3D , K3E , K3F }, \
{ K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \
{ K48 , K49 , K4A , KC_NO, K4C , K4D , K4E , K4F }, \
{ K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \
{ K58 , K59 , K5A , K5B , K5C , K5D , K5E , K5F }, \
{ K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \
{ K68 , K69 , K6A , K6B , K6C , K6D , K6E , KC_NO }, \
{ K70 , K71 , K72 , KC_NO, KC_NO, KC_NO, K76 , K77 }, \
{ K78 , K79 , K7A , K7B , KC_NO, K7D , KC_NO, KC_NO } \
{ XXX, K01, K02, K03, K04, K05, K06, K07 }, \
{ K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
{ K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
{ K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
{ K50, K51, K52, K53, K54, K55, K56, K57 }, \
{ K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
{ K60, K61, K62, K63, K64, K65, K66, K67 }, \
{ K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
{ K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \
{ K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \
}
#endif