Skip to content

Commit

Permalink
Nightly
Browse files Browse the repository at this point in the history 
Only major change to qmk was the addition of A0-A7 pins for the AT90USB
  • Loading branch information
@IBNobody
IBNobody committed Aug 22, 2016
1 parent 4807fee commit 705c775
Show file tree
Hide file tree
Showing 7 changed files with 321 additions and 161 deletions.
84 changes: 84 additions & 0 deletions keyboards/vision_division/Potential Layouts.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/* Numeric Max / Numeric Normal - Full Grid
* .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .-----------------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
* .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | | | | | o | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/

//* Numeric Max / Homing Normal - Full Grid
* .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .--------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------'
* .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .--------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------|
* | | | | | o | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------'
*/

//* Numeric Max / Homing Normal - Traditional
* .-----------------------------------. .-----------------------------------. .-----------------_-----------------. .-----------------------------------. .--------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------' '-----------------------------------' '-----------------------------------' '--------------------------'
* .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .--------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------|
* | | | | | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+ | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| '--------+--------+--------'
* | | | | | o | | | | | | | | | | | | | | |
* |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| .--------.
* | | | | | | | | | | | | | | | | | | | |
* |--------+--------+--------+ | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| .--------+--------+--------.
* | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------'
*/

/* Numeric Max / Numeric Normal
* .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .-----------------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
* .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
* | | | | | | 1U / 2U | | | | | | | | | | | 1U / 2U | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | 1U | | | 1U | | | | | | | | | | | | | | | | | 1U | | | 1U |
* | / +--------+--------+ / | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | / +--------+--------+ / |
* | 2U | | | 2U | o | 1U / 2U | | | | | | | | | | | | | 2U | | | 2U |
* |--------+--------+--------+--------| o |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |--------+--------+--------+--------|
* | | | | | | 1U / 2U | | | | | | | | | | | 1U / 2U | | | | | |
* | '--------+--------' | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | '--------+--------' |
* | 1U / 2UH / 2UV | 1U / 2UH / 2UV | | | | | | | | 1U / 2U | | | | | | | | 1U / 2UH / 2UV | 1U / 2UH / 2UV |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/

/* Numeric Max / Numeric Max
* .-----------------------------------. .-----------------------------------------------------------------------_-----------------------------------------------------------------------. .-----------------------------------.
* | | | | | | | | | | | | | | | | | | | | | | | | | | |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
* .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
* | | | | | | 1U / 2U | | | | | | | | | | | | | 1U / 2U | | | | | |
* |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------|
* | 1U | | | 1U | | | | | | | | | | | | | | | | | | | 1U | | | 1U |
* | / +--------+--------+ / | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | / +--------+--------+ / |
* | 2U | | | 2U | o | 1U / 2U | | | | | | | | | | | | | | | 2U | | | 2U |
* |--------+--------+--------+--------| o |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |--------+--------+--------+--------|
* | | | | | | 1U / 2U | | | | | | | | | | | | | 1U / 2U | | | | | |
* | '--------+--------' | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | '--------+--------' |
* | 1U / 2UH / 2UV | 1U / 2UH / 2UV | | | | | | | | 1U / 2U | 1U / 2U | | | | | | | | 1U / 2UH / 2UV | 1U / 2UH / 2UV |
* '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/
44 changes: 2 additions & 42 deletions keyboards/vision_division/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,52 +20,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x2525
#define DEVICE_VER 0x0001
#define MANUFACTURER You
#define PRODUCT Vision Division
#define DESCRIPTION Split or Full Keyboard
#define MATRIX_EXTENDED

/* key matrix size */
#ifdef MATRIX_EXTENDED
#define MATRIX_ROWS 6
#define MATRIX_COLS 24
#else
#define MATRIX_ROWS 6
#define MATRIX_COLS 12
#endif

/*
* 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)
*
*/
// Due to the configurability of this keyboard, matrix sizes are determined in the keymap's config.h

#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 */
#define DIODE_DIRECTION COL2ROW

// #define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING
// #define BACKLIGHT_LEVELS 3
Expand Down
36 changes: 35 additions & 1 deletion keyboards/vision_division/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,41 @@
#define CONFIG_USER_H

#include "../../config.h"
#include "matrix_types.h"

// place overrides here

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID GET_PID(NUMERIC_MAX_TEENSY, NUMERIC_MAX)
#define DEVICE_VER 0x0001
#define MANUFACTURER IBNobody
#define PRODUCT Vision Division
#define DESCRIPTION Full / Split Keyboard


#define MATRIX_ROWS 6
#define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 }

#define MATRIX_COLS GET_MATRIX_COLS(NUMERIC_MAX_TEENSY, NUMERIC_MAX)
#define MATRIX_COL_PINS GET_MATRIX_COL_PINS(NUMERIC_MAX_TEENSY, NUMERIC_MAX)

#define UNUSED_PINS

#define KEYMAP( \
k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \
k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \
k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \
k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \
k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C, \
k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, k61C \
) \
KEYMAP_MASTER(NUMERIC_MAX_TEENSY, NUMERIC_MAX, \
k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \
k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \
k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \
k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \
k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C, \
k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, k61C \
) \

#endif
Loading

0 comments on commit 705c775

Please sign in to comment.