Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						96afc7a03a
					
				
					 2 changed files with 5 additions and 2 deletions
				
			
		| 
						 | 
					@ -24,6 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
/* Select hand configuration */
 | 
					/* Select hand configuration */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MASTER_LEFT
 | 
					#define MASTER_LEFT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define SPLIT_WPM_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// #define MASTER_RIGHT
 | 
					// #define MASTER_RIGHT
 | 
				
			||||||
// #define EE_HANDS
 | 
					// #define EE_HANDS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -54,4 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NO_ACTION_ONESHOT
 | 
					#define NO_ACTION_ONESHOT
 | 
				
			||||||
// Size optimisations END
 | 
					// Size optimisations END
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef OLED_DRIVER_ENABLE
 | 
					#ifdef OLED_ENABLE
 | 
				
			||||||
// #include <stdio.h>
 | 
					// #include <stdio.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// bongo cat
 | 
					// bongo cat
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue