forked from mfulz_github/qmk_firmware
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						c8fd62432a
					
				@ -138,7 +138,7 @@
 | 
				
			|||||||
#define LT_CIRC ALGR(LT_COMM) // ^
 | 
					#define LT_CIRC ALGR(LT_COMM) // ^
 | 
				
			||||||
#define LT_AMPR ALGR(LT_DOT)  // &
 | 
					#define LT_AMPR ALGR(LT_DOT)  // &
 | 
				
			||||||
#define LT_ASTR ALGR(LT_EQL)  // *
 | 
					#define LT_ASTR ALGR(LT_EQL)  // *
 | 
				
			||||||
#define LT_LBRC ALGR(LT_LRPN) // [
 | 
					#define LT_LBRC ALGR(LT_LPRN) // [
 | 
				
			||||||
#define LT_RBRC ALGR(LT_RPRN) // ]
 | 
					#define LT_RBRC ALGR(LT_RPRN) // ]
 | 
				
			||||||
#define LT_QUOT ALGR(LT_QUES) // '
 | 
					#define LT_QUOT ALGR(LT_QUES) // '
 | 
				
			||||||
#define LT_PERC ALGR(LT_X)    // %
 | 
					#define LT_PERC ALGR(LT_X)    // %
 | 
				
			||||||
 | 
				
			|||||||
@ -102,10 +102,10 @@
 | 
				
			|||||||
// Row 1
 | 
					// Row 1
 | 
				
			||||||
#define SK_RNGA S(SK_SCLN) // ° (dead)
 | 
					#define SK_RNGA S(SK_SCLN) // ° (dead)
 | 
				
			||||||
#define SK_1    S(SK_PLUS) // 1
 | 
					#define SK_1    S(SK_PLUS) // 1
 | 
				
			||||||
#define SK_2    S(SK_LACU) // 2
 | 
					#define SK_2    S(SK_LCAR) // 2
 | 
				
			||||||
#define SK_3    S(SK_SCAR) // 3
 | 
					#define SK_3    S(SK_SCAR) // 3
 | 
				
			||||||
#define SK_4    S(SK_CCAR) // 4
 | 
					#define SK_4    S(SK_CCAR) // 4
 | 
				
			||||||
#define SK_5    S(SK_TACU) // 5
 | 
					#define SK_5    S(SK_TCAR) // 5
 | 
				
			||||||
#define SK_6    S(SK_ZCAR) // 6
 | 
					#define SK_6    S(SK_ZCAR) // 6
 | 
				
			||||||
#define SK_7    S(SK_YACU) // 7
 | 
					#define SK_7    S(SK_YACU) // 7
 | 
				
			||||||
#define SK_8    S(SK_AACU) // 8
 | 
					#define SK_8    S(SK_AACU) // 8
 | 
				
			||||||
 | 
				
			|||||||
@ -76,9 +76,9 @@ const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 | 
				
			|||||||
    //       !        "        #        $        %        &        '
 | 
					    //       !        "        #        $        %        &        '
 | 
				
			||||||
    KC_SPC,  LT_EXLM, LT_EDOT, LT_SLSH, LT_SCLN, LT_X,    LT_DOT,  LT_QUES,
 | 
					    KC_SPC,  LT_EXLM, LT_EDOT, LT_SLSH, LT_SCLN, LT_X,    LT_DOT,  LT_QUES,
 | 
				
			||||||
    // (     )        *        +        ,        -        .        /
 | 
					    // (     )        *        +        ,        -        .        /
 | 
				
			||||||
    LT_LRPN, LT_RPRN, LT_EQL,  LT_QUES, LT_COMM, LT_MINS, LT_DOT,  LT_SLSH,
 | 
					    LT_LPRN, LT_RPRN, LT_EQL,  LT_QUES, LT_COMM, LT_MINS, LT_DOT,  LT_SLSH,
 | 
				
			||||||
    // 0     1        2        3        4        5        6        7
 | 
					    // 0     1        2        3        4        5        6        7
 | 
				
			||||||
    LT_RPRN, LT_EXLM, LT_MINS, LT_SLSH, LT_SLCN, LT_COLN, LT_COMM, LT_DOT,
 | 
					    LT_RPRN, LT_EXLM, LT_MINS, LT_SLSH, LT_SCLN, LT_COLN, LT_COMM, LT_DOT,
 | 
				
			||||||
    // 8     9        :        ;        <        =        >        ?
 | 
					    // 8     9        :        ;        <        =        >        ?
 | 
				
			||||||
    LT_EQL,  LT_LPRN, LT_COLN, LT_SCLN, LT_LABK, LT_EQL,  LT_LABK, LT_QUES,
 | 
					    LT_EQL,  LT_LPRN, LT_COLN, LT_SCLN, LT_LABK, LT_EQL,  LT_LABK, LT_QUES,
 | 
				
			||||||
    // @     A        B        C        D        E        F        G
 | 
					    // @     A        B        C        D        E        F        G
 | 
				
			||||||
 | 
				
			|||||||
@ -78,7 +78,7 @@ const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 | 
				
			|||||||
    // (     )        *        +        ,        -        .        /
 | 
					    // (     )        *        +        ,        -        .        /
 | 
				
			||||||
    SK_ADIA, SK_NCAR, SK_AMPR, SK_PLUS, SK_COMM, SK_MINS, SK_DOT,  SK_UACU,
 | 
					    SK_ADIA, SK_NCAR, SK_AMPR, SK_PLUS, SK_COMM, SK_MINS, SK_DOT,  SK_UACU,
 | 
				
			||||||
    // 0     1        2        3        4        5        6        7
 | 
					    // 0     1        2        3        4        5        6        7
 | 
				
			||||||
    SK_EACU, SK_PLUS, SK_LACU, SK_SCAR, SK_CCAR, SK_TACU, SK_ZCAR, SK_YACU,
 | 
					    SK_EACU, SK_PLUS, SK_LCAR, SK_SCAR, SK_CCAR, SK_TCAR, SK_ZCAR, SK_YACU,
 | 
				
			||||||
    // 8     9        :        ;        <        =        >        ?
 | 
					    // 8     9        :        ;        <        =        >        ?
 | 
				
			||||||
    SK_AACU, SK_IACU, SK_DOT,  SK_SCLN, SK_AMPR, SK_EQL,  SK_Y,    SK_COMM,
 | 
					    SK_AACU, SK_IACU, SK_DOT,  SK_SCLN, SK_AMPR, SK_EQL,  SK_Y,    SK_COMM,
 | 
				
			||||||
    // @     A        B        C        D        E        F        G
 | 
					    // @     A        B        C        D        E        F        G
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user