Add Durgod Taurus K310 keyboard #12314

dkjer · 2021-03-21T08:20:46Z

Add support for new keyboard: Durgod Taurus K310 (non-backlit) full-sized 104/105-key ANSI/ISO.

This PR is based off @tylert's PR #12274, and includes additional changes to share code with the Durgod K320 as well as improvements and cleanup from @nomis.

Description

This PR contains the following changes:

Add support for Durgod Taurus K310 non-backlit full-sized 104/105-key keyboards.
Refactoring shared durgod/k310 and durgod/k320 code into durgod/k3x0.
Renaming default_toggle_mac_windows to chimera keymap
Enable LTO for all durgod/k3x0 keymaps
Jump to bootloader when the hardware reset button is pressed
Add Durgod K3x0 LAYOUT_tkl to support qmk_configurator for K320

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project: C, Python
I have read the PR Checklist document and have made the appropriate changes.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

dkjer · 2021-03-21T08:50:10Z

Once this code makes its way to master, I will submit a PR to qmk/qmk_configurator with matching changes: https://github.com/dkjer/qmk_configurator/tree/durgod_k3x0

nomis

The info.json label for the ` key needs fixing for the ISO layout.

I don't know how the 2 and 3 keys are supposed to be labelled. Other keyboards have @, # which are the scan codes but it means there are two keys labelled #. I don't know why these aren't just labelled with the numbers?

I've not reviewed the mac layouts.

tylert

LGTM! 👍 I very much like the look of the cleaner diagrams in the comments too.

keyboards/durgod/k3x0/config.h

keyboards/durgod/k3x0/keymaps/chimera/keymap.c

tylert · 2021-03-21T21:05:10Z

For reference, the VIA work for K320 was merged in the-via/keyboards#588.

dkjer · 2021-03-22T00:29:21Z

The info.json label for the ` key needs fixing for the ISO layout.

I don't know how the 2 and 3 keys are supposed to be labelled. Other keyboards have @, # which are the scan codes but it means there are two keys labelled #. I don't know why these aren't just labelled with the numbers?

I've not reviewed the mac layouts.

@nomis I don't believe the labels really matter in the info.json files; I think they are just there for to make it more human readable (please correct me if I'm wrong). We could replace the 2nd # with NUHS, and the \\ with NUBS if that make mores sense?

dkjer · 2021-03-22T01:52:08Z

For reference, the VIA work for K320 was merged in the-via/keyboards#588.

I have a VIA branch ready to add K310 support, as well: https://github.com/dkjer/keyboards/tree/durgod_k310

@tylert Would you mind testing https://github.com/dkjer/keyboards/blob/durgod_k310/src/durgod/k310/k310.json out on a K310 to verify the numpad section of that via keymap has the correct matrix values?

nomis · 2021-03-22T08:51:50Z

The info.json file content doesn't really matter for my use; it appears to be ok to do it this way for other keyboards.

tylert · 2021-03-22T17:03:20Z

@tylert Would you mind testing https://github.com/dkjer/keyboards/blob/durgod_k310/src/durgod/k310/k310.json out on a K310 to verify the numpad section of that via keymap has the correct matrix values?

Well, the via QMK keymap works fine on an ANSI K310 keyboard when used as a regular keyboard but the 1.3.1 (.deb) version of VIA doesn't automatically detect the K310 and I'm not sure how to build VIA from source yet or sneak a JSON file into the installed version of VIA so I'm unable to do much on the VIA front at the moment. (There might be a minor bug at LGUI on layer1 in the VIA keyboard repo for the ISO K320. The VIA 1.3.1 AppImage also comletely fails to run on Debian 10.x amd64 and the .deb has quite a few rough edges too.)

I'll be doing some more verification of the rest of the QMK keymaps built from commit e631cf618 shortly on the ANSI K310 and K320 keyboards and look at fighting with VIA again later.

dkjer · 2021-03-22T19:07:10Z

Well, the via QMK keymap works fine on an ANSI K310 keyboard when used as a regular keyboard but the 1.3.1 (.deb) version of VIA doesn't automatically detect the K310 and I'm not sure how to build VIA from source yet or sneak a JSON file into the installed version of VIA so I'm unable to do much on the VIA front at the moment.

On the Mac version of VIA, you can 'Import Keymap' and just give it the k310.json file from that branch. It worked for me on a K320, but of course I couldn't check the numpad section.

tylert · 2021-03-22T19:14:56Z

Well, the via QMK keymap works fine on an ANSI K310 keyboard when used as a regular keyboard but the 1.3.1 (.deb) version of VIA doesn't automatically detect the K310 and I'm not sure how to build VIA from source yet or sneak a JSON file into the installed version of VIA so I'm unable to do much on the VIA front at the moment.

On the Mac version of VIA, you can 'Import Keymap' and just give it the k310.json file from that branch. It worked for me on a K320, but of course I couldn't check the numpad section.

Ah, that worked great, thanks. Yes, VIA recognized the via-enabled K310 with that imported JSON and the key tester and matrix tester checks out on all keys, including the numpad.

The LGUI key on layer1 shows up as 0x5d2b just as it does on the K320.

dkjer · 2021-03-22T19:48:37Z

The LGUI key on layer1 shows up as 0x5d2b just as it does on the K320.

I don't think there is a way around that since VIA doesn't know about our custom keycodes, besides removing the Windows-Key lock functionality from VIA. I don't think it hurts anything, and it should be able to be overridden if someone doesn't want that functionality.

drashna · 2021-04-19T05:50:05Z

I don't think there is a way around that since VIA doesn't know about our custom keycodes, besides removing the Windows-Key lock functionality from VIA. I don't think it hurts anything, and it should be able to be overridden if someone doesn't want that functionality.

Actually, there is. VIA supports up to 16 custom keycodes. If you use USER00 instead of SAFE_RANGE when via is enabled, there is a "customKeycodes" section that is supported for the VIA json file (if you check out the ploopy mouse/trackball you can see this).

dkjer · 2021-04-19T05:52:04Z

I don't think there is a way around that since VIA doesn't know about our custom keycodes, besides removing the Windows-Key lock functionality from VIA. I don't think it hurts anything, and it should be able to be overridden if someone doesn't want that functionality.

Actually, there is. VIA supports up to 16 custom keycodes. If you use USER00 instead of SAFE_RANGE when via is enabled, there is a "customKeycodes" section that is supported for the VIA json file (if you check out the ploopy mouse/trackball you can see this).

Nice, I’ll take a look at that. Thanks!

drashna · 2021-04-19T06:19:58Z

It's a bit messy, but:

qmk_firmware/keyboards/ploopyco/trackball/trackball.h

Lines 57 to 69 in ef6802c

    
           enum ploopy_keycodes { 
        
           #ifdef VIA_ENABLE 
        
               DPI_CONFIG = USER00, 
        
           #else 
        
               DPI_CONFIG = SAFE_RANGE, 
        
           #endif 
        
               DRAG_SCROLL, 
        
           #ifdef VIA_ENABLE 
        
               PLOOPY_SAFE_RANGE = SAFE_RANGE, 
        
           #else 
        
               PLOOPY_SAFE_RANGE, 
        
           #endif 
        
           };

And the via repo:
https://github.com/the-via/keyboards/blob/3ccde52851f22785d9eaf098cdd353feb1a6559d/src/ploopyco/trackball/trackball.json#L6-L9

dkjer · 2021-04-20T08:05:16Z

Rebase off develop

Converted WinLock key to a custom VIA key. Fixed default_mac layout.

New VIA keyboard changes to match: https://github.com/dkjer/keyboards/tree/durgod_k310

dkjer · 2021-05-11T05:58:40Z

Rebasing off develop

tylert · 2021-06-02T23:47:06Z

Is there anything else preventing this PR from being merged?

… keyboards.

… durgod/k3x0. Combining chimera keymap with default_toggle_mac_windows keymap

* Remove NUM_LOCK from the K320 * Remove row 8 from the K320 * Enable LTO for all keymaps ** This increases the matrix scan rate by making it more efficient * Jump to bootloader when the hardware reset button is pressed * Add extra hardware reset button check ** The interrupt is edge-triggered so check that it's not already pressed

* Moving current impl to 'base' variant to make space for future variants * Fixing compiler error due to SH_T define * Adding custom VIA WinLock key

dkjer · 2021-06-20T09:58:12Z

Rebasing off develop

keyboards/durgod/k3x0/readme.md

keyboards/durgod/k3x0/k3x0.h

keyboards/durgod/k3x0/keymaps/chimera/keymap.c

…and k320.h instead

dkjer · 2021-07-10T00:05:35Z

It doesn't currently have support for wireless, though it might work when plugged in via usb

…

On Thu, Jul 8, 2021 at 4:16 AM Ian Tsai ***@***.***> wrote: Hi, thanks for your effort on this. Does this work on k310w? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#12314 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAATT7XE6E3XB2BLJIOGXFLTWWCI3ANCNFSM4ZRJ6SCA> .

b10102016 · 2021-07-10T19:34:49Z

Thanks for your reply. After asking the question, I do a little bit google search. It seems that the k310w using a different chip that is an BLE SoC from NXP. So I decide to replace my old mech KB's MCU with other MCU :P Anyway, thanks for your help ~ Donald Kjer ***@***.***> 於 2021年7月10日週六上午8:05寫道：

…

It doesn't currently have support for wireless, though it might worked when plugged in via usb - Don On Thu, Jul 8, 2021 at 4:16 AM Ian Tsai ***@***.***> wrote: > Hi, > thanks for your effort on this. > Does this work on k310w? > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <#12314 (comment)>, > or unsubscribe > < https://github.com/notifications/unsubscribe-auth/AAATT7XE6E3XB2BLJIOGXFLTWWCI3ANCNFSM4ZRJ6SCA > > . > — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#12314 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABRACZ7FWWMX6BDC3Z2WFZ3TW6FFVANCNFSM4ZRJ6SCA> .

drashna · 2021-07-22T07:08:49Z

Thanks!

* qmk/develop: (141 commits) Implement GPIO abstraction for atsam (qmk#13567) [Keyboard][Bug] Add timer_avr to includes for broken builds (qmk#13641) [Keyboard] adds new revision: dztech/dz60rgb/v2_1 (qmk#13636) [Keyboard] Fixing info.json for h0oni/hotduck (qmk#13640) [Keyboard] Ymd40v2new layouts and fixed per-switch backlight (qmk#13622) [Bug] Develop - DC01 left (qmk#13597) [Keyboard] Fix clawsome/hatchback and reviung5 compile issues (qmk#13607) [Keyboard] add ogurec (qmk#13242) [Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314) [Keyboard] Updated keyboard & keymaps (qmk#12667) [Keyboard] add SPRH keyboard (qmk#12999) Retain brightness with lighting layers (qmk#13025) [Keyboard] Add keypad Satxri6key (qmk#13423) [Keyboard] Initial Tron Guy Labs keyboard implementation. (qmk#13438) [Keyboard] Add Ristretto Keyboard (qmk#13479) [Keyboard] New Keyboard - OBE (qmk#13545) [Keyboard] Add personal planck keymap (qmk#13635) [Keymap] narze/xd004 (qmk#13634) [Keyboard] Add h0oni hotduck keyboard (qmk#13609) Fix API generation failure caused by GRS-70EC (qmk#13631) ...

tylert · 2021-07-22T23:23:53Z

Thanks again to all the awesome QMK contributors.

@dkjer I'll retest all the ANSI K320 and ANSI K310 "chimera" and "typhon" keymaps again in a few days off the latest develop branch and I'll give it another try after it makes it to master too (hopefully during the next "breaking change" release in a mere few weeks :); Aug 28, 2021 perhaps?). I'm not expecting any surprises but I'll keep you posted.

I might give that VIA stuff another try sometime after https://github.com/dkjer/keyboards/tree/durgod_k310 gets merged too.

Co-authored-by: Tyler Tidman <[email protected]> Co-authored-by: Simon Arlott <sa.me.uk>

github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Mar 21, 2021

dkjer force-pushed the durgod_k3x0 branch from 4e3d9af to e631cf6 Compare March 21, 2021 08:33

nomis suggested changes Mar 21, 2021

View reviewed changes

tylert approved these changes Mar 21, 2021

View reviewed changes

keyboards/durgod/k3x0/config.h Show resolved Hide resolved

keyboards/durgod/k3x0/keymaps/chimera/keymap.c Show resolved Hide resolved

drashna approved these changes Apr 19, 2021

View reviewed changes

dkjer force-pushed the durgod_k3x0 branch from 27e4911 to ab9471e Compare April 20, 2021 07:54

github-actions bot added the core label Apr 20, 2021

tylert mentioned this pull request May 5, 2021

Add new 'Typhon' keymap for Durgod K320/K310 based on 'Chimera' dkjer/qmk_firmware#6

Merged

dkjer force-pushed the durgod_k3x0 branch from 566efaa to b1ee8e6 Compare May 11, 2021 05:58

dkjer force-pushed the durgod_k3x0 branch from b1ee8e6 to 926a63f Compare May 12, 2021 00:40

github-actions bot removed the core label May 12, 2021

drashna requested a review from a team May 14, 2021 02:17

drashna added the awaiting review label Jun 7, 2021

tylert and others added 5 commits June 20, 2021 02:42

Add support for Durgod Taurus K310 non-backlit full-sized 104/105-key…

6197704

… keyboards.

Durgod K3x0: Refactoring shared durgod/k310 and durgod/k320 code into…

066bf5f

… durgod/k3x0. Combining chimera keymap with default_toggle_mac_windows keymap

Adding Durgod K3x0 LAYOUT_tkl to support qmk_configurator for K320

ec3c67f

* Moving current impl to 'base' variant to make space for future variants * Fixing compiler error due to SH_T define * Adding custom VIA WinLock key

Add new 'Typhon' keymap for Durgod K320/K310 based on 'Chimera'

625545a

dkjer force-pushed the durgod_k3x0 branch from 926a63f to 625545a Compare June 20, 2021 09:57

fauxpark requested changes Jul 7, 2021

View reviewed changes

keyboards/durgod/k3x0/readme.md Outdated Show resolved Hide resolved

keyboards/durgod/k3x0/readme.md Outdated Show resolved Hide resolved

keyboards/durgod/k3x0/k3x0.h Outdated Show resolved Hide resolved

keyboards/durgod/k3x0/keymaps/chimera/keymap.c Outdated Show resolved Hide resolved

dkjer added 2 commits July 6, 2021 23:44

Removing K3x0_ROW_8 macro from durgod/k3x0 and splitting into k310.h …

aeceeaf

…and k320.h instead

Removing NBSPs from k3x0 keymap comments

46e13ea

dkjer requested a review from fauxpark July 7, 2021 21:33

fauxpark approved these changes Jul 8, 2021

View reviewed changes

fauxpark requested a review from a team July 8, 2021 12:18

drashna merged commit 13a5149 into qmk:develop Jul 22, 2021

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021

[Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314)

0048b56

Co-authored-by: Tyler Tidman <[email protected]> Co-authored-by: Simon Arlott <sa.me.uk>

BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024

[Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314)

d0f8c09

Co-authored-by: Tyler Tidman <[email protected]> Co-authored-by: Simon Arlott <sa.me.uk>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Durgod Taurus K310 keyboard #12314

Add Durgod Taurus K310 keyboard #12314

dkjer commented Mar 21, 2021

dkjer commented Mar 21, 2021

nomis left a comment

tylert left a comment

tylert commented Mar 21, 2021

dkjer commented Mar 22, 2021 •

edited

Loading

dkjer commented Mar 22, 2021 •

edited

Loading

nomis commented Mar 22, 2021

tylert commented Mar 22, 2021

dkjer commented Mar 22, 2021

tylert commented Mar 22, 2021

dkjer commented Mar 22, 2021

drashna commented Apr 19, 2021

dkjer commented Apr 19, 2021

drashna commented Apr 19, 2021

dkjer commented Apr 20, 2021

dkjer commented May 11, 2021

tylert commented Jun 2, 2021

dkjer commented Jun 20, 2021

dkjer commented Jul 10, 2021 via email •

edited

Loading

b10102016 commented Jul 10, 2021 via email

drashna commented Jul 22, 2021

tylert commented Jul 22, 2021

Add Durgod Taurus K310 keyboard #12314

Add Durgod Taurus K310 keyboard #12314

Conversation

dkjer commented Mar 21, 2021

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

dkjer commented Mar 21, 2021

nomis left a comment

Choose a reason for hiding this comment

tylert left a comment

Choose a reason for hiding this comment

tylert commented Mar 21, 2021

dkjer commented Mar 22, 2021 • edited Loading

dkjer commented Mar 22, 2021 • edited Loading

nomis commented Mar 22, 2021

tylert commented Mar 22, 2021

dkjer commented Mar 22, 2021

tylert commented Mar 22, 2021

dkjer commented Mar 22, 2021

drashna commented Apr 19, 2021

dkjer commented Apr 19, 2021

drashna commented Apr 19, 2021

dkjer commented Apr 20, 2021

dkjer commented May 11, 2021

tylert commented Jun 2, 2021

dkjer commented Jun 20, 2021

dkjer commented Jul 10, 2021 via email • edited Loading

b10102016 commented Jul 10, 2021 via email

drashna commented Jul 22, 2021

tylert commented Jul 22, 2021

dkjer commented Mar 22, 2021 •

edited

Loading

dkjer commented Mar 22, 2021 •

edited

Loading

dkjer commented Jul 10, 2021 via email •

edited

Loading