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

Move navigation buttons closer to the middle on XD75:skewwhiffy #4118

Merged
merged 11 commits into from Oct 13, 2018

Conversation

skewwhiffy
Copy link
Contributor

No description provided.

@@ -15,36 +15,44 @@
*/
#include "xd75.h"
Copy link
Member

Choose a reason for hiding this comment

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

Please change Line 16 to #include QMK_KEYBOARD_H.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -15,36 +15,44 @@
*/
#include "xd75.h"
#include "keymap_uk.h"
// Fillers to make layering more clear

#define _______ KC_TRNS
Copy link
Member

Choose a reason for hiding this comment

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

This line is unnecessary and can be safely deleted, as QMK defines this automatically.

// Fillers to make layering more clear
#define _______ KC_TRNS
#define XXXXXXX KC_NO

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -19,6 +19,4 @@

#include "../../config.h"
Copy link
Member

Choose a reason for hiding this comment

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

The file keyboards/xd75/keymaps/skewwhiffy/config.h can be safely deleted, as nothing in the file has any effect on the build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@noroadsleft
Copy link
Member

I'm going to call it optional for the purposes of this PR, as the codebase for this keyboard is currently "out-of-spec", but ideally, the layers in your keymap.c file should be formatted to use a layout macro, rather than the multidimensional array as they are now.

Here's an example of what it should look similar to, taken from the Preonic code:

[_QWERTY] = LAYOUT_preonic_grid( \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \
BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
),

#define _NB 3 // Numbers
#define _SY 4 // Symbols
#define _NAV 5 // Navigation
#define _NBL 3 // Numbers left
Copy link
Member

Choose a reason for hiding this comment

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

You may want to consider using an enum here, rather than a bunch of defines. I tay be simpler in the long run.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

keyboards/xd75/keymaps/skewwhiffy/keymap.c Show resolved Hide resolved
return true;
}


const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
Copy link
Member

Choose a reason for hiding this comment

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

Could you remove the action_get_macro function? It's been deprecated in favor of process_record_user.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

{ UK_TAB, UK_LEFT, UK_DOWN, UK_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, UK_INS, UK_HOME, UK_PGUP, _TERM },
{ _S_TAB, _A_LEFT, IJ_OMN, _A_RGHT, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, __NAR, UK_END, UK_PGDN, _______ },
{ _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______ }
}
};

const uint16_t PROGMEM fn_actions[] = {
Copy link
Member

Choose a reason for hiding this comment

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

Could you remove the fn_actions block? All of it's features have been added as keycodes, and been deprecated in favor of process_record_user.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@drashna
Copy link
Member

drashna commented Oct 12, 2018

@noroadsleft This should be LAYOUT_ortho_5x15 specifically.

@drashna
Copy link
Member

drashna commented Oct 13, 2018

Awesome! Thanks!

@drashna drashna merged commit 533f684 into qmk:master Oct 13, 2018
@skewwhiffy skewwhiffy deleted the xd75 branch October 14, 2018 17:54
ReganL added a commit to ReganL/qmk_firmware that referenced this pull request Oct 16, 2018
* 'master' of https://github.com/qmk/qmk_firmware: (41 commits)
  Use DFU bootloader for rev 3
  Add Iris Rev. 3
  Keymap: Add nano keymap for modding Spooka light (qmk#4141)
  Keymap: add sun_usb keymap for sigma (qmk#4138)
  Keyboard: Make type 5 the default sun keyboard. (qmk#4137)
  Keymap: Move multimedia events to dedicated layer and format config (qmk#4136)
  Keymap: add JJ40 Skewwhiffy layout (qmk#4135)
  Keymap: Update to ergodox layout (qmk#4134)
  Keymap: Reworked layout (qmk#4133)
  Keymap: added default layout to the kbd6x for the tofu hhkb (qmk#4132)
  Basic Slovenian keymap added (qmk#4128)
  Keymap: add new keymap for Iris (qmk#4119)
  convert to unix line-endings [skip ci]
  Fix ErgoTravel Board
  Keymap: Move navigation buttons closer to the middle on XD75:skewwhiffy (qmk#4118)
  Fix Typo in Custom Quantum functions document (led_state) (qmk#4129)
  Treasure Type9 Fix: change diode direction to ROW2COL  (qmk#4125)
  Add sendstring_german.h (qmk#4124)
  port sun_usb converter from tmk
  A comment indicating the insertion location of the new mode was added.
  ...
moperon pushed a commit to moperon/qmk_firmware that referenced this pull request Oct 18, 2018
…fy (qmk#4118)

* RGB toggle button

* Remove custom lighting effects

* Fix small bug in Symbols layer

* Ignore mod tap interrupt in XD75 for skewwhiffy, and split layers into two for more flexibility and fix persistent layer issue

* Replace shift in nav layer with IntelliJ omnibox shortcut to avoid a sticky shift

* Remove custom setting in config, because it were annoying, it were.

* Move navigation buttons in one key

* Some review markups

* Use enums for layers

* Use LAYOUT_ortho_5x15

* Revert some capitalization changes made by accident
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Oct 20, 2018
…fy (qmk#4118)

* RGB toggle button

* Remove custom lighting effects

* Fix small bug in Symbols layer

* Ignore mod tap interrupt in XD75 for skewwhiffy, and split layers into two for more flexibility and fix persistent layer issue

* Replace shift in nav layer with IntelliJ omnibox shortcut to avoid a sticky shift

* Remove custom setting in config, because it were annoying, it were.

* Move navigation buttons in one key

* Some review markups

* Use enums for layers

* Use LAYOUT_ortho_5x15

* Revert some capitalization changes made by accident
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
…fy (qmk#4118)

* RGB toggle button

* Remove custom lighting effects

* Fix small bug in Symbols layer

* Ignore mod tap interrupt in XD75 for skewwhiffy, and split layers into two for more flexibility and fix persistent layer issue

* Replace shift in nav layer with IntelliJ omnibox shortcut to avoid a sticky shift

* Remove custom setting in config, because it were annoying, it were.

* Move navigation buttons in one key

* Some review markups

* Use enums for layers

* Use LAYOUT_ortho_5x15

* Revert some capitalization changes made by accident
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
…fy (qmk#4118)

* RGB toggle button

* Remove custom lighting effects

* Fix small bug in Symbols layer

* Ignore mod tap interrupt in XD75 for skewwhiffy, and split layers into two for more flexibility and fix persistent layer issue

* Replace shift in nav layer with IntelliJ omnibox shortcut to avoid a sticky shift

* Remove custom setting in config, because it were annoying, it were.

* Move navigation buttons in one key

* Some review markups

* Use enums for layers

* Use LAYOUT_ortho_5x15

* Revert some capitalization changes made by accident
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants