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.

Sign up for GitHub

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

Jump to bottom

[keyboard] Jian keyboard #8914

Merged
merged 77 commits into from
Jun 18, 2020
Merged

[keyboard] Jian keyboard #8914

merged 77 commits into from
Jun 18, 2020

Conversation

KGOH
Copy link
Contributor

@KGOH KGOH commented Apr 25, 2020 •
edited
Loading

Ergonomic 44-key split keyboard

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project.
  • 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).

KGOH added 30 commits December 14, 2018 05:14
@KGOH
Jian an ergo 40% keyboard
d3d30b7
@KGOH
changed bootloader
3a54716
@KGOH
returned caterina back
40dd76f
@KGOH
turned off breathing
24d4ab5
@KGOH
moved all backlight settings on one layer
f11ad8c
@KGOH
added rgb val lim and SYMM_LAYOUT
a40ec33
@KGOH
removedrise lower toggles
676963b
@KGOH
moved all advanced features into advanced layout
25ef98a
@KGOH
removed defines from default layout to make it more compact
ae980f8
@KGOH
reformatted default layout
05cfcbe
@KGOH
reformatted default layout
9561123
@KGOH
Merge branch 'dev_branch' of https://github.com/KGOH/qmk_firmware int…
2b02ba0 
…o dev_branch
@KGOH
Merge branch 'master' into dev_branch
8a0a445
@KGOH
Merge pull request #1 from qmk/master
f431182 
Sync fork with base
@KGOH
Merge branch 'master' into dev_branch
f6f46ca
@KGOH
Merge pull request #2 from qmk/master
59f55fc 
update
@KGOH
updated num/caps/scroll leds code
22bd146
@KGOH
fixed typo
5167367
@KGOH
fixed typo
6d96e7a
@KGOH
swapped + and = on lower
e16c84d
@KGOH
added bl_tog to bl settings
68111ae
@KGOH
fixed typo
e11fd25
@KGOH
removed autoshift modifiers
810ba6c
@KGOH
added rgbflags
1cd9d02
@KGOH
Merge pull request #3 from qmk/master
6c79934 
sync
@KGOH
Merge pull request #4 from KGOH/master
808ec0a 
sync
@KGOH
added sleep handling and split rgb animations
bc97654
@KGOH
Merge pull request #5 from qmk/master
a8f2ee2 
d
@KGOH
Merge pull request #7 from KGOH/master
f9f7208 
sync
@KGOH
added nsrev1
49bb2fd
@KGOH
Copy link
Contributor Author

KGOH commented May 21, 2020

@fauxpark I've applied your changes

@drashna drashna requested a review from a team May 25, 2020 19:47
tzarc
tzarc requested changes May 27, 2020
View reviewed changes
Copy link
Member

@tzarc tzarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a bunch of minor cleanup.

keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/advanced/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/advanced/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/advanced/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/advanced/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/advanced/keymap.c Outdated Show resolved Hide resolved
@KGOH
Copy link
Contributor Author

KGOH commented Jun 1, 2020

@tzarc I've applied your changes

@tzarc tzarc requested a review from fauxpark June 9, 2020 22:19
@tzarc tzarc requested a review from a team June 9, 2020 22:19
fauxpark
fauxpark requested changes Jun 17, 2020
View reviewed changes
keyboards/jian/nsrev2/nsrev2.h Outdated Show resolved Hide resolved
keyboards/jian/nsrev2/nsrev2.h Outdated Show resolved Hide resolved
keyboards/jian/handwired/handwired.h Outdated Show resolved Hide resolved
keyboards/jian/handwired/handwired.h Outdated Show resolved Hide resolved
keyboards/jian/info.json Outdated Show resolved Hide resolved
keyboards/jian/rev2/rev2.h Outdated Show resolved Hide resolved
keyboards/jian/rev2/rev2.h Outdated Show resolved Hide resolved
keyboards/jian/rev2/rev2.h Outdated Show resolved Hide resolved
keyboards/jian/handwired/handwired.h Outdated Show resolved Hide resolved
keyboards/jian/nsrev2/nsrev2.h Outdated Show resolved Hide resolved
fauxpark
fauxpark requested changes Jun 17, 2020
View reviewed changes
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/jian/keymaps/default/keymap.c Outdated Show resolved Hide resolved
fauxpark
fauxpark requested changes Jun 17, 2020
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should hopefully fix the build failure, sorry about that.

keyboards/jian/jian.h Show resolved Hide resolved
keyboards/jian/rev1/rev1.h Outdated Show resolved Hide resolved
@drashna drashna merged commit 157319f into qmk:master Jun 18, 2020
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jun 18, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
b93d5c8 
* 'master' of https://github.com/qmk/qmk_firmware: (36 commits)
  [Keyboard] Jian keyboard (qmk#8914)
  Implement game mode layer for dcompact on planck (qmk#9402)
  [Keymap] new keymap for XD75 (qmk#8675)
  Clean up Tap Dance docs (qmk#9372)
  CLI: Add ATmega328 and ATtiny85 to supported CPUs (qmk#9371)
  Fix error_log complaint about clueboard/66_hotswap/gen1 layout macro (qmk#9400)
  Nebula65 (qmk#9368)
  added 4x12 (qmk#9411)
  [Keymap] Add froggy keymap with 106/109 (JP) settings for helix keyboard (qmk#8967)
  [Keymap] csc027/keymap-updates (qmk#9420)
  Add VIA support to keebio/nyquist (qmk#9399)
  [Keymap] Drashna's Keymap Update - Display Edition (qmk#9282)
  [Keymap] Add "shwilliam" Preonic keymap (qmk#9409)
  HID Liberation Device Refactor and Configurator layout support (qmk#9394)
  [Keyboard] Fix Configurator layout data for handwired/1800fl (qmk#9393)
  [Keyboard] Fix Configurator layout data for acheron/elongate (qmk#9392)
  Change ?= to = in keyboard rules.mk (qmk#9390)
  [Docs] Fix link to mod_tap.md in the one_shot_keys.md file (qmk#9380)
  [Keyboard] Hub16 keymap bugfix (qmk#9345)
  [Keyboard] Add Eon75 (qmk#9333)
  ...
@KGOH KGOH deleted the jian branch June 30, 2020 21:45
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@KGOH @zvecr
@drashna @fauxpark @tzarc @jakobaa
[Keyboard] Jian keyboard (qmk#8914)
19fe504 
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@tzarc tzarc tzarc approved these changes

@drashna drashna drashna approved these changes

@zvecr zvecr Awaiting requested review from zvecr

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@KGOH @drashna @tzarc @fauxpark @zvecr