Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keyboard treadstone32 #5888

Merged
merged 18 commits into from
May 19, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
modified review point
  • Loading branch information
marksard committed May 17, 2019
commit 8897a7cfb572f7daf074c79dcc8f69504a00855d
2 changes: 1 addition & 1 deletion keyboards/treadstone32/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0010
#define MANUFACTURER marksard
#define PRODUCT treadstone32
#define DESCRIPTION Minimal Symmetrical Staggerd 32 Keys Keyboard
#define DESCRIPTION Minimal Symmetrical staggered 32-Key Keyboard

/* key matrix size */
#define MATRIX_ROWS 8
Expand Down
1 change: 0 additions & 1 deletion keyboards/treadstone32/keymaps/default/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

// place overrides here
#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT

#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
Expand Down
26 changes: 5 additions & 21 deletions keyboards/treadstone32/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@ enum custom_keycodes {
// Layer Mode aliases
#define KC_MLAD MO(_ADJUST)

#define KC_KANJI KANJI

// Adjust layer keys
#define KC_RST RESET
#define KC_LRST RGBRST
#define KC_LTOG RGB_TOG
#define KC_LHUI RGB_HUI
#define KC_LHUD RGB_HUD
#define KC_LSAI RGB_SAI
#define KC_LSAD RGB_SAD
#define KC_LVAI RGB_VAI
#define KC_LVAD RGB_VAD
#define KC_LMOD RGB_MOD
#define KC_KNRM AG_NORM
#define KC_KSWP AG_SWAP

// Base layer mod tap
#define KC_A_SF LSFT_T(KC_A)
#define KC_Z_CT LCTL_T(KC_Z)
Expand Down Expand Up @@ -96,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_F6SF, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_11CT, KC_12AL, KC_ESC, KC_TAB, KC_KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV,
KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, KC_MLAD
// `---------|---------'
Expand All @@ -116,11 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_ADJUST] = LAYOUT(
//,---------------------------------------------------------------------------------------------------.
KC_RST, KC_LRST, KC_KNRM, KC_KSWP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_LTOG, KC_LHUI, KC_LSAI, KC_LVAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_LMOD, KC_LHUD, KC_LSAD, KC_LVAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, _______
// `---------|---------'
Expand Down Expand Up @@ -179,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return result;
}

void matrix_init_user(void) {
void keyboard_post_init_user(void) {
#ifdef RGBLIGHT_ENABLE
RGB_current_mode = rgblight_config.mode;
#endif
Expand Down
1 change: 0 additions & 1 deletion keyboards/treadstone32/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
TAP_DANCE_ENABLE = no

# If your custom treadstone32 pcb, you can rewrite to yes.
Expand Down
1 change: 0 additions & 1 deletion keyboards/treadstone32/keymaps/like_jis/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

// place overrides here
#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT

#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
Expand Down
26 changes: 5 additions & 21 deletions keyboards/treadstone32/keymaps/like_jis/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@ enum custom_keycodes {
// Layer Mode aliases
#define KC_MLAD MO(_ADJUST)

#define KC_KANJI KANJI

// Adjust layer keys
#define KC_RST RESET
#define KC_LRST RGBRST
#define KC_LTOG RGB_TOG
#define KC_LHUI RGB_HUI
#define KC_LHUD RGB_HUD
#define KC_LSAI RGB_SAI
#define KC_LSAD RGB_SAD
#define KC_LVAI RGB_VAI
#define KC_LVAD RGB_VAD
#define KC_LMOD RGB_MOD
#define KC_KNRM AG_NORM
#define KC_KSWP AG_SWAP

// Base layer mod tap
#define KC_A_SF LSFT_T(KC_A)
#define KC_Z_CT LCTL_T(KC_Z)
Expand Down Expand Up @@ -96,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_F6SF, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSSF,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_11CT, KC_12AL, KC_ESC, KC_TAB, KC_KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_RO,
KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_RO,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, KC_MLAD
// `---------|---------'
Expand All @@ -116,11 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_ADJUST] = LAYOUT(
//,---------------------------------------------------------------------------------------------------.
KC_RST, KC_LRST, KC_KNRM, KC_KSWP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_LTOG, KC_LHUI, KC_LSAI, KC_LVAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
KC_LMOD, KC_LHUD, KC_LSAD, KC_LVAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, _______
// `---------|---------'
Expand Down Expand Up @@ -179,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return result;
}

void matrix_init_user(void) {
void keyboard_post_init_user(void) {
#ifdef RGBLIGHT_ENABLE
RGB_current_mode = rgblight_config.mode;
#endif
Expand Down
1 change: 0 additions & 1 deletion keyboards/treadstone32/keymaps/like_jis/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
TAP_DANCE_ENABLE = no

# If your custom treadstone32 pcb, you can rewrite to yes.
Expand Down
2 changes: 1 addition & 1 deletion keyboards/treadstone32/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![treadstone32](https://github.com/marksard/Keyboards/raw/master/_image/20190421-P4210001.jpg)

A 32 keys Symmetric Staggered keyboard.
A 32-key Symmetric staggered keyboard.

Keyboard Maintainer: [marksard](https://github.com/marksard)
Hardware Supported: The PCBs, controllers supported
Expand Down
3 changes: 1 addition & 2 deletions keyboards/treadstone32/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
Expand All @@ -61,5 +61,4 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
LEADER_ENABLE = no
SUBPROJECT_rev1 = no