Initial commit for Prime_E w/ VIA config support #5285

holtenc · 2019-03-01T18:35:18Z

Description

Initial commit for Prime_E with support for VIA configurator. Additionally added VIA configurator support to /handwired/prime_exl for personal use.

Discussed this addition with @Wilba6582 and he has appoved it. (https://github.com/olivia/via-config/pull/52)

Honestly not sure why the files in lib/lufa and ...projects are part of this PR. I've not made any changes to them. Is there a way to exclude them?

Types of Changes

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

drashna

Mostly, it looks fine.

However, it looks like you have a number of lib files that have been changed. This should take care of thos files:

git checkout - lib

Also, there are a number of things that have changed recently.

We've set the default for IS_COMMAND, so there no need to specify it, if you're using the default.
GPIO commands are hardware agnostic, and work on AVR and ARM. And we're trying to switch to these, on all boards, so it's consistent.

If you need any help with these changes, or any clarification about them, don't hesitate to ask.

Also, I know VIA support has been put on hold. If @Wilba6582 signs off on this, here, then we'll merge it.

keyboards/handwired/prime_exl/config.h

keyboards/handwired/prime_exl/keymaps/default/keymap - Copy.c

keyboards/handwired/prime_exl/keymaps/via/keymap.c

keyboards/primekb/prime_e/keymaps/default/keymap.c

drashna · 2019-03-01T19:00:04Z

lib/lufa/Projects/LEDNotifier/CPUUsageApp/obj/Debug/CPUMonitor.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+7e58a720d521047f73ccc9b7cabe3901380feb6d


Could this be reverted?

You can run:

git checkout -- lib/

That should fix all of these.

keyboards/primekb/prime_e/keymaps/via/keymap.c

Co-Authored-By: holtenc <[email protected]>

holtenc · 2019-03-01T20:30:50Z

I think that should resolve all your requested changes.

drashna · 2019-03-01T23:16:21Z

Looks good. Though, the lib stuff is still there, unfortunately.

I'm not 100% sure how to fix that (I'm not git expert, either).... but I think you can do git reset upstream/master lib to remove those changes. --hard will remove them completely, but since I'm not 100% sure, so without should be safer.

That's assuming you have an upstream set. If not git remote add upstream https://github.com/qmk/qmk_firmware.git will add it, and then you should be able to do this.

holtenc · 2019-03-02T03:17:58Z

OK. got those Lib files removed. Sorry.

drashna · 2019-03-02T03:36:26Z

Awesome! Thanks!

And no worries. Stuff like that happens from time to time. Git is some serious dark magic sometimes. :)

drashna · 2019-03-02T03:37:52Z

And @Wilba6582, just wanted to get your okay before merging this.

wilba · 2019-03-02T04:01:05Z

@drashna yes, this was in the works before the cutoff

drashna · 2019-03-02T05:14:13Z

Awesome, just wanted to make sure!

* upstream/master: (58 commits) [Keymap] layout/community/ortho4x12/symbolic update (qmk#5274) [Keyboard] matrix_init_user shouldn't call itself (qmk#5298) [Keymap] Update keymap.c (qmk#5290) Update Atreus layout to match the Niu layout. Fix Niu comment typo. (qmk#5297) [Keymap] Fix comment in the KBD67 default keymap. (qmk#5296) [Keyboard] update Hecomi/alpha's info.json (qmk#5295) [Keyboard] Adding Numeric Keypad //e converter (qmk#5294) [Keyboard] Add support for matrix_scan_user to usb-usb converter (qmk#5291) handwired/terminus_mini: refactor, Configurator support, and readme cleanup (qmk#5292) [Keyboard] Initial commit for Prime_E w/ VIA config support (qmk#5285) [Keyboard] add dz60rgb ansi and hhkb support; add dz40rgb (qmk#5231) [Keyboard] Convert mf68_ble to keymap (qmk#5287) [Keymap] Added INSERT to my keymaps (qmk#5284) HS60 v2: Instructions how to reset and flash (qmk#5241) [Keymap] unausgeschlafen quefrency keymap (qmk#5273) [Keymap] Fix rgblight_enable ifdefs (qmk#5283) [Keymap] DCompact Layout Updates pt. 3 (qmk#5209) [Keyboard] Add Dozen0 (qmk#5272) [Keymap] update: add extrakey support for macOS media keys (qmk#5263) [Keymap] My TMO50 layout (qmk#5116) ...

* Initial Prime_E commit * Via support for Prime_EXL * Backlight testing * update libs * Clean up and addition of VIA compatibility. * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/primekb/prime_e/keymaps/default/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/primekb/prime_e/keymaps/default/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/primekb/prime_e/keymaps/default/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/handwired/prime_exl/keymaps/via/keymap.c Co-Authored-By: holtenc <[email protected]> * Update keyboards/primekb/prime_e/keymaps/default/keymap.c Co-Authored-By: holtenc <[email protected]> * removed IS_COMMAND from config.h. updated GPIO commands * clean up libs

holtenc and others added 7 commits February 5, 2019 21:49

Initial Prime_E commit

d515b03

Via support for Prime_EXL

e3a1c84

Backlight testing

ea9c865

Merge branch 'master' of https://github.com/holtenc/qmk_firmware

6cc0c34

update libs

f42ea48

Merge remote-tracking branch 'upstream/master'

acfc473

Clean up and addition of VIA compatibility.

1b1995d

drashna requested changes Mar 1, 2019

View reviewed changes

drashna and others added 15 commits March 1, 2019 11:48

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

3d4a170

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

8a47251

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

0fa45ad

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

5021d4a

Co-Authored-By: holtenc <[email protected]>

Update keyboards/primekb/prime_e/keymaps/default/keymap.c

6924cde

Co-Authored-By: holtenc <[email protected]>

Update keyboards/primekb/prime_e/keymaps/default/keymap.c

d2ee473

Co-Authored-By: holtenc <[email protected]>

Update keyboards/primekb/prime_e/keymaps/default/keymap.c

ee39c1b

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

02349d3

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

087b2b3

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

8b59abc

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

b6a68ea

Co-Authored-By: holtenc <[email protected]>

Update keyboards/handwired/prime_exl/keymaps/via/keymap.c

dbbc013

Co-Authored-By: holtenc <[email protected]>

Update keyboards/primekb/prime_e/keymaps/default/keymap.c

6bab5c9

Co-Authored-By: holtenc <[email protected]>

removed IS_COMMAND from config.h. updated GPIO commands

2e14b20

Merge branch 'master' of https://github.com/holtenc/qmk_firmware

646a7c3

mechmerlin added the keyboard label Mar 2, 2019

clean up libs

d65bac1

drashna added on hold awaiting review labels Mar 2, 2019

drashna approved these changes Mar 2, 2019

View reviewed changes

drashna merged commit 6e48ea0 into qmk:master Mar 2, 2019

drashna removed awaiting review on hold labels Mar 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial commit for Prime_E w/ VIA config support #5285

Initial commit for Prime_E w/ VIA config support #5285

holtenc commented Mar 1, 2019 •

edited

Loading

drashna left a comment •

edited

Loading

drashna Mar 1, 2019

holtenc commented Mar 1, 2019

drashna commented Mar 1, 2019 •

edited

Loading

holtenc commented Mar 2, 2019

drashna commented Mar 2, 2019

drashna commented Mar 2, 2019

wilba commented Mar 2, 2019

drashna commented Mar 2, 2019

		@@ -0,0 +1 @@
		7e58a720d521047f73ccc9b7cabe3901380feb6d

Initial commit for Prime_E w/ VIA config support #5285

Initial commit for Prime_E w/ VIA config support #5285

Conversation

holtenc commented Mar 1, 2019 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

drashna left a comment • edited Loading

Choose a reason for hiding this comment

drashna Mar 1, 2019

Choose a reason for hiding this comment

holtenc commented Mar 1, 2019

drashna commented Mar 1, 2019 • edited Loading

holtenc commented Mar 2, 2019

drashna commented Mar 2, 2019

drashna commented Mar 2, 2019

wilba commented Mar 2, 2019

drashna commented Mar 2, 2019

holtenc commented Mar 1, 2019 •

edited

Loading

drashna left a comment •

edited

Loading

drashna commented Mar 1, 2019 •

edited

Loading