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
This commit is contained in:
		
							parent
							
								
									971d36bb9e
								
							
						
					
					
						commit
						41c50bb653
					
				
					 308 changed files with 3520 additions and 4568 deletions
				
			
		| 
						 | 
				
			
			@ -16,9 +16,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      0x6535
 | 
			
		||||
| 
						 | 
				
			
			@ -133,5 +131,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#define PS2_DATA_DDR    DDRD
 | 
			
		||||
#define PS2_DATA_BIT    0
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,9 @@
 | 
			
		|||
#ifndef IBM_TERMINAL_H
 | 
			
		||||
#define IBM_TERMINAL_H
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#define XXX KC_NO
 | 
			
		||||
 | 
			
		||||
void matrix_init_user(void);
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
| 
						 | 
				
			
			@ -20,63 +21,61 @@ void matrix_init_user(void);
 | 
			
		|||
 *   +---------+
 | 
			
		||||
 */
 | 
			
		||||
#define LAYOUT( \
 | 
			
		||||
                  K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                         \
 | 
			
		||||
                  K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,                                         \
 | 
			
		||||
                                                                                                           \
 | 
			
		||||
    K05,K06,  K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K5D,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \
 | 
			
		||||
    K04,K0C,  K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5C,  K64,K65,K6D,  K6C,K75,K7D,K7C, \
 | 
			
		||||
    K03,K0B,  K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K53,K5A,      K63,      K6B,K73,K74,K7B, \
 | 
			
		||||
    K83,K0A,  K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,  K61,K62,K6A,  K69,K72,K7A,K79, \
 | 
			
		||||
    K01,K09,  K11,    K19,            K29,                    K39,    K58,      K60,      K68,K70,K71,K78  \
 | 
			
		||||
                    k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \
 | 
			
		||||
                    k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \
 | 
			
		||||
\
 | 
			
		||||
    k05, k06,  k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \
 | 
			
		||||
    k04, k0C,  k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B,      k5C,  k64, k65, k6D,  k6C, k75, k7D, k7C, \
 | 
			
		||||
    k03, k0B,  k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k53, k5A,       k63,       k6B, k73, k74, k7B, \
 | 
			
		||||
    k83, k0A,  k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k51, k59,  k61, k62, k6A,  k69, k72, k7A, k79, \
 | 
			
		||||
    k01, k09,  k11,      k19,                k29,                          k39,      k58,       k60,       k68, k70, k71, k78 \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, K01,   KC_NO, 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,   K4B,   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,   K6F   }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \
 | 
			
		||||
    { K78,   K79,   K7A,   K7B,   K7C,   K7D,   K7E,   KC_NO }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, K83,   K84,   KC_NO, KC_NO, KC_NO }  \
 | 
			
		||||
    { XXX, k01, XXX, 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, k4B, 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, k6F }, \
 | 
			
		||||
    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
 | 
			
		||||
    { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \
 | 
			
		||||
    { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * IBM Terminal keyboard 1399625, 101-key
 | 
			
		||||
 */
 | 
			
		||||
#define LAYOUT_101( \
 | 
			
		||||
    K08,    K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,  K57,K5F,K62,                   \
 | 
			
		||||
                                                                                             \
 | 
			
		||||
    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \
 | 
			
		||||
    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5C,  K64,K65,K6D,  K6C,K75,K7D,     \
 | 
			
		||||
    K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,                K6B,K73,K74,K7C, \
 | 
			
		||||
    K12,    K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K59,      K63,      K69,K72,K7A,     \
 | 
			
		||||
    K11,    K19,            K29,                K39,    K58,  K61,K60,K6A,  K70,    K71,K79  \
 | 
			
		||||
    k08,      k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E,  k57, k5F, k62, \
 | 
			
		||||
\
 | 
			
		||||
    k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \
 | 
			
		||||
    k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C,  k64, k65, k6D,  k6C, k75, k7D, \
 | 
			
		||||
    k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k5A,                  k6B, k73, k74, k7C, \
 | 
			
		||||
    k12,      k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k59,       k63,       k69, k72, k7A, \
 | 
			
		||||
    k11,      k19,                k29,                     k39,      k58,  k61, k60, k6A,  k70,      k71, k79 \
 | 
			
		||||
) { \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07   }, \
 | 
			
		||||
    { K08,   KC_NO, KC_NO, KC_NO, KC_NO, K0D,   K0E,   K0F   }, \
 | 
			
		||||
    { KC_NO, K11,   K12,   KC_NO, K14,   K15,   K16,   K17   }, \
 | 
			
		||||
    { KC_NO, K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
 | 
			
		||||
    { KC_NO, K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
 | 
			
		||||
    { KC_NO, K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \
 | 
			
		||||
    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
 | 
			
		||||
    { KC_NO, K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \
 | 
			
		||||
    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
 | 
			
		||||
    { KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \
 | 
			
		||||
    { KC_NO, KC_NO, K52,   KC_NO, K54,   K55,   K56,   K57   }, \
 | 
			
		||||
    { K58,   K59,   K5A,   K5B,   K5C,   KC_NO, K5E,   K5F   }, \
 | 
			
		||||
    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67   }, \
 | 
			
		||||
    { KC_NO, K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F   }, \
 | 
			
		||||
    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \
 | 
			
		||||
    { KC_NO, K79,   K7A,   KC_NO, K7C,   K7D,   K7E,   KC_NO }, \
 | 
			
		||||
    { KC_NO, KC_NO, KC_NO, KC_NO, K84,   KC_NO, KC_NO, KC_NO }  \
 | 
			
		||||
    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \
 | 
			
		||||
    { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \
 | 
			
		||||
    { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \
 | 
			
		||||
    { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
 | 
			
		||||
    { XXX, k21, k22, k23, k24, k25, k26, k27 }, \
 | 
			
		||||
    { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
 | 
			
		||||
    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
 | 
			
		||||
    { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
 | 
			
		||||
    { XXX, k41, k42, k43, k44, k45, k46, k47 }, \
 | 
			
		||||
    { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
 | 
			
		||||
    { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \
 | 
			
		||||
    { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \
 | 
			
		||||
    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
 | 
			
		||||
    { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
 | 
			
		||||
    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
 | 
			
		||||
    { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \
 | 
			
		||||
    { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue