[Keyboard] Added D48 keyboard. #8548

and3rson · 2020-03-24T16:11:35Z

Description

Added D48 keyboard - Proton C based 48-key keyboard with OLED, 2 encoders, WS2812 strip, a buzzer & a real-time clock (DS1307). https://www.reddit.com/r/MechanicalKeyboards/comments/fns0kk/proton_c_40_keyboard_w_128x32_oled_2_rotary/?utm_source=share&utm_medium=web2x

Types of Changes

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

zvecr

Can you relocate the project to the keyboards/handwired folder please.

and3rson · 2020-03-24T22:13:31Z

@zvecr Done!

and3rson · 2020-03-25T15:06:21Z

I've just added a DS1307 RTC & updated my README. Hope someone will like this monstrosity!

keyboards/handwired/d48/README.md

drashna

Ideally, we'd prefer that keyboards and keymap/user code be separated out.

But more importantly, we need a default keymap for the keyboard.

keyboards/handwired/d48/glcdfont_d48.c

keyboards/handwired/d48/keymaps/anderson/keymap.c

users/anderson/ds1307.c

users/anderson/dmc12.h

users/anderson/ds1307.h

users/anderson/seq.h

users/anderson/smoothled.h

zvecr

The split of ds1307 between userspace and keyboard is kinda messy. Not that I imagine it will happen, but if a user were to add another keymap to this board, it wouldn't compile correctly without duplicating a bunch of your userspace files. My suggestion is to move users/anderson/ds1307.* to keyboards/handwired/d48/.

Co-Authored-By: Drashna Jaelre <[email protected]>

and3rson · 2020-03-26T09:23:26Z

@drashna Thanks for the suggestions! I've applied your changes.
@zvecr I thing userspace feature now makes sense to me. I was using it as a place to put some common libraries. But my mistake was that those should actually be linked on a keymap level, not a keyboard level. I've applied the necessary fixes by moving ds1307.c to the keyboard dir (as it's a part of keyboard) and also moving lightmode stuff into keymap.

keyboards/handwired/d48/config.h

drashna · 2020-03-26T18:46:03Z

@zvecr I thing userspace feature now makes sense to me. I was using it as a place to put some common libraries. But my mistake was that those should actually be linked on a keymap level, not a keyboard level. I've applied the necessary fixes by moving ds1307.c to the keyboard dir (as it's a part of keyboard) and also moving lightmode stuff into keymap.

It is actually kind of that. But it's tied to the keymap name (usually). So it's not really "shared". If you wan to have a common library for the board, then in the keyboard's folder would be the best place for that.

and3rson · 2020-03-30T02:30:03Z

Any other changes needed from my side?

keyboards/handwired/d48/README.md

keyboards/handwired/d48/config.h

keyboards/handwired/d48/keymaps/default/rules.mk

Co-Authored-By: Drashna Jaelre <[email protected]>

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

keyboards/handwired/d48/d48.h

keyboards/handwired/d48/ds1307.h

keyboards/handwired/d48/ds1307.c

keyboards/handwired/d48/keymaps/anderson/rules.mk

Co-Authored-By: Joel Challis <[email protected]>

keyboards/handwired/d48/glcdfont_d48.c

users/anderson/layout_defs.h

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

keyboards/handwired/d48/keymaps/anderson/keymap.c

keyboards/handwired/d48/rules.mk

Co-authored-by: James Young <[email protected]>

noroadsleft

Looks good to me.

* [Keyboard] Added D48 keyboard. * Updated README. * Cleanups. * Moved d48 to handwired/ * Added link to build process album. * Coding conventions cleanups. * Added DS1307 RTC! * Minor cleanups. * Apply suggestions from code review Co-Authored-By: Drashna Jaelre <[email protected]> * Minor refactoring. * Readme fix. * Moved leftover keymap-specific code from keyboard space into keymap. * Added encoder button pins to extra matrix row. * Updated README, updated pinout & cleaned up the glcdfont * Apply suggestions from code review Co-Authored-By: Drashna Jaelre <[email protected]> * Update config.h * Apply suggestions from code review Co-Authored-By: Ryan <[email protected]> * Added default keymap. Refactored existing keymap. * Update keyboards/handwired/d48/README.md Co-Authored-By: Ryan <[email protected]> * Apply suggestions from code review Co-Authored-By: Joel Challis <[email protected]> * Minor alignment fix. * Update keyboards/handwired/d48/glcdfont_d48.c Co-Authored-By: Ryan <[email protected]> * Changes as per PR. * Apply suggestions from code review Co-authored-by: James Young <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Joel Challis <[email protected]> Co-authored-by: James Young <[email protected]>

and3rson force-pushed the d48 branch 2 times, most recently from 21de0a4 to bee34b7 Compare March 24, 2020 16:17

and3rson added 3 commits March 24, 2020 18:18

[Keyboard] Added D48 keyboard.

cb79a47

Updated README.

e89d1de

Cleanups.

bee34b7

zvecr requested changes Mar 24, 2020

View reviewed changes

and3rson added 2 commits March 24, 2020 23:58

Moved d48 to handwired/

04a327a

Added link to build process album.

4f052e5

Coding conventions cleanups.

5b49678

and3rson added 2 commits March 25, 2020 17:06

Added DS1307 RTC!

577bca3

Minor cleanups.

93cd115

drashna reviewed Mar 26, 2020

View reviewed changes

keyboards/handwired/d48/README.md Show resolved Hide resolved

drashna requested changes Mar 26, 2020

View reviewed changes

zvecr requested changes Mar 26, 2020

View reviewed changes

zvecr added the keyboard label Mar 26, 2020

and3rson and others added 2 commits March 26, 2020 11:09

Apply suggestions from code review

b749824

Co-Authored-By: Drashna Jaelre <[email protected]>

Minor refactoring.

7fd428f

and3rson added 3 commits March 26, 2020 11:28

Readme fix.

d14d1ac

Moved leftover keymap-specific code from keyboard space into keymap.

8e17bab

Added encoder button pins to extra matrix row.

ff2e782

drashna reviewed Mar 26, 2020

View reviewed changes

keyboards/handwired/d48/config.h Outdated Show resolved Hide resolved

and3rson force-pushed the d48 branch from 950cff0 to 003b8b2 Compare April 1, 2020 18:33

Updated README, updated pinout & cleaned up the glcdfont

003b8b2

drashna reviewed Apr 5, 2020

View reviewed changes

keyboards/handwired/d48/README.md Outdated Show resolved Hide resolved

keyboards/handwired/d48/config.h Outdated Show resolved Hide resolved

keyboards/handwired/d48/keymaps/default/rules.mk Outdated Show resolved Hide resolved

Apply suggestions from code review

421c5a0

Co-Authored-By: Drashna Jaelre <[email protected]>

and3rson and others added 2 commits April 12, 2020 23:43

Added default keymap. Refactored existing keymap.

d788d05

Update keyboards/handwired/d48/README.md

1d5e207

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

zvecr requested a review from fauxpark April 12, 2020 22:22

zvecr requested changes Apr 12, 2020

View reviewed changes

and3rson and others added 2 commits April 13, 2020 01:59

Apply suggestions from code review

ce2dd23

Co-Authored-By: Joel Challis <[email protected]>

Minor alignment fix.

45a4c5b

drashna approved these changes Apr 28, 2020

View reviewed changes

fauxpark requested changes Apr 28, 2020

View reviewed changes

keyboards/handwired/d48/glcdfont_d48.c Outdated Show resolved Hide resolved

users/anderson/layout_defs.h Outdated Show resolved Hide resolved

and3rson and others added 2 commits April 28, 2020 15:23

Update keyboards/handwired/d48/glcdfont_d48.c

583a192

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

Changes as per PR.

d2977e6

noroadsleft requested changes May 7, 2020

View reviewed changes

keyboards/handwired/d48/keymaps/anderson/keymap.c Outdated Show resolved Hide resolved

keyboards/handwired/d48/rules.mk Outdated Show resolved Hide resolved

Apply suggestions from code review

eb1924f

Co-authored-by: James Young <[email protected]>

noroadsleft approved these changes May 7, 2020

View reviewed changes

noroadsleft added the awaiting review label May 7, 2020

noroadsleft requested review from zvecr and fauxpark May 7, 2020 18:15

drashna merged commit 1f7bbf2 into qmk:master May 9, 2020

noroadsleft removed the awaiting review label May 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Keyboard] Added D48 keyboard. #8548

[Keyboard] Added D48 keyboard. #8548

and3rson commented Mar 24, 2020 •

edited

Loading

zvecr left a comment

and3rson commented Mar 24, 2020

and3rson commented Mar 25, 2020 •

edited

Loading

drashna left a comment

zvecr left a comment

and3rson commented Mar 26, 2020

drashna commented Mar 26, 2020

and3rson commented Mar 30, 2020

noroadsleft left a comment

[Keyboard] Added D48 keyboard. #8548

[Keyboard] Added D48 keyboard. #8548

Conversation

and3rson commented Mar 24, 2020 • edited Loading

Description

Types of Changes

Checklist

zvecr left a comment

Choose a reason for hiding this comment

and3rson commented Mar 24, 2020

and3rson commented Mar 25, 2020 • edited Loading

drashna left a comment

Choose a reason for hiding this comment

zvecr left a comment

Choose a reason for hiding this comment

and3rson commented Mar 26, 2020

drashna commented Mar 26, 2020

and3rson commented Mar 30, 2020

noroadsleft left a comment

Choose a reason for hiding this comment

and3rson commented Mar 24, 2020 •

edited

Loading

and3rson commented Mar 25, 2020 •

edited

Loading