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

Added dactyl-manuform 4x6 and keymap. #4058

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Conversation

FSund
Copy link
Contributor

@FSund FSund commented Oct 3, 2018

I've added config and keymap for my preferred Dactyl-ManuForm layout, 4x6.

I mainly just took the 5x6 stuff and removed a row from the layout and the keymap.

along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef CONFIG_USER_H
Copy link
Member

Choose a reason for hiding this comment

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

If you could replace the include guard (the ifndef, define, and endif at the end) with just #pragma once?

It's simpler, and less prone to user error, so if you could make this switch?

#ifndef CONFIG_USER_H
#define CONFIG_USER_H

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

This line is not actually needed, and should be removed.

Specifically, the build script automatically includes all of the config.h files, so this is not necessary.

@@ -0,0 +1,89 @@
#include "dactyl_manuform.h"
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 replace this include with #include QMK_KEYBOARD_H instead?

@@ -0,0 +1,89 @@
#include "dactyl_manuform.h"
#include "action_layer.h"
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 all of these includes?

They get included automatically, at various points in the built process, so they are redundant and not necessary here.

};


void persistent_default_layer_set(uint16_t default_layer) {
Copy link
Member

Choose a reason for hiding this comment

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

This function isn't needed, and has been deprecated in favor of set_single_persistent_default_layer

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean I can remove the whole function from the file (delete line 83-86)?

Copy link
Member

Choose a reason for hiding this comment

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

Yes.

@@ -0,0 +1,3 @@
ifndef QUANTUM_DIR
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 this (ifndef/include/endif) block?

It's not needed, and is a holdover from the old build system.

And actually, could you probably safely remove the entire file, as it's not being used.

@@ -8,6 +8,8 @@
#include "4x5.h"
#elif KEYBOARD_handwired_dactyl_manuform_5x7
#include "5x7.h"
#elif KEYBOARD_handwired_dactyl_manuform_4x6
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 put this above the 5x7? Namely, this is OCD, but ....

@FSund
Copy link
Contributor Author

FSund commented Oct 3, 2018

I've added all changes you recommended.

Again, thanks for all the hard work by you and all other maintainers!

@drashna
Copy link
Member

drashna commented Oct 3, 2018

Well, thank you!

@drashna drashna merged commit d55468c into qmk:master Oct 3, 2018
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Oct 5, 2018
* 'master' of https://github.com/qmk/qmk_firmware: (69 commits)
  rgb_matrix: continue calling rgb_matrix_indicators() when toggled off
  Keymap: Added personal userspace and keymaps. (qmk#4073)
  Add mousekey_send to (un)register_code
  rn42 compilation error fix (qmk#4050)
  process_ucis: Add a callback for success (qmk#4067)
  Keyboard: add info.json for qmk configurator (qmk#4063)
  Keyboard: Adding Split Space support for Mechmini 1 (qmk#4052)
  Keyboard: Added dactyl-manuform 4x6 and keymap. (qmk#4058)
  Keyboard: Add handwired/pteron config and keymaps (qmk#4060)
  Keyboard: Added split backspace layout for the b.mini (qmk#4051)
  Keyboard: Add namecard keyboard (qmk#4044)
  handwired/ibm122m: refactor and Configurator support (qmk#4054)
  Keyboard: Added JN68M keyboard to handwired (qmk#4053)
  Keymap: Add RGB matrix keypress effects and reduce firmware size. (qmk#4055)
  Keyboard: KBD4x: corrected info.json file (qmk#4056)
  Keyboard: Mint60: Configurator support and readme cleanup (qmk#4057)
  Add missing F-keys to ergodox_infinity input_club
  Enable support for Linux Mint 18 with linux_install.sh (qmk#4042)
  add JP keycode for MacOSX (qmk#4033)
  New keyboard: Baguette (qmk#4047)
  ...
akatrevorjay added a commit to akatrevorjay/qmk_firmware that referenced this pull request Oct 8, 2018
* 'master' of git://github.com/qmk/qmk_firmware: (302 commits)
  Keymap: Added Planck keymap: jcorrado (qmk#4083)
  Keyboard: Helix five_rows keymap reduced size (qmk#4082)
  E6V2 LE HHKB love (qmk#4079)
  Keymap: Add french iso layout for dz60 (thomasviaud) (qmk#4080)
  ARM SWD guide
  Keyboard: set SAFE_RANGE (qmk#4078)
  Keyboard: DZ60: add Plate B layouts (qmk#4076)
  rgb_matrix: continue calling rgb_matrix_indicators() when toggled off
  Keymap: Added personal userspace and keymaps. (qmk#4073)
  Add mousekey_send to (un)register_code
  rn42 compilation error fix (qmk#4050)
  process_ucis: Add a callback for success (qmk#4067)
  Keyboard: add info.json for qmk configurator (qmk#4063)
  Keyboard: Adding Split Space support for Mechmini 1 (qmk#4052)
  Keyboard: Added dactyl-manuform 4x6 and keymap. (qmk#4058)
  Keyboard: Add handwired/pteron config and keymaps (qmk#4060)
  Keyboard: Added split backspace layout for the b.mini (qmk#4051)
  Keyboard: Add namecard keyboard (qmk#4044)
  handwired/ibm122m: refactor and Configurator support (qmk#4054)
  Keyboard: Added JN68M keyboard to handwired (qmk#4053)
  ...
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Oct 13, 2018
* Added dactyl-manuform 4x6 and keymap.

* Did changes recommended by drashna.
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
* Added dactyl-manuform 4x6 and keymap.

* Did changes recommended by drashna.
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Added dactyl-manuform 4x6 and keymap.

* Did changes recommended by drashna.
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