Skip to content

Commit

Permalink
[Keyboard] Think 6.5 (qmk#7199)
Browse files Browse the repository at this point in the history 
* generated files

* create the physical and electrical matrix, thanks noroadsleft

* add an appropriate keymap

* add qmk configurator support

* add readme

* add keyboard configuration and rules

* move over the think6.5 to the gray_studio directory

* move to hotswap in anticipation of non hotswap pcb support

* update readme to have the correct make path

* rename to hotswap

* add community layout support by using the LAYOUT_65_ansi_blocker LAYOUT macro name

* thanks to cygnus for pointing out the solder json file to me. This commit is pretty much the same as the hotswap as it uses the same pins and switch matrix.

* update readme to state that LAYOUT_65_ansi_blocker works for both hotswap and solder.

* wrong pound include

* add LED support. Soldered PCB only supports caps lock LED

* add readme notes for indicator led

* Update keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c

Co-Authored-By: fauxpark <[email protected]>

* Update keyboards/gray_studio/think65/hotswap/rules.mk

Co-Authored-By: fauxpark <[email protected]>

* Update keyboards/gray_studio/think65/hotswap/rules.mk

Co-Authored-By: fauxpark <[email protected]>

* Update keyboards/gray_studio/think65/solder/keymaps/default/keymap.c

Co-Authored-By: fauxpark <[email protected]>

* Update keyboards/gray_studio/think65/solder/rules.mk

Co-Authored-By: fauxpark <[email protected]>

* Update keyboards/gray_studio/think65/solder/rules.mk

Co-Authored-By: fauxpark <[email protected]>
  • Loading branch information
@mechmerlin @fauxpark @drashna
2 people authored and drashna committed Oct 30, 2019
1 parent e258b10 commit b1c2bf0
Show file tree
Hide file tree
Showing 18 changed files with 816 additions and 0 deletions.
72 changes: 72 additions & 0 deletions keyboards/gray_studio/think65/hotswap/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
Copyright 2019 MechMerlin
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 "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
#define MANUFACTURER Gray Studio
#define PRODUCT THINK6.5
#define DESCRIPTION 65% 6.5 degree custom keyboard

/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16

/*
* 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 { B0, B1, B2, B3, E6 }
#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6 }

#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
#define RGBLIGHT_ANIMATIONS
// /*== or choose animations ==*/
// #define RGBLIGHT_EFFECT_BREATHING
// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
// #define RGBLIGHT_EFFECT_SNAKE
// #define RGBLIGHT_EFFECT_KNIGHT
// #define RGBLIGHT_EFFECT_CHRISTMAS
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif

// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
71 changes: 71 additions & 0 deletions keyboards/gray_studio/think65/hotswap/hotswap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/* Copyright 2019 MechMerlin
*
* 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/>.
*/
#include "hotswap.h"

// Optional override functions below.
// You can leave any or all of these undefined.
// These are only required if you want to perform custom actions.


void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up

setPinOutput(C6);
setPinOutput(C7);
setPinOutput(F7);

matrix_init_user();
}

void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)

matrix_scan_user();
}

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// put your per-action keyboard code here
// runs for every action, just before processing by the firmware

return process_record_user(keycode, record);
}

void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
writePinLow(C7);
} else {
writePinHigh(C7);
}

if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
writePinLow(C6);
} else {
writePinHigh(C6);
}

if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
writePinLow(F7);
} else {
writePinHigh(F7);
}

led_set_user(usb_led);
}

35 changes: 35 additions & 0 deletions keyboards/gray_studio/think65/hotswap/hotswap.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/* Copyright 2019 MechMerlin
*
* 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 "quantum.h"

#define LAYOUT_65_ansi_blocker( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \
{ K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
{ K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \
{ KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \
{ K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \
}

// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
82 changes: 82 additions & 0 deletions keyboards/gray_studio/think65/hotswap/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"keyboard_name": "THINK6.5",
"url": "",
"maintainer": "qmk",
"width": 16,
"height": 5,
"layouts": {
"LAYOUT_65_ansi_blocker": {
"key_count": 67,
"layout": [
{"label":"K00 (B0,D1)", "x":0, "y":0},
{"label":"K01 (B0,D0)", "x":1, "y":0},
{"label":"K02 (B0,D2)", "x":2, "y":0},
{"label":"K03 (B0,D3)", "x":3, "y":0},
{"label":"K04 (B0,D5)", "x":4, "y":0},
{"label":"K05 (B0,D4)", "x":5, "y":0},
{"label":"K06 (B0,D6)", "x":6, "y":0},
{"label":"K07 (B0,D7)", "x":7, "y":0},
{"label":"K08 (B0,B4)", "x":8, "y":0},
{"label":"K09 (B0,B5)", "x":9, "y":0},
{"label":"K0A (B0,F0)", "x":10, "y":0},
{"label":"K0B (B0,F1)", "x":11, "y":0},
{"label":"K0C (B0,B6)", "x":12, "y":0},
{"label":"K0E (B0,F5)", "x":13, "y":0, "w":2},
{"label":"K0F (B0,F6)", "x":15, "y":0},
{"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
{"label":"K12 (B1,D2)", "x":1.5, "y":1},
{"label":"K13 (B1,D3)", "x":2.5, "y":1},
{"label":"K14 (B1,D5)", "x":3.5, "y":1},
{"label":"K15 (B1,D4)", "x":4.5, "y":1},
{"label":"K16 (B1,D6)", "x":5.5, "y":1},
{"label":"K17 (B1,D7)", "x":6.5, "y":1},
{"label":"K18 (B1,B4)", "x":7.5, "y":1},
{"label":"K19 (B1,B5)", "x":8.5, "y":1},
{"label":"K1A (B1,F0)", "x":9.5, "y":1},
{"label":"K1B (B1,F1)", "x":10.5, "y":1},
{"label":"K1C (B1,B6)", "x":11.5, "y":1},
{"label":"K1D (B1,F4)", "x":12.5, "y":1},
{"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
{"label":"K1F (B1,F6)", "x":15, "y":1},
{"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
{"label":"K22 (B2,D2)", "x":1.75, "y":2},
{"label":"K23 (B2,D3)", "x":2.75, "y":2},
{"label":"K24 (B2,D5)", "x":3.75, "y":2},
{"label":"K25 (B2,D4)", "x":4.75, "y":2},
{"label":"K26 (B2,D6)", "x":5.75, "y":2},
{"label":"K27 (B2,D7)", "x":6.75, "y":2},
{"label":"K28 (B2,B4)", "x":7.75, "y":2},
{"label":"K29 (B2,B5)", "x":8.75, "y":2},
{"label":"K2A (B2,F0)", "x":9.75, "y":2},
{"label":"K2B (B2,F1)", "x":10.75, "y":2},
{"label":"K2C (B2,B6)", "x":11.75, "y":2},
{"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
{"label":"K2F (B2,F6)", "x":15, "y":2},
{"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25},
{"label":"K32 (B3,D2)", "x":2.25, "y":3},
{"label":"K33 (B3,D3)", "x":3.25, "y":3},
{"label":"K34 (B3,D5)", "x":4.25, "y":3},
{"label":"K35 (B3,D4)", "x":5.25, "y":3},
{"label":"K36 (B3,D6)", "x":6.25, "y":3},
{"label":"K37 (B3,D7)", "x":7.25, "y":3},
{"label":"K38 (B3,B4)", "x":8.25, "y":3},
{"label":"K39 (B3,B5)", "x":9.25, "y":3},
{"label":"K3A (B3,F0)", "x":10.25, "y":3},
{"label":"K3B (B3,F1)", "x":11.25, "y":3},
{"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":1.75},
{"label":"K3E (B3,F5)", "x":14, "y":3},
{"label":"K3F (B3,F6)", "x":15, "y":3},
{"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
{"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
{"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
{"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
{"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
{"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
{"label":"K4D (E6,F4)", "x":13, "y":4},
{"label":"K4E (E6,F5)", "x":14, "y":4},
{"label":"K4F (E6,F6)", "x":15, "y":4}
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
19 changes: 19 additions & 0 deletions keyboards/gray_studio/think65/hotswap/keymaps/default/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright 2019 MechMerlin
*
* 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

// place overrides here
34 changes: 34 additions & 0 deletions keyboards/gray_studio/think65/hotswap/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* Copyright 2019 MechMerlin
*
* 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/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker(
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_BSPC, KC_DEL,
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_BSLS, KC_HOME,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi_blocker(
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),

};
1 change: 1 addition & 0 deletions keyboards/gray_studio/think65/hotswap/keymaps/default/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# The default keymap for think65
15 changes: 15 additions & 0 deletions keyboards/gray_studio/think65/hotswap/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Think6.5 Hotswap

65% board with 6.5 degree angle ran by Airpotter and Oldcat. PCB Manufactured by DEMO Studio and Keyboard manufactured by Gray Studio.

Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
Hardware Supported: Think6.5 Hotswap PCB
Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=100166.0)

**Note:** The `LAYOUT_65_ansi_blocker` LAYOUT macro utilizes the same pins and switch matrix as the soldered (compatible) version. Any firmware made with this LAYOUT macro can be flashed on both the Solder (Compatible) version and the Hotswap version of the Think6.5.

Make example for this keyboard (after setting up your build environment):

make gray_studio/think65/hotswap:default

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).
40 changes: 40 additions & 0 deletions keyboards/gray_studio/think65/hotswap/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
MIDI_ENABLE = no # MIDI support
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs

LINK_TIME_OPTIMIZATION_ENABLE = yes

LAYOUTS = 65_ansi_blocker

# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/
Loading

0 comments on commit b1c2bf0

Please sign in to comment.