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

Adds basic support for u/flehrad's bigswitch pcb #3015

Merged
merged 7 commits into from May 22, 2018

Conversation

yanfali
Copy link
Contributor

@yanfali yanfali commented May 22, 2018

  • also adds support for OSX Eject/Power
    The function of this key depends on the version of OSX and if you
    have physical media. For a macbook pro 2017 holding this key down
    brings up the shutdown dialog. If you wrap it in LCTL and LSFT the
    screenlock turns on immediately.

 - also adds support for OSX Eject/Power
   The function of this key depends on the version of OSX and if you
   have physical media. For a macbook pro 2017 holding this key down
   brings up the shutdown dialog. If you wrap it in LCTL and LSFT the
   screenlock turns on immediately.

#include "quantum.h"

#define KEYMAP( \
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we change this over to LAYOUT.


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

KEYMAP(LOCK_OSX),
Copy link
Contributor

Choose a reason for hiding this comment

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

We'll have to change this over to LAYOUT here as well

 - add a code for OSX Sleep
@mechmerlin
Copy link
Contributor

You should put an info.json in this too. If you can, I'd like to see the 1u key BIG as well lol.

@yanfali
Copy link
Contributor Author

yanfali commented May 22, 2018

kk

@yanfali
Copy link
Contributor Author

yanfali commented May 22, 2018

screen shot 2018-05-22 at 11 57 51
is that big enough @mechmerlin ?

@mechmerlin
Copy link
Contributor

mechmerlin commented May 22, 2018

It needs to be atleast 4x the size of a regular 1u to match the 4x size of a Kailh x Novelkeyz big switch. =P.

That looks fine

@@ -412,6 +412,7 @@ enum hid_keyboard_keypad_usage {
/* Special keycodes */
/* NOTE: 0xA5-DF and 0xE8-FF are used for internal special purpose */
enum internal_special_keycodes {
KC_OSX_EJECT = 0x66,
Copy link
Member

Choose a reason for hiding this comment

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

@jackhumbert is this okay to add here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I stuck it in special, because it seemed like the short bus kind.

Copy link
Member

Choose a reason for hiding this comment

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

lol.

Well, it's a core value, so I'm not sure if Jack wants it in there or not.

If you want, pull this out and add #define KC_OSX_EJECT 0x66 to your keymap instead, and create a seperate pull request for the keycode.h file.
I would recommend this, that way, I can feel okay about merging this immediately, and we can see about adding this in officially, later.

Copy link
Member

Choose a reason for hiding this comment

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

Wait, if I'm reading that right, this is normally KC_POWER:

So maybe #define KC_OSX_EJECT KC_POWER in your keymap would work, as well.



# Boot Section Size in *bytes*
OPT_DEFS += -DBOOTLOADER_SIZE=4096
Copy link
Member

Choose a reason for hiding this comment

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

Do you know what bootloader is in use here?

Copy link
Contributor Author

@yanfali yanfali May 22, 2018

Choose a reason for hiding this comment

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

caterina

Copy link
Member

Choose a reason for hiding this comment

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

Then if would definitely be best to use BOOTLOADER = caterina here, rather than opt_defs, since there is some specially handling for this bootloader.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

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

#include "../../bigswitch.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 should be #include "QMK_KEYBOARD_H", but I think you said that you had some issues when it was?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

let me switch it over

@yanfali
Copy link
Contributor Author

yanfali commented May 22, 2018

Feel free to squash this commit

@yanfali
Copy link
Contributor Author

yanfali commented May 22, 2018 via email

@yanfali
Copy link
Contributor Author

yanfali commented May 22, 2018

@drashna I've moved the Eject keycode to the keymap. Please squash before merge.

@drashna
Copy link
Member

drashna commented May 22, 2018

Thanks!

@drashna drashna merged commit c29d8ff into qmk:master May 22, 2018
@yanfali yanfali deleted the yanfali-bigswitch-pcb branch May 22, 2018 21:38
yanfali added a commit to yanfali/qmk_firmware that referenced this pull request May 24, 2018
* Adds basic support for u/flehrad's bigswitch pcb

 - also adds support for OSX Eject/Power
   The function of this key depends on the version of OSX and if you
   have physical media. For a macbook pro 2017 holding this key down
   brings up the shutdown dialog. If you wrap it in LCTL and LSFT the
   screenlock turns on immediately.

* Switch to Layout Macro

 - add a code for OSX Sleep

* Add a README

* Turn on RGB by default

* Add info.json

* Address comments by @drashna

* Only define Eject in keymap
carlpehrson pushed a commit to carlpehrson/qmk_firmware that referenced this pull request May 30, 2018
* Adds basic support for u/flehrad's bigswitch pcb

 - also adds support for OSX Eject/Power
   The function of this key depends on the version of OSX and if you
   have physical media. For a macbook pro 2017 holding this key down
   brings up the shutdown dialog. If you wrap it in LCTL and LSFT the
   screenlock turns on immediately.

* Switch to Layout Macro

 - add a code for OSX Sleep

* Add a README

* Turn on RGB by default

* Add info.json

* Address comments by @drashna

* Only define Eject in keymap
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Adds basic support for u/flehrad's bigswitch pcb

 - also adds support for OSX Eject/Power
   The function of this key depends on the version of OSX and if you
   have physical media. For a macbook pro 2017 holding this key down
   brings up the shutdown dialog. If you wrap it in LCTL and LSFT the
   screenlock turns on immediately.

* Switch to Layout Macro

 - add a code for OSX Sleep

* Add a README

* Turn on RGB by default

* Add info.json

* Address comments by @drashna

* Only define Eject in keymap
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.

None yet

3 participants