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

add support for m65 and simple 5x13 ortholinear #12315

Merged
merged 32 commits into from
Aug 10, 2021
Merged

add support for m65 and simple 5x13 ortholinear #12315

merged 32 commits into from
Aug 10, 2021

Conversation

alinelena
Copy link
Contributor

@alinelena alinelena commented Mar 21, 2021 •
edited by zvecr
Loading

Description

all the comments are in here this pr #12012 superseeds #12012

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

@alinelena alinelena changed the base branch from master to develop March 21, 2021 19:32
sigprof
sigprof reviewed Mar 29, 2021
View reviewed changes
Copy link
Contributor

@sigprof sigprof left a comment

Choose a reason for hiding this comment

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

This looks mostly good. There are some minor cosmetic things, like code formatting, and some things related to indicators that I would do in a different way (but my way is probably not the only correct way to do that).

keyboards/m65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/m65/keymaps/default/keymap.c Outdated Show resolved Hide resolved
Alin Marin Elena and others added 13 commits March 29, 2021 22:19
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
52b91b8 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
c60a9fa 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
f3037f0 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
557f26a 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
756f674 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@sigprof
Update keyboards/m65/keymaps/default/keymap.c
e2145f0 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
@alinelena
updates as per @sigprof review plus reformat
5c0485d
@alinelena
pins all now are defined at microcontroller level
4635228
@alinelena
profuct id defined at microcontroller level
e1564c8
@alinelena
put leds on when _ADJ is on
3ed6df8
@alinelena
add danish keymap
c67c3bd
@alinelena
make default uk centric iso as per readme
5999719
@alinelena
default is now iso generic, uk is its own business
b9ac18f
drashna
drashna requested changes Apr 3, 2021
View reviewed changes
keyboards/m65/keymaps/default/config.h Show resolved Hide resolved
keyboards/m65/keymaps/dk/config.h Show resolved Hide resolved
@alinelena alinelena requested a review from drashna April 10, 2021 04:39
@drashna drashna requested a review from a team April 19, 2021 05:52
fauxpark
fauxpark requested changes Apr 19, 2021
View reviewed changes
keyboards/m65/keymaps/uk/keymap.c Outdated Show resolved Hide resolved
keyboards/m65/readme.md Outdated Show resolved Hide resolved
keyboards/m65/keymaps/uk/readme.md Outdated Show resolved Hide resolved
@fauxpark
Update keyboards/m65/keymaps/uk/keymap.c
76a791a 
Co-authored-by: Ryan <fauxpark@gmail.com>
fauxpark
fauxpark requested changes Apr 19, 2021
View reviewed changes
keyboards/m65/keymaps/dk/keymap.c Outdated Show resolved Hide resolved
Alin Marin Elena and others added 2 commits April 19, 2021 15:12
@fauxpark
Update keyboards/m65/keymaps/dk/keymap.c
649e8b3 
Co-authored-by: Ryan <fauxpark@gmail.com>
@fauxpark
Update keyboards/m65/keymaps/uk/readme.md
f0d2635 
Co-authored-by: Ryan <fauxpark@gmail.com>
zvecr
zvecr requested changes May 3, 2021
View reviewed changes
keyboards/m65/rev1/rules.mk Outdated Show resolved Hide resolved
@zvecr
Update keyboards/m65/rev1/rules.mk
9b9f8fe 
Co-authored-by: Joel Challis <git@zvecr.com>
fauxpark
fauxpark requested changes May 4, 2021
View reviewed changes
keyboards/m65/keymaps/default/readme.md Outdated Show resolved Hide resolved
keyboards/m65/keymaps/dk/readme.md Outdated Show resolved Hide resolved
keyboards/m65/keymaps/uk/readme.md Outdated Show resolved Hide resolved
keyboards/m65/rev1/halconf.h Outdated Show resolved Hide resolved
Alin Marin Elena and others added 3 commits May 6, 2021 22:52
@fauxpark
Update keyboards/m65/keymaps/dk/readme.md
d9bdff8 
Co-authored-by: Ryan <fauxpark@gmail.com>
@fauxpark
Update keyboards/m65/keymaps/uk/readme.md
90a443a 
Co-authored-by: Ryan <fauxpark@gmail.com>
@fauxpark
Update keyboards/m65/keymaps/default/readme.md
522bbbc 
Co-authored-by: Ryan <fauxpark@gmail.com>
@drashna
Copy link
Member

drashna commented May 14, 2021

Could you revert the changes to the git submodules (lib folders)? you may need to rebase your branch to properly fix this.

@alinelena
Copy link
Contributor Author

Could you revert the changes to the git submodules (lib folders)? you may need to rebase your branch to properly fix this.

done, thank you!

@drashna drashna requested a review from a team May 22, 2021 04:45
@stale
Copy link

stale bot commented Jul 8, 2021

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 awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@drashna drashna requested review from zvecr and fauxpark July 18, 2021 14:59
@stale stale bot removed the awaiting changes label Jul 18, 2021
@drashna drashna requested a review from sigprof July 18, 2021 14:59
noroadsleft
noroadsleft requested changes Aug 10, 2021
View reviewed changes
keyboards/m65/readme.md Outdated Show resolved Hide resolved
keyboards/m65/config.h Outdated Show resolved Hide resolved
Alin Marin Elena and others added 2 commits August 10, 2021 09:39
@noroadsleft
Update keyboards/m65/readme.md
9b56186 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@noroadsleft
Update keyboards/m65/config.h
87bab39 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@tzarc tzarc merged commit 184c2e3 into qmk:develop Aug 10, 2021
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Aug 11, 2021
Merge remote-tracking branch 'qmk/develop' into develop
658e0d4 
* qmk/develop: (204 commits)
  Hp69 - Update led logic (qmk#13940)
  Fix shell port bug in computation of QMK_FIRMWARE_DIR (qmk#13950)
  Handwired/Stream_Cheap/2x4: Add via support (qmk#13297)
  add support for m65 and simple 5x13 ortholinear (qmk#12315)
  Improve the qmk lint readme check (qmk#13941)
  Architecture documentation for Configurator and API (qmk#13935)
  Update feature_wpm.md (qmk#13936)
  Add padding to LUFA-MS .BIN files (qmk#13922)
  [Keyboard] Added pistachio_pro (qmk#13466)
  adding my keymap "vayashiko" (qmk#13049)
  Ristretto - Update bootloader (qmk#13933)
  Fix compliation for ferris 0.2 bling (qmk#13937)
  Remove backwards compatibility of debounce names (qmk#13877)
  Remove ONEHAND_ENABLE (qmk#13920)
  Limit RGB max brightness on KPrepublic BM-series keyboards (qmk#13132)
  Fixup rgb matrix config for KBD67 mkII boards (qmk#13931)
  Support all the 0.2 Ferris variants (qmk#12653)
  [User] changes to nstickney's keymaps (qmk#11456)
  [Keymap] new keymap for nui_mini (qmk#13924)
  Make default keymap for GMMK Pro reflect stock (qmk#13850)
  ...
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@sigprof @fauxpark
@zvecr @noroadsleft @nhongooi
add support for m65 and simple 5x13 ortholinear (qmk#12315)
3b97822 
* add support for m65 and simple 5x13 ortholinear

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* updates as per @sigprof review plus reformat

* pins all now are defined at microcontroller level

* profuct id defined at microcontroller level

* put leds on when _ADJ is on

* add danish keymap

* make default uk centric iso as per readme

* default is now iso generic, uk is its own business

* add license

* update imgur links to reflect the layout

* leds for _ADJ layer now do not prevent the other layers leds to get on

* Update keyboards/m65/keymaps/uk/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/m65/keymaps/dk/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/m65/keymaps/uk/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/m65/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* add support for gd32f303cct6 by we act in rev2

* Revert "add support for gd32f303cct6 by we act in rev2"

This reverts commit 4ad3834.

* Update keyboards/m65/rev1/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/m65/keymaps/dk/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/m65/keymaps/uk/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/m65/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* remove empty hal

* add capslock

* Update keyboards/m65/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/m65/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Alin M Elena <alin-marin.elena@stfc.ac.uk>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@tzarc tzarc tzarc approved these changes

@drashna drashna drashna approved these changes

@zvecr zvecr Awaiting requested review from zvecr

@fauxpark fauxpark Awaiting requested review from fauxpark

@sigprof sigprof Awaiting requested review from sigprof

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

Successfully merging this pull request may close these issues.
7 participants
@alinelena @sigprof @drashna @tzarc @fauxpark @zvecr @noroadsleft