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

Adding new pcb with default keymap and personal keymap #7314

Merged
merged 54 commits into from
Nov 15, 2019

Conversation

sidcarter
Copy link
Contributor

Description

  • Adds the Leeku Finger65 PCB
  • Adds a default keymap
  • Adds a personal keymap

Majority of the code comes from here - https://github.com/rasmusx/qmk_firmware

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

@sidcarter
Copy link
Contributor Author

To reiterate, not my code. Original code linked in the PR.

I have tested this code with my TX65 and another spare Finger65 PCB that I have.

keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/readme.md Outdated Show resolved Hide resolved
keyboards/leeku/finger65/rules.mk Outdated Show resolved Hide resolved
keyboards/leeku/finger65/rules.mk Outdated Show resolved Hide resolved
keyboards/leeku/finger65/rules.mk Outdated Show resolved Hide resolved
keyboards/leeku/finger65/rules.mk Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team November 10, 2019 03:06
@fauxpark
Copy link
Member

I looked at the tinycmd code a little more, and from what I can tell this board still requires the Jigon software to control the RGB lighting? If this is the case... I don't really know how mergeable this will be. The ATtiny85 looks to have something more sophisticated flashed onto it than the standard Bootmapper RGB controller, as it apparently contains several effects. If there's a way to just send it the raw RGB data, we could potentially strip out everything but that as a custom WS2812 driver. But yeah, this might be tricky.

@sidcarter
Copy link
Contributor Author

@fauxpark tbqh, the LEDs sit inside an alu case. So I couldn't care less about the LEDs for now.

I'm just glad to have finger65 with QMK on it.

So, I'm happy to strip LEDs from this for now and someone else can add them on when they get a PC or a Acrylic case for the TX65.

So now when I disable all LED stuff, i get this error when compiling. I guess I need to add these in ROW and COL pins - not sure how to do that.

Compiling: quantum/matrix.c                                                                        quantum/matrix.c:51:44: error: ‘MATRIX_ROW_PINS’ undeclared here (not in a function)
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
                                            ^
quantum/matrix.c:52:44: error: ‘MATRIX_COL_PINS’ undeclared here (not in a function)
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;

@fauxpark
Copy link
Member

Yeah, you need to put something like this in the config.h, under the row/column numbers:

#define MATRIX_ROW_PINS { ... }
#define MATRIX_COL_PINS { ... }

keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/config.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/finger65.h Show resolved Hide resolved
keyboards/leeku/finger65/finger65.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/info.json Show resolved Hide resolved
keyboards/leeku/finger65/readme.md Outdated Show resolved Hide resolved
keyboards/leeku/finger65/readme.md Outdated Show resolved Hide resolved
keyboards/leeku/finger65/readme.md Outdated Show resolved Hide resolved
* (e.g. HID), but never want to send any data. This option saves a couple
* of bytes in flash memory and the transmit buffers in RAM.
*/
#define USB_CFG_INTR_POLL_INTERVAL 10
Copy link
Member

Choose a reason for hiding this comment

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

Just as a note to the both of us, this and USB_CFG_MAX_BUS_POWER will be configured the same way as for 32U4 keyboards when #7336 lands. 10ms will probably be the default polling interval (as it is for LUFA), but you may want to pre-emptively add #define USB_MAX_POWER_CONSUMPTION 100 into the config.h.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

should I also remove the USB_CFG_INTR_POLL_INTERVAL ? @fauxpark

Copy link
Member

Choose a reason for hiding this comment

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

The default is turning out to be 1ms, for now, so yeah, that will go too and you should add #define USB_POLLING_INTERVAL_MS 10 in config.h if you want to keep this value. I'll see if I can get my PR in first, then you can remove these two :)

Copy link
Member

Choose a reason for hiding this comment

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

@sidcarter okay, the PRs are in, go for it

@noroadsleft noroadsleft requested a review from fauxpark November 15, 2019 02:15
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.

My stuff's all good. @fauxpark, what say you?

Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

Just waiting on these two things, otherwise LGTM

keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
keyboards/leeku/finger65/usbconfig.h Outdated Show resolved Hide resolved
@sidcarter
Copy link
Contributor Author

@fauxpark
Copy link
Member

Thanks!

@fauxpark fauxpark merged commit 4388932 into qmk:master Nov 15, 2019
@sidcarter sidcarter deleted the leeku_finger65 branch November 15, 2019 02:30
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Nov 15, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (475 commits)
  [Keyboard] kbdfans keyboards NKRO enable (qmk#7364)
  [Keyboard] fix DZ60RGB info.json (qmk#7362)
  Adding new pcb with default keymap and personal keymap (qmk#7314)
  [Core] Cleanup rules.mk for F303 keyboards (qmk#7306)
  [Docs] Japanese translation of docs/ja/newbs_best_practices.md (qmk#7337)
  Set device version from config.h for V-USB boards (qmk#7316)
  Add support for configurable polling interval and power usage o… (qmk#7336)
  capslock_led (qmk#7359)
  Move Ergodox EZ RGB Light code to custom driver  (qmk#7309)
  Fix shell.nix by pinning nixpkgs (qmk#6213)
  [Keyboard] add kbdmini; dztech, kbdfans keyboards cleanup (qmk#7223)
  [Docs] Encourage newbs to not download the repo as a zip (qmk#7353)
  Update debounce docs (qmk#7355)
  [Keyboard] Add TG4x (qmk#7351)
  [Keyboard] Add FLX Virgo (qmk#7352)
  format code according to conventions [skip ci]
  Adding verd layout to RSII (qmk#7296)
  Add my custom layouts for GH60, DZ60 and Minivan (qmk#7278)
  [Keyboard] Added abnt2 layout to dz60 (qmk#7340)
  [Keyboard] add Little Keyboards as a seller of helix pcbs outside of japan (qmk#7249)
  ...
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* adding new pcb with default keymap and personal keymap

* Update keyboards/leeku/finger65/readme.md

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

* Change to newer DEBOUNCE format

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

* switch to pragma

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

* remove unused define keyboards/leeku/finger65/config.h

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

* some cleanup after debounce and other changes

* Remove no_suspend_power_down from keyboards/leeku/finger65/rules.mk

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

* move to newer format and remove unused stuff

* ensure default has no leds for now

* change default layout name

* clean up the keymap a bit

* want grave not tilde

* a minor change and cleanup

* more stuff removed cause I don't care for LEDs

* remove some remaining stuff

* add RGBLED stuff

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* update USB information

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* cleanup and conform to existing standard

* Update keyboards/leeku/finger65/rules.mk

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

* remove stuff that doesn't work

* add a JSON for the QMK configurator

* list the layouts only available

* let's just make it the 65 ansi layout with split backspace, eh?

* remove extra space

* Update keyboards/leeku/finger65/readme.md

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

* Update keyboards/leeku/finger65/readme.md

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

* update readme

* remove redundant title

* Monica Bellucci ruined my life

* I'm having a RELIGIOUS EXPERIENCE ... and I don't take any DRUGS

* Update keyboards/leeku/finger65/rules.mk

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

* add a URL to the username

* fix readme and make it simpler with links this time

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* incorporate suggested changes

* update usb stuff for some stuff coming in the future

* update layout for LAYOUT_ALL

* USB power changes
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
* adding new pcb with default keymap and personal keymap

* Update keyboards/leeku/finger65/readme.md

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

* Change to newer DEBOUNCE format

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

* switch to pragma

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

* remove unused define keyboards/leeku/finger65/config.h

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

* some cleanup after debounce and other changes

* Remove no_suspend_power_down from keyboards/leeku/finger65/rules.mk

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

* move to newer format and remove unused stuff

* ensure default has no leds for now

* change default layout name

* clean up the keymap a bit

* want grave not tilde

* a minor change and cleanup

* more stuff removed cause I don't care for LEDs

* remove some remaining stuff

* add RGBLED stuff

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* update USB information

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* cleanup and conform to existing standard

* Update keyboards/leeku/finger65/rules.mk

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

* remove stuff that doesn't work

* add a JSON for the QMK configurator

* list the layouts only available

* let's just make it the 65 ansi layout with split backspace, eh?

* remove extra space

* Update keyboards/leeku/finger65/readme.md

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

* Update keyboards/leeku/finger65/readme.md

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

* update readme

* remove redundant title

* Monica Bellucci ruined my life

* I'm having a RELIGIOUS EXPERIENCE ... and I don't take any DRUGS

* Update keyboards/leeku/finger65/rules.mk

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

* add a URL to the username

* fix readme and make it simpler with links this time

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* incorporate suggested changes

* update usb stuff for some stuff coming in the future

* update layout for LAYOUT_ALL

* USB power changes
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
* adding new pcb with default keymap and personal keymap

* Update keyboards/leeku/finger65/readme.md

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

* Change to newer DEBOUNCE format

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

* switch to pragma

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

* remove unused define keyboards/leeku/finger65/config.h

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

* some cleanup after debounce and other changes

* Remove no_suspend_power_down from keyboards/leeku/finger65/rules.mk

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

* move to newer format and remove unused stuff

* ensure default has no leds for now

* change default layout name

* clean up the keymap a bit

* want grave not tilde

* a minor change and cleanup

* more stuff removed cause I don't care for LEDs

* remove some remaining stuff

* add RGBLED stuff

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/usbconfig.h

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

* update USB information

* Update keyboards/leeku/finger65/usbconfig.h

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/rules.mk

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/default/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* Update keyboards/leeku/finger65/keymaps/madhatter/keymap.c

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

* cleanup and conform to existing standard

* Update keyboards/leeku/finger65/rules.mk

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

* remove stuff that doesn't work

* add a JSON for the QMK configurator

* list the layouts only available

* let's just make it the 65 ansi layout with split backspace, eh?

* remove extra space

* Update keyboards/leeku/finger65/readme.md

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

* Update keyboards/leeku/finger65/readme.md

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

* update readme

* remove redundant title

* Monica Bellucci ruined my life

* I'm having a RELIGIOUS EXPERIENCE ... and I don't take any DRUGS

* Update keyboards/leeku/finger65/rules.mk

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

* add a URL to the username

* fix readme and make it simpler with links this time

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* Update keyboards/leeku/finger65/readme.md

Co-Authored-By: James Young <[email protected]>

* incorporate suggested changes

* update usb stuff for some stuff coming in the future

* update layout for LAYOUT_ALL

* USB power changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants