Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -17,6 +17,9 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    {{0,3}, {1,3}, {2,3}, {3,3}, {4,3}, {5,3}},
 | 
			
		||||
    {{0,4}, {1,4}, {2,4}, {3,4}, {4,4}, {5,4}},
 | 
			
		||||
};
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
void eeconfig_init_kb(void) {
 | 
			
		||||
 
 | 
			
		||||
@@ -43,4 +43,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
 | 
			
		||||
 { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} }, \
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,9 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
  {{11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
 | 
			
		||||
  {{11, 3}, {10, 3}, {9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
 | 
			
		||||
};
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
__attribute__ ((weak))
 | 
			
		||||
 
 | 
			
		||||
@@ -58,4 +58,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    {{5, 8}, {4, 8}, {3, 8}, {2, 8}, {1, 8}, {0, 8}},
 | 
			
		||||
    {{5, 9}, {4, 9}, {3, 9}, {2, 9}, {1, 9}, {0, 9}},
 | 
			
		||||
};
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -58,4 +58,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    {{5, 8}, {4, 8}, {3, 8}, {2, 8}, {1, 8}, {0, 8}},
 | 
			
		||||
    {{5, 9}, {4, 9}, {3, 9}, {2, 9}, {1, 9}, {0, 9}},
 | 
			
		||||
};
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -39,4 +39,8 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
 | 
			
		||||
 { {0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4} }, \
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
 | 
			
		||||
#    endif
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -28,6 +28,9 @@ __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATR
 | 
			
		||||
    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}, {7, 3}}
 | 
			
		||||
};
 | 
			
		||||
// clang-format on
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
 
 | 
			
		||||
@@ -43,6 +43,9 @@ __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATR
 | 
			
		||||
    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}, {7, 3}}
 | 
			
		||||
};
 | 
			
		||||
// clang-format on
 | 
			
		||||
#    ifdef ENCODER_MAP_ENABLE
 | 
			
		||||
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
 | 
			
		||||
#    endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user