Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		| @@ -28,20 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define MATRIX_ROWS 7 | ||||
| #define MATRIX_COLS 9 | ||||
|  | ||||
| /* | ||||
|  * Keyboard Matrix Assignments | ||||
|  * | ||||
|  * Change this to how you wired your keyboard | ||||
|  * COLS: AVR pins used for columns, left to right | ||||
|  * ROWS: AVR pins used for rows, top to bottom | ||||
|  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||||
|  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||||
|  * | ||||
|  */ | ||||
| #define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } | ||||
| #define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } | ||||
| #define UNUSED_PINS | ||||
|  | ||||
| /* COL2ROW, ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
|  | ||||
|   | ||||
							
								
								
									
										23
									
								
								keyboards/infinity60/led/config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								keyboards/infinity60/led/config.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | ||||
| /* | ||||
| Copyright 2015 Jun Wako <wakojun@gmail.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 | ||||
|  | ||||
| // Keyboard Matrix Assignments | ||||
| #define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } | ||||
| #define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 } | ||||
| #define UNUSED_PINS | ||||
							
								
								
									
										3
									
								
								keyboards/infinity60/led/readme.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/infinity60/led/readme.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| ## Infinity 60% LED | ||||
|  | ||||
| This revision is for the version of the infinity 60 with LEDs (rev 1.1a) | ||||
							
								
								
									
										3
									
								
								keyboards/infinity60/led/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/infinity60/led/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # project specific files | ||||
| SRC += led.c \ | ||||
|        led_controller.c | ||||
							
								
								
									
										25
									
								
								keyboards/infinity60/rev1/config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								keyboards/infinity60/rev1/config.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | ||||
| /* | ||||
| Copyright 2015 Jun Wako <wakojun@gmail.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 | ||||
|  | ||||
| // Keyboard Matrix Assignments | ||||
| #define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 } | ||||
| #define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 } | ||||
| #define UNUSED_PINS | ||||
|  | ||||
|  | ||||
							
								
								
									
										2
									
								
								keyboards/infinity60/rev1/readme.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								keyboards/infinity60/rev1/readme.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,2 @@ | ||||
| ## Infinity 60, initial massdrop release | ||||
| This is for the initial massdrop PCBs that don't support LEDs (rev 1.03a) | ||||
							
								
								
									
										0
									
								
								keyboards/infinity60/rev1/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								keyboards/infinity60/rev1/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @@ -30,9 +30,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow | ||||
| BLUETOOTH_ENABLE = no       # Enable Bluetooth | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| # project specific files | ||||
| SRC += led.c \ | ||||
|        led_controller.c | ||||
| DEFAULT_FOLDER = infinity60/led | ||||
|  | ||||
| LAYOUTS = 60_ansi_split_bs_rshift | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user