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
				
			
		| 
						 | 
				
			
			@ -12,8 +12,8 @@
 | 
			
		|||
 * 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 V2_CONFIG_H
 | 
			
		||||
#define V2_CONFIG_H
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -62,5 +62,3 @@
 | 
			
		|||
#define RGBLIGHT_SAT_STEP 8
 | 
			
		||||
#define RGBLIGHT_VAL_STEP 8
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,57 +13,56 @@
 | 
			
		|||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#ifndef V2_H
 | 
			
		||||
#define V2_H
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "../mechmini.h"
 | 
			
		||||
 | 
			
		||||
#define XXX KC_NO
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho( \
 | 
			
		||||
	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 | 
			
		||||
	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
 | 
			
		||||
	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
 | 
			
		||||
	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
 | 
			
		||||
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
 | 
			
		||||
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
 | 
			
		||||
) { \
 | 
			
		||||
	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
 | 
			
		||||
	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
 | 
			
		||||
	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
 | 
			
		||||
	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \
 | 
			
		||||
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
 | 
			
		||||
    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
 | 
			
		||||
    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
 | 
			
		||||
    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_625_space( \
 | 
			
		||||
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 | 
			
		||||
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111, \
 | 
			
		||||
    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
 | 
			
		||||
    K300, K301, K302,                   K306,                   K310, K311  \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \
 | 
			
		||||
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
 | 
			
		||||
    k30, k31, k32,                k36,                k3A, k3B \
 | 
			
		||||
) { \
 | 
			
		||||
    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
 | 
			
		||||
    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, K111 }, \
 | 
			
		||||
    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
 | 
			
		||||
    { K300,  K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, KC_NO, K310,  K311 }  \
 | 
			
		||||
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
 | 
			
		||||
    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \
 | 
			
		||||
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
 | 
			
		||||
    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, k3B } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_split_space( \
 | 
			
		||||
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 | 
			
		||||
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111, \
 | 
			
		||||
    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
 | 
			
		||||
    K300, K301, K302,       K304,             K307,       K309, K310, K311  \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \
 | 
			
		||||
    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
 | 
			
		||||
    k30, k31, k32,      k34,           k37,      k39, k3A, k3B \
 | 
			
		||||
) { \
 | 
			
		||||
    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
 | 
			
		||||
    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, K111 }, \
 | 
			
		||||
    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
 | 
			
		||||
    { K300,  K301,  K302,  KC_NO, K304,  KC_NO, KC_NO, K307,  KC_NO, K309,  K310,  K311 }  \
 | 
			
		||||
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
 | 
			
		||||
    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \
 | 
			
		||||
    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
 | 
			
		||||
    { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_2u_space_ortho( \
 | 
			
		||||
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
 | 
			
		||||
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
 | 
			
		||||
    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
 | 
			
		||||
    K300, K301, K302, K303, K304,    K305,    K307, K308, K309, K310, K311  \
 | 
			
		||||
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
 | 
			
		||||
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
 | 
			
		||||
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
 | 
			
		||||
    k30, k31, k32, k33, k34,   k35,    k37, k38, k39, k3A, k3B \
 | 
			
		||||
) { \
 | 
			
		||||
    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
 | 
			
		||||
    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
 | 
			
		||||
    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
 | 
			
		||||
    { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \
 | 
			
		||||
    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
 | 
			
		||||
    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
 | 
			
		||||
    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
 | 
			
		||||
    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue