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

K6 ansi bt port #390

Open
wants to merge 3 commits into
base: sn32_develop
Choose a base branch
from
Open

Conversation

mintyleaf
Copy link

Description

A Keychron K6 ANSI port for new keyboard declaration config system
I've dropped ISO layout, since i don't have one and keymap.c somehow differs from ANSI one
Feel free to adopt and add it as well
That port was done with upcoming iton_bt branch in mind
There are also some simple code related to RGB matrix bluetooth indication
Until iton_bt didn't merged - bluetooth part is disabled in rules.mk
For now it just builds and just works as intended

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

Copy link

@dexter93 dexter93 left a comment

Choose a reason for hiding this comment

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

some feedback

"typing_heatmap" : true
}
}
}

Choose a reason for hiding this comment

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

idk how this passes linting. Please format the file properly

* │Ctrl│GUI │Alt │ Space │Ctl│Fn1│Fn2│ ← │ ↓ │ → │
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
*/
[WIN_BASE] = LAYOUT_ansi(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BACKSLASH, KC_HOME, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(WIN_FN1), MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT),

Choose a reason for hiding this comment

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

layout is actually LAYOUT_65_ansi. Please see https://github.com/SonixQMK/qmk_firmware/tree/sn32_develop/layouts/default/65_ansi

and format it to something more readable

#define SN32_RGB_MATRIX_ROW_PINS {C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3}
#define DIP_SWITCH_PINS {D5, D4}
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define VIA_QMK_RGBLIGHT_ENABLE

Choose a reason for hiding this comment

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

Suggested change
#define VIA_QMK_RGBLIGHT_ENABLE

@@ -0,0 +1,17 @@
{
"name": "Keychron K6 ISO",

Choose a reason for hiding this comment

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

via jsons should live inside the via keymap dir, in keyboard_via.json


#pragma once
#define SN32_RGB_MATRIX_ROW_PINS {C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3}
#define DIP_SWITCH_PINS {D5, D4}

Choose a reason for hiding this comment

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

this can be data driven now. See 98530ca

#pragma once
#define SN32_RGB_MATRIX_ROW_PINS {C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3}
#define DIP_SWITCH_PINS {D5, D4}
#define DYNAMIC_KEYMAP_LAYER_COUNT 5

Choose a reason for hiding this comment

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

dynamic keymaps should be configured in via level, not here

Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants