diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-30 00:06:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-30 00:06:16 +0000 |
| commit | 7dd99f2b22a34143c0443154d9cd97540443b096 (patch) | |
| tree | fd6a29fb5473f17c147589305bd28a58e5e29981 | |
| parent | e29b9e32bba49bc076a2e298554b19c4de231161 (diff) | |
| parent | 8ee03f6a6b3216fa0d4372d4db8c09f24473c6c6 (diff) | |
| download | qmk_firmware-7dd99f2b22a34143c0443154d9cd97540443b096.tar.gz qmk_firmware-7dd99f2b22a34143c0443154d9cd97540443b096.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/choco60/choco60.c | 36 | ||||
| -rw-r--r-- | keyboards/choco60/config.h | 34 | ||||
| -rw-r--r-- | keyboards/choco60/keymaps/via/keymap.c | 48 | ||||
| -rw-r--r-- | keyboards/choco60/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/choco60/readme.md | 16 | ||||
| -rw-r--r-- | keyboards/choco60/rev1/config.h | 41 | ||||
| -rw-r--r-- | keyboards/choco60/rev1/readme.md | 15 | ||||
| -rw-r--r-- | keyboards/choco60/rev1/rev1.c | 17 | ||||
| -rw-r--r-- | keyboards/choco60/rev1/rev1.h | 19 | ||||
| -rw-r--r-- | keyboards/choco60/rev1/rules.mk | 24 | ||||
| -rw-r--r-- | keyboards/choco60/rev2/config.h | 45 | ||||
| -rw-r--r-- | keyboards/choco60/rev2/readme.md | 15 | ||||
| -rw-r--r-- | keyboards/choco60/rev2/rev2.c | 17 | ||||
| -rw-r--r-- | keyboards/choco60/rev2/rev2.h | 19 | ||||
| -rw-r--r-- | keyboards/choco60/rev2/rules.mk | 24 | ||||
| -rw-r--r-- | keyboards/choco60/rules.mk | 35 |
16 files changed, 304 insertions, 103 deletions
diff --git a/keyboards/choco60/choco60.c b/keyboards/choco60/choco60.c index e38f335c1..fc56c68ac 100644 --- a/keyboards/choco60/choco60.c +++ b/keyboards/choco60/choco60.c | |||
| @@ -13,39 +13,5 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "choco60.h" | ||
| 17 | |||
| 18 | // Optional override functions below. | ||
| 19 | // You can leave any or all of these undefined. | ||
| 20 | // These are only required if you want to perform custom actions. | ||
| 21 | |||
| 22 | /* | ||
| 23 | |||
| 24 | void matrix_init_kb(void) { | ||
| 25 | // put your keyboard start-up code here | ||
| 26 | // runs once when the firmware starts up | ||
| 27 | |||
| 28 | matrix_init_user(); | ||
| 29 | } | ||
| 30 | |||
| 31 | void matrix_scan_kb(void) { | ||
| 32 | // put your looping keyboard code here | ||
| 33 | // runs every cycle (a lot) | ||
| 34 | 16 | ||
| 35 | matrix_scan_user(); | 17 | #include "choco60.h" |
| 36 | } | ||
| 37 | |||
| 38 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||
| 39 | // put your per-action keyboard code here | ||
| 40 | // runs for every action, just before processing by the firmware | ||
| 41 | |||
| 42 | return process_record_user(keycode, record); | ||
| 43 | } | ||
| 44 | |||
| 45 | void led_set_kb(uint8_t usb_led) { | ||
| 46 | // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here | ||
| 47 | |||
| 48 | led_set_user(usb_led); | ||
| 49 | } | ||
| 50 | |||
| 51 | */ | ||
diff --git a/keyboards/choco60/config.h b/keyboards/choco60/config.h index 97d7c61ac..72264f51e 100644 --- a/keyboards/choco60/config.h +++ b/keyboards/choco60/config.h | |||
| @@ -20,36 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | #include "config_common.h" | 20 | #include "config_common.h" |
| 21 | 21 | ||
| 22 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
| 23 | #define VENDOR_ID 0xC0C0 | 23 | #define VENDOR_ID 0x524B // recompile keys |
| 24 | #define PRODUCT_ID 0x6000 | 24 | #define PRODUCT_ID 0x4362 // Choco60 |
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER Naoto Takai | 26 | #define MANUFACTURER recompile keys |
| 27 | #define PRODUCT choco60 | 27 | #define PRODUCT Choco60 |
| 28 | #define DESCRIPTION A 60% split keyboard for programmers. | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 10 | 30 | #define MATRIX_ROWS 10 |
| 32 | #define MATRIX_COLS 9 | 31 | #define MATRIX_COLS 9 |
| 33 | 32 | ||
| 34 | /* | 33 | /* Bootmagic Lite key configuration */ |
| 35 | * Keyboard Matrix Assignments | 34 | #define BOOTMAGIC_LITE_ROW 0 |
| 36 | * | 35 | #define BOOTMAGIC_LITE_COLUMN 0 |
| 37 | * Change this to how you wired your keyboard | ||
| 38 | * COLS: AVR pins used for columns, left to right | ||
| 39 | * ROWS: AVR pins used for rows, top to bottom | ||
| 40 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
| 41 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
| 42 | * | ||
| 43 | */ | ||
| 44 | #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } | ||
| 45 | #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 } | ||
| 46 | #define UNUSED_PINS | ||
| 47 | |||
| 48 | /* COL2ROW, ROW2COL*/ | ||
| 49 | #define DIODE_DIRECTION COL2ROW | ||
| 50 | |||
| 51 | /* | ||
| 52 | * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. | ||
| 53 | */ | ||
| 54 | #define SOFT_SERIAL_PIN D3 // or D1, D2, D3, E6 | ||
| 55 | #define SPLIT_HAND_PIN D0 | ||
diff --git a/keyboards/choco60/keymaps/via/keymap.c b/keyboards/choco60/keymaps/via/keymap.c new file mode 100644 index 000000000..878a74210 --- /dev/null +++ b/keyboards/choco60/keymaps/via/keymap.c | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | /* Copyright 2019 Naoto Takai | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include QMK_KEYBOARD_H | ||
| 18 | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 20 | [0] = LAYOUT( | ||
| 21 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, | ||
| 22 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | ||
| 23 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | ||
| 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | ||
| 25 | KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT | ||
| 26 | ), | ||
| 27 | [1] = LAYOUT( | ||
| 28 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, | ||
| 29 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, | ||
| 32 | _______, _______, _______, _______, _______, KC_STOP, RESET | ||
| 33 | ), | ||
| 34 | [2] = LAYOUT( | ||
| 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 39 | _______, _______, _______, _______, _______, _______, _______ | ||
| 40 | ), | ||
| 41 | [3] = LAYOUT( | ||
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 46 | _______, _______, _______, _______, _______, _______, _______ | ||
| 47 | ) | ||
| 48 | }; | ||
diff --git a/keyboards/choco60/keymaps/via/rules.mk b/keyboards/choco60/keymaps/via/rules.mk new file mode 100644 index 000000000..36b7ba9cb --- /dev/null +++ b/keyboards/choco60/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | LTO_ENABLE = yes | ||
diff --git a/keyboards/choco60/readme.md b/keyboards/choco60/readme.md index ca309fdcb..0290f95d2 100644 --- a/keyboards/choco60/readme.md +++ b/keyboards/choco60/readme.md | |||
| @@ -1,15 +1,17 @@ | |||
| 1 | # choco60 | 1 | # Choco60 |
| 2 | |||
| 3 |  | ||
| 4 | 2 | ||
| 5 | A 60% split keyboard for programmers. | 3 | A 60% split keyboard for programmers. |
| 6 | 4 | ||
| 7 | Keyboard Maintainer: [Naoto Takai](https://github.com/takai) | 5 | 1. [Rev.1](rev2/): Pro Micro supported. |
| 8 | Hardware Supported: The Choco60 PCBs, Pro Micro supported | 6 | 2. [Rev.2](rev2/): Atmega32u2, USB-C supported. |
| 9 | Hardware Availability: https://keys.recompile.net/projects/choco60/ | 7 | |
| 8 | * Keyboard Maintainer: [Naoto Takai](https://github.com/takai) | ||
| 9 | * Hardware Supported: Choco60 PCB Rev1, Rev.2 | ||
| 10 | * Hardware Availability: https://keys.recompile.net/projects/choco60/ | ||
| 10 | 11 | ||
| 11 | Make example for this keyboard (after setting up your build environment): | 12 | Make example for this keyboard (after setting up your build environment): |
| 12 | 13 | ||
| 13 | make choco60:default | 14 | make choco60/rev1:default |
| 15 | make choco60/rev2:default | ||
| 14 | 16 | ||
| 15 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | 17 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
diff --git a/keyboards/choco60/rev1/config.h b/keyboards/choco60/rev1/config.h new file mode 100644 index 000000000..c5efc6f5f --- /dev/null +++ b/keyboards/choco60/rev1/config.h | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2019 Naoto Takai | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | /* | ||
| 21 | * Keyboard Matrix Assignments | ||
| 22 | * | ||
| 23 | * Change this to how you wired your keyboard | ||
| 24 | * COLS: AVR pins used for columns, left to right | ||
| 25 | * ROWS: AVR pins used for rows, top to bottom | ||
| 26 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
| 27 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
| 28 | * | ||
| 29 | */ | ||
| 30 | #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } | ||
| 31 | #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 } | ||
| 32 | #define UNUSED_PINS | ||
| 33 | |||
| 34 | /* COL2ROW, ROW2COL*/ | ||
| 35 | #define DIODE_DIRECTION COL2ROW | ||
| 36 | |||
| 37 | /* | ||
| 38 | * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. | ||
| 39 | */ | ||
| 40 | #define SOFT_SERIAL_PIN D3 // or D1, D2, D3, E6 | ||
| 41 | #define SPLIT_HAND_PIN D0 | ||
diff --git a/keyboards/choco60/rev1/readme.md b/keyboards/choco60/rev1/readme.md new file mode 100644 index 000000000..df9d50e0a --- /dev/null +++ b/keyboards/choco60/rev1/readme.md | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # Choco60 | ||
| 2 | |||
| 3 |  | ||
| 4 | |||
| 5 | A 60% split keyboard for programmers. | ||
| 6 | |||
| 7 | * Keyboard Maintainer: [Naoto Takai](https://github.com/takai) | ||
| 8 | * Hardware Supported: Choco60 PCB, Pro Micro supported | ||
| 9 | * Hardware Availability: https://keys.recompile.net/projects/choco60/ | ||
| 10 | |||
| 11 | Make example for this keyboard (after setting up your build environment): | ||
| 12 | |||
| 13 | make choco60/rev1:default | ||
| 14 | |||
| 15 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | ||
diff --git a/keyboards/choco60/rev1/rev1.c b/keyboards/choco60/rev1/rev1.c new file mode 100644 index 000000000..fe60477e3 --- /dev/null +++ b/keyboards/choco60/rev1/rev1.c | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* Copyright 2019 Naoto Takai | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include "rev1.h" | ||
diff --git a/keyboards/choco60/rev1/rev1.h b/keyboards/choco60/rev1/rev1.h new file mode 100644 index 000000000..fa161f267 --- /dev/null +++ b/keyboards/choco60/rev1/rev1.h | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | /* Copyright 2020 Naoto Takai | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
diff --git a/keyboards/choco60/rev1/rules.mk b/keyboards/choco60/rev1/rules.mk new file mode 100644 index 000000000..12453d839 --- /dev/null +++ b/keyboards/choco60/rev1/rules.mk | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = caterina | ||
| 6 | |||
| 7 | # Build Options | ||
| 8 | # change yes to no to disable | ||
| 9 | # | ||
| 10 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | ||
| 11 | MOUSEKEY_ENABLE = no # Mouse keys | ||
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 13 | CONSOLE_ENABLE = no # Console for debug | ||
| 14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 18 | NKRO_ENABLE = no # USB Nkey Rollover | ||
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | ||
| 22 | AUDIO_ENABLE = no # Audio output | ||
| 23 | |||
| 24 | SPLIT_KEYBOARD = yes # Enable split keyboard | ||
diff --git a/keyboards/choco60/rev2/config.h b/keyboards/choco60/rev2/config.h new file mode 100644 index 000000000..378323497 --- /dev/null +++ b/keyboards/choco60/rev2/config.h | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2020 Naoto Takai | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #pragma once | ||
| 19 | |||
| 20 | /* | ||
| 21 | * Keyboard Matrix Assignments | ||
| 22 | * | ||
| 23 | * Change this to how you wired your keyboard | ||
| 24 | * COLS: AVR pins used for columns, left to right | ||
| 25 | * ROWS: AVR pins used for rows, top to bottom | ||
| 26 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
| 27 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
| 28 | * | ||
| 29 | */ | ||
| 30 | #define MATRIX_ROW_PINS { C5, C4, B6, B7, C7 } | ||
| 31 | #define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 } | ||
| 32 | #define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0 } | ||
| 33 | #define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 } | ||
| 34 | #define UNUSED_PINS | ||
| 35 | |||
| 36 | /* COL2ROW, ROW2COL*/ | ||
| 37 | #define DIODE_DIRECTION COL2ROW | ||
| 38 | |||
| 39 | /* | ||
| 40 | * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. | ||
| 41 | */ | ||
| 42 | #define SOFT_SERIAL_PIN D0 | ||
| 43 | #define SPLIT_HAND_PIN D1 | ||
| 44 | |||
| 45 | #define SPLIT_USB_DETECT | ||
diff --git a/keyboards/choco60/rev2/readme.md b/keyboards/choco60/rev2/readme.md new file mode 100644 index 000000000..6e3d4dd2e --- /dev/null +++ b/keyboards/choco60/rev2/readme.md | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # Choco60 Rev.2 | ||
| 2 | |||
| 3 |  | ||
| 4 | |||
| 5 | A 60% split keyboard for programmers. | ||
| 6 | |||
| 7 | * Keyboard Maintainer: [Naoto Takai](https://github.com/takai) | ||
| 8 | * Hardware Supported: Choco60 PCB Rev.2 | ||
| 9 | * Hardware Availability: https://keys.recompile.net/projects/choco60/ | ||
| 10 | |||
| 11 | Make example for this keyboard (after setting up your build environment): | ||
| 12 | |||
| 13 | make choco60/rev2:default | ||
| 14 | |||
| 15 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | ||
diff --git a/keyboards/choco60/rev2/rev2.c b/keyboards/choco60/rev2/rev2.c new file mode 100644 index 000000000..5eabb33ac --- /dev/null +++ b/keyboards/choco60/rev2/rev2.c | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* Copyright 2020 Naoto Takai | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include "rev2.h" | ||
diff --git a/keyboards/choco60/rev2/rev2.h b/keyboards/choco60/rev2/rev2.h new file mode 100644 index 000000000..fa161f267 --- /dev/null +++ b/keyboards/choco60/rev2/rev2.h | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | /* Copyright 2020 Naoto Takai | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #pragma once | ||
| 18 | |||
| 19 | #include "quantum.h" | ||
diff --git a/keyboards/choco60/rev2/rules.mk b/keyboards/choco60/rev2/rules.mk new file mode 100644 index 000000000..b93b9467a --- /dev/null +++ b/keyboards/choco60/rev2/rules.mk | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u2 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = atmel-dfu | ||
| 6 | |||
| 7 | # Build Options | ||
| 8 | # change yes to no to disable | ||
| 9 | # | ||
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | ||
| 11 | MOUSEKEY_ENABLE = no # Mouse keys | ||
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 13 | CONSOLE_ENABLE = no # Console for debug | ||
| 14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 18 | NKRO_ENABLE = no # USB Nkey Rollover | ||
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
| 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | ||
| 22 | AUDIO_ENABLE = no # Audio output | ||
| 23 | |||
| 24 | SPLIT_KEYBOARD = yes | ||
diff --git a/keyboards/choco60/rules.mk b/keyboards/choco60/rules.mk index 87e3e3e8c..8f712e359 100644 --- a/keyboards/choco60/rules.mk +++ b/keyboards/choco60/rules.mk | |||
| @@ -1,34 +1 @@ | |||
| 1 | # MCU name | DEFAULT_FOLDER = choco60/rev1 | |
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | # Teensy halfkay | ||
| 6 | # Pro Micro caterina | ||
| 7 | # Atmel DFU atmel-dfu | ||
| 8 | # LUFA DFU lufa-dfu | ||
| 9 | # QMK DFU qmk-dfu | ||
| 10 | # ATmega32A bootloadHID | ||
| 11 | # ATmega328P USBasp | ||
| 12 | BOOTLOADER = caterina | ||
| 13 | |||
| 14 | # Build Options | ||
| 15 | # change yes to no to disable | ||
| 16 | # | ||
| 17 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | ||
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | ||
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 20 | CONSOLE_ENABLE = no # Console for debug | ||
| 21 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 22 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 23 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 25 | NKRO_ENABLE = no # USB Nkey Rollover | ||
| 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default | ||
| 27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | ||
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | ||
| 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | ||
| 33 | |||
| 34 | SPLIT_KEYBOARD = yes # Enable split keyboard | ||
