mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 21:32:31 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						01f5a5ffcd
					
				| @ -26,6 +26,8 @@ | ||||
| #    include "teensy2pp.h" | ||||
| #elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c) | ||||
| #    include "elite_c.h" | ||||
| #elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro) | ||||
| #    include "arduinomicro.h" | ||||
| #endif | ||||
| 
 | ||||
| #include "quantum.h" | ||||
|  | ||||
| @ -0,0 +1,19 @@ | ||||
| /* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
 | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "5x6_right.h" | ||||
| @ -0,0 +1,44 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| Copyright 2015 Jack Humbert | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #define PRODUCT "Tractyl Manuform(5x6) Aruino Micro (r)/ Pro Micro (l)" | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| // Rows are doubled-up
 | ||||
| #define MATRIX_ROWS 12 | ||||
| #define MATRIX_COLS 6 | ||||
| 
 | ||||
| // wiring of each half
 | ||||
| // left
 | ||||
| #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } | ||||
| #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } | ||||
| // right
 | ||||
| #define MATRIX_COL_PINS_RIGHT { D6, D7, B4, D3, C6, C7 } | ||||
| #define MATRIX_ROW_PINS_RIGHT { D4, B7, F7, B6, B5, F6 } | ||||
| 
 | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* serial.c configuration for split keyboard */ | ||||
| //#undef USE_I2C
 | ||||
| #define SOFT_SERIAL_PIN D0 | ||||
| #define MASTER_RIGHT | ||||
| 
 | ||||
| /* PMW3360 Settings */ | ||||
| #define POINTING_DEVICE_CS_PIN B0 | ||||
| @ -0,0 +1,5 @@ | ||||
| # MCU name
 | ||||
| MCU = atmega32u4 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = caterina | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot