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

layout/community/ortho4x12/symbolic update #5274

Merged
merged 32 commits into from
Mar 3, 2019
Merged

Conversation

leico
Copy link
Contributor

@leico leico commented Feb 28, 2019

Description

update my symbolic layouts

  • addkeys
  • change raise button position
  • change reset button position

Types of Changes

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

Issues Fixed or Closed by This PR

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).

leico added 30 commits September 4, 2018 23:20
correspound permissive hold
// hold & tapping delay setting
#define TAPPING_TERM 100
// prevent stuck modifiers
#define PREVENT_STUCK_MODIFIERS
Copy link
Member

Choose a reason for hiding this comment

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

This setting should be removed, as it's no longer used.

Specifically, it's the new default behavior for QMK Firmware. And you can disable it by defining STRICT_LAYER_RELEASE instead.

Suggested change
#define PREVENT_STUCK_MODIFIERS

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@drashna , Thank you for your code review. Your work strongly help to keep my codes cleanse and clarify. my codes have been fixed.

Copy link
Member

Choose a reason for hiding this comment

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

You're very welcome. That, and a lot has changed in the last year, so it not only helps to keep the code cleaner, but also lets people know of some of these changes! :)

case R_LOWER : return LayerSwitch( record, &r_lower, l_lower, _LOWER ); break;
case L_RAISE : return LayerSwitch( record, &l_raise, r_raise, _RAISE ); break;
case R_RAISE : return LayerSwitch( record, &r_raise, l_raise, _RAISE ); break;
case L_LOWER : return LowerSwitch( record, &l_lower, r_lower ); break;
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure that all of this is needed.

Unless I'm mistaken, you could replace all of this with MO keycodes, and:

uint32_t layer_state_set_user(uint32_t state) {
  return update_tri_layer_state(state, _LOWER, _RAISE, _NEUTRAL);
}

https://docs.qmk.fm/#/ref_functions?id=update_tri_layer_statestate-x-y-z

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@drashna In this keymap, I assigned same layer button on both hands. It could predict a situlation that same layer buttons pressed at the same time. If both LOWER pressed and then one side released, LOWER layer is off although one side LOWER have been pressed. This code protect this situlation.

Copy link
Member

Choose a reason for hiding this comment

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

Okay, I wasn't entirely sure what you were trying to accomplish here, but that makes more sense.

@drashna drashna added the keymap label Feb 28, 2019
@drashna
Copy link
Member

drashna commented Mar 3, 2019

Thanks

@drashna drashna merged commit a2a2ba0 into qmk:master Mar 3, 2019
bl1nk added a commit to bl1nk/qmk_firmware that referenced this pull request Mar 3, 2019
* upstream/master: (58 commits)
  [Keymap] layout/community/ortho4x12/symbolic update (qmk#5274)
  [Keyboard] matrix_init_user shouldn't call itself (qmk#5298)
  [Keymap] Update keymap.c (qmk#5290)
  Update Atreus layout to match the Niu layout. Fix Niu comment typo. (qmk#5297)
  [Keymap] Fix comment in the KBD67 default keymap. (qmk#5296)
  [Keyboard] update Hecomi/alpha's info.json  (qmk#5295)
  [Keyboard] Adding Numeric Keypad //e converter (qmk#5294)
  [Keyboard] Add support for matrix_scan_user to usb-usb converter (qmk#5291)
  handwired/terminus_mini: refactor, Configurator support, and readme cleanup (qmk#5292)
  [Keyboard] Initial commit for Prime_E w/ VIA config support (qmk#5285)
  [Keyboard] add dz60rgb ansi and hhkb support; add dz40rgb (qmk#5231)
  [Keyboard] Convert mf68_ble to keymap (qmk#5287)
  [Keymap] Added INSERT to my keymaps (qmk#5284)
  HS60 v2: Instructions how to reset and flash (qmk#5241)
  [Keymap] unausgeschlafen quefrency keymap (qmk#5273)
  [Keymap] Fix rgblight_enable ifdefs (qmk#5283)
  [Keymap] DCompact Layout Updates pt. 3 (qmk#5209)
  [Keyboard] Add Dozen0 (qmk#5272)
  [Keymap] update: add extrakey support for macOS media keys (qmk#5263)
  [Keymap] My TMO50 layout (qmk#5116)
  ...
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 7, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (76 commits)
  [Keyboard] Adds Gray Studio HB85 Initial Support (qmk#5311)
  [Keymap] Add KC_MAKE keycode to my userspace and keymaps (qmk#5324)
  [Keyboard] handwired/trackpoint: refactor and readme cleanup (qmk#5325)
  [Keyboard] re-arrange the pinout for backlight support (qmk#5321)
  [Keymap] update: simplify tapdance code for Minidox/keymaps/dustypomerleau (qmk#5315)
  [Keymap] Add vxid planck layout (qmk#5271)
  increase size of note counter variable to avoid overflow
  Adopted LAYOUT, added some keys (qmk#5320)
  Add more "decent" text editors (qmk#5308)
  Add DZ60 Tsangan Layout + Fn layer (qmk#5319)
  [Docs] Fix function signature (layer_state_set_*) (qmk#5313)
  Correct keyboard and layout dimensions for 40percent.club Foobar (qmk#5310)
  Dactyl Manuform 5x6, 5x7, and 6x6: QMK Configurator fixes and partial code clean-up (qmk#5307)
  Fixed default to dissable VIA (qmk#5309)
  Clean up debounce a bit (qmk#5255)
  Fix aanzee Configurator config file (qmk#5286)
  Separate keymaps to VIA enabled/dissabled. (qmk#5302)
  [Keymap] Add RGB config and controls to userspace (qmk#5299)
  Add LED Matrix to Features list for easy reference (qmk#5280)
  [Keymap] layout/community/ortho4x12/symbolic update (qmk#5274)
  ...
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Mar 7, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
chie4hao pushed a commit to chie4hao/qmk_firmware that referenced this pull request Mar 28, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 31, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Apr 3, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
* change readme.md

* diy LayerTap function

* fixed forgot update_tri_layer
correspound permissive hold

* update README

* change No_event of general shift

* update symbolic layout

* merge symbolic_general_shift to symbolic layout

* update README.md

* following code style

* delete excess codes, change codes that don't follows the code style
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants