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

Merge /prime_l and /prime_l_v2 #8194

Merged
merged 25 commits into from
Feb 19, 2020
Merged

Merge /prime_l and /prime_l_v2 #8194

merged 25 commits into from
Feb 19, 2020

Conversation

holtenc
Copy link
Contributor

@holtenc holtenc commented Feb 18, 2020

Description

created sub directories for v1 and v2 prime_l firmwares within the /prime_l parent directory

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

holtenc and others added 21 commits March 17, 2019 23:16
@holtenc
correct indicator light states.
3dc21e9 
function of indicator lights was inverted. these changes correct that.
@holtenc
flesh out keymaps pre production
6a8f6bd
@holtenc
Enable extrakey in rules
cafd59f
@holtenc
Merge remote-tracking branch 'upstream/master'
b8c2432 
upstream sync
@holtenc
Merge remote-tracking branch 'upstream/master'
1602f6d
@holtenc
Prime_BLE initial commit
b98aa8a
@holtenc
Merge branch 'master' of https://github.com/qmk/qmk_firmware
e12b4ae
@holtenc
Initial commit for Prime_L V2
dc48de8
@holtenc
Update info.json
b9666b1 
correct key spacing.
@holtenc
update copyright
5d4d62a
@holtenc
Update readme.md
e091d2d
@holtenc
Inital commit
ce66807
@holtenc
updates before PR into QMK master
ac9ac00
@holtenc
Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2
1cb1675
@holtenc
Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/pri…
c580822 
…me_l_v2/config.h
@holtenc
Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Pri…
80523fc 
…me_l_v2/config.h
@holtenc
remove directory Prime_l_v2
bb265a8
@holtenc
Merge branch 'master' of https://github.com/holtenc/qmk_firmware
bb31ea8
@holtenc
re-submit with proper folder name.
de610d7
@holtenc
Merge pull request #2 from qmk/master
02b85e4 
update from QMK source
@holtenc
Restructure /primekb directory to merge /prime_l and /prime_l_v2
7148f88
@holtenc
Copy link
Contributor Author

holtenc commented Feb 18, 2020

@noroadsleft

@holtenc holtenc requested a review from noroadsleft February 18, 2020 01:49
fauxpark
fauxpark requested changes Feb 18, 2020
View reviewed changes
@fauxpark fauxpark requested a review from a team February 18, 2020 03:10
noroadsleft
noroadsleft requested changes Feb 18, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Just five additional things from me:

For keyboards/primekb/prime_l/v2/readme.md:

  • Change all instances of Prime_L_V2 to Prime_L V2 (with a space; Lines 1, 3, and 8)
  • Change the make command to make primekb/prime_l/v2:default on Line 13

and the four suggestions below. That plus fauxpark's notes and I'd call this good to go.

@holtenc
Copy link
Contributor Author

holtenc commented Feb 18, 2020

thanks guys. make the requested changes

@holtenc
Copy link
Contributor Author

holtenc commented Feb 18, 2020

committed the change.

noroadsleft
noroadsleft requested changes Feb 19, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Review quality 0/5 for me these days, sorry

@holtenc
Copy link
Contributor Author

holtenc commented Feb 19, 2020

It's not just you... I missed them as well. committed the changes

@noroadsleft noroadsleft merged commit 42d6270 into qmk:master Feb 19, 2020
@noroadsleft
Copy link
Member

Thanks!

HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@holtenc @HokieGeek
Merge /prime_l and /prime_l_v2 (qmk#8194)
92dc7cb 
* correct indicator light states.

function of indicator lights was inverted. these changes correct that.

* flesh out keymaps pre production

* Enable extrakey in rules

* Prime_BLE initial commit

* Initial commit for Prime_L V2

* Update info.json

correct key spacing.

* update copyright

* Update readme.md

* Inital commit

* updates before PR into QMK master

* Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2

* Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/prime_l_v2/config.h

* Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Prime_l_v2/config.h

* remove directory Prime_l_v2

* re-submit with proper folder name.

* Restructure /primekb directory to merge /prime_l and /prime_l_v2

* made changes requested by QMK reviewers

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md
@holtenc
Copy link
Contributor Author

holtenc commented Feb 21, 2020

@noroadsleft noticed the keyboard list on config.qmk.com isn't quite right. could it be because there is a rules.mk in /prime_l as well as /prime_l/v1 and /prime_l/v2

image

@noroadsleft
Copy link
Member

I literally just fixed this lol.

https://github.com/qmk/qmk_configurator/blob/3b08f2ea00a01231b68d8ceb892457c26d9fdd97/src/jquery.js#L510

@holtenc
Copy link
Contributor Author

holtenc commented Feb 21, 2020 via email

nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Feb 21, 2020
Merge remote-tracking branch 'upstream/master'
2a8ece2 
* upstream/master: (330 commits)
  Add Danish keymap and sendstring LUT (qmk#8218)
  format code according to conventions [skip ci]
  uart.c fix from TMK (qmk#7628)
  S75 Encoder Fixes (qmk#7758)
  Add Turkish keymap aliases and sendstring LUT (qmk#7676)
  Add Arm Teensys to mcu_selection.mk (qmk#8026)
  [New keyboard]silverbullet44 (qmk#7950)
  Allow 30us matrix delay to be keyboard/user overridable  (qmk#8216)
  Merge /prime_l and /prime_l_v2 (qmk#8194)
  [Keymap] Keymap for XD75 with 7U spacebar EN-RU gamers (qmk#8184)
  Add VIA support for kbd8x mk2 (qmk#8168)
  Move Grave/Tilde and some lesser used keys on my ergo boards (qmk#8200)
  [Keyboard] KC60SE cleanup (qmk#8171)
  Made windows driver installation accept y as All to allow CI (qmk#8189)
  Change the image photo of /keyboards/reviung41/readme.md (qmk#8195)
  MxSS RGB Handler Touchup (qmk#8105)
  Centromere Configurator layout support and readme update (qmk#8190)
  dynamic keymap sanity check (qmk#8181)
  [keyboard] Austin (qmk#8176)
  Use pathlib everywhere we can (qmk#7872)
  ...
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Feb 23, 2020
@holtenc @sowbug
Merge /prime_l and /prime_l_v2 (qmk#8194)
d03770c 
* correct indicator light states.

function of indicator lights was inverted. these changes correct that.

* flesh out keymaps pre production

* Enable extrakey in rules

* Prime_BLE initial commit

* Initial commit for Prime_L V2

* Update info.json

correct key spacing.

* update copyright

* Update readme.md

* Inital commit

* updates before PR into QMK master

* Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2

* Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/prime_l_v2/config.h

* Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Prime_l_v2/config.h

* remove directory Prime_l_v2

* re-submit with proper folder name.

* Restructure /primekb directory to merge /prime_l and /prime_l_v2

* made changes requested by QMK reviewers

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md
nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Feb 27, 2020
Merge branch 'master' of https://github.com/nesth/qmk_firmware
70a02ed 
* 'master' of https://github.com/nesth/qmk_firmware: (331 commits)
  helix like crkbd
  Add Danish keymap and sendstring LUT (qmk#8218)
  format code according to conventions [skip ci]
  uart.c fix from TMK (qmk#7628)
  S75 Encoder Fixes (qmk#7758)
  Add Turkish keymap aliases and sendstring LUT (qmk#7676)
  Add Arm Teensys to mcu_selection.mk (qmk#8026)
  [New keyboard]silverbullet44 (qmk#7950)
  Allow 30us matrix delay to be keyboard/user overridable  (qmk#8216)
  Merge /prime_l and /prime_l_v2 (qmk#8194)
  [Keymap] Keymap for XD75 with 7U spacebar EN-RU gamers (qmk#8184)
  Add VIA support for kbd8x mk2 (qmk#8168)
  Move Grave/Tilde and some lesser used keys on my ergo boards (qmk#8200)
  [Keyboard] KC60SE cleanup (qmk#8171)
  Made windows driver installation accept y as All to allow CI (qmk#8189)
  Change the image photo of /keyboards/reviung41/readme.md (qmk#8195)
  MxSS RGB Handler Touchup (qmk#8105)
  Centromere Configurator layout support and readme update (qmk#8190)
  dynamic keymap sanity check (qmk#8181)
  [keyboard] Austin (qmk#8176)
  ...
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@holtenc @c0psrul3
Merge /prime_l and /prime_l_v2 (qmk#8194)
2ac9590 
* correct indicator light states.

function of indicator lights was inverted. these changes correct that.

* flesh out keymaps pre production

* Enable extrakey in rules

* Prime_BLE initial commit

* Initial commit for Prime_L V2

* Update info.json

correct key spacing.

* update copyright

* Update readme.md

* Inital commit

* updates before PR into QMK master

* Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2

* Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/prime_l_v2/config.h

* Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Prime_l_v2/config.h

* remove directory Prime_l_v2

* re-submit with proper folder name.

* Restructure /primekb directory to merge /prime_l and /prime_l_v2

* made changes requested by QMK reviewers

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@holtenc @kujawakk
Merge /prime_l and /prime_l_v2 (qmk#8194)
8b7d2bc 
* correct indicator light states.

function of indicator lights was inverted. these changes correct that.

* flesh out keymaps pre production

* Enable extrakey in rules

* Prime_BLE initial commit

* Initial commit for Prime_L V2

* Update info.json

correct key spacing.

* update copyright

* Update readme.md

* Inital commit

* updates before PR into QMK master

* Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2

* Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/prime_l_v2/config.h

* Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Prime_l_v2/config.h

* remove directory Prime_l_v2

* re-submit with proper folder name.

* Restructure /primekb directory to merge /prime_l and /prime_l_v2

* made changes requested by QMK reviewers

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@holtenc @jakeisnt
Merge /prime_l and /prime_l_v2 (qmk#8194)
ffb6388 
* correct indicator light states.

function of indicator lights was inverted. these changes correct that.

* flesh out keymaps pre production

* Enable extrakey in rules

* Prime_BLE initial commit

* Initial commit for Prime_L V2

* Update info.json

correct key spacing.

* update copyright

* Update readme.md

* Inital commit

* updates before PR into QMK master

* Drop Prime_EXL Plus from PR. Make requested changes to Prime_L V2

* Rename keyboards/primekb/Prime_l_v2/config.h to keyboards/primekb/prime_l_v2/config.h

* Rename keyboards/primekb/prime_l_v2/config.h to keyboards/primekb/Prime_l_v2/config.h

* remove directory Prime_l_v2

* re-submit with proper folder name.

* Restructure /primekb directory to merge /prime_l and /prime_l_v2

* made changes requested by QMK reviewers

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md

* Update keyboards/primekb/prime_l/v1/readme.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@holtenc @noroadsleft @drashna @fauxpark