In Progress Merge

This commit is contained in:
IBNobody
2016-08-20 14:49:16 -05:00
parent 5febdb0a3c
commit 4807feec8a
4 changed files with 137 additions and 18 deletions
+24 -7
View File
@@ -22,15 +22,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define PRODUCT_ID 0x2525
#define DEVICE_VER 0x0001
#define MANUFACTURER You
#define PRODUCT vision_division
#define DESCRIPTION A custom keyboard
#define PRODUCT Vision Division
#define DESCRIPTION Split or Full Keyboard
#define MATRIX_EXTENDED
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
#ifdef MATRIX_EXTENDED
#define MATRIX_ROWS 6
#define MATRIX_COLS 24
#else
#define MATRIX_ROWS 6
#define MATRIX_COLS 12
#endif
/*
* Keyboard Matrix Assignments
@@ -42,8 +48,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D0, D5 }
#define MATRIX_COL_PINS { F1, F0, B0 }
#ifdef MATRIX_EXTENDED
// Note that the extended colums are reversed because the second PCB has col 1 on the far right.
#define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3, E6, A4, A0, A1, A5, A2, A6, A3, A7, C4, C5, C7}
#else #ifdef MATRIX_LEFT
#define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3 }
#define MATRIX_COL_PINS { B3, B2, B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 }
#endif
#define UNUSED_PINS
/* COL2ROW or ROW2COL */