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

[keyboard] Add Phantagom numpads #18493

Closed
wants to merge 39 commits into from
Closed

Conversation

dkruyt
Copy link
Contributor

@dkruyt dkruyt commented Sep 26, 2022

Description

Add support for 2 numpads / marco pads. Includes default and via support.

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: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • 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).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Sep 26, 2022
keyboards/phantagom/oled_mpad/config.h Outdated Show resolved Hide resolved
keyboards/phantagom/oled_mpad/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/phantagom/oled_mpad/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/phantagom/oled_mpad/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/phantagom/oled_mpad/oled_mpad.h Show resolved Hide resolved
keyboards/phantagom/rgb_npad/rgb_npad.c Show resolved Hide resolved
keyboards/phantagom/rgb_npad/rgb_npad.h Show resolved Hide resolved
@dkruyt dkruyt requested a review from drashna October 26, 2022 20:43
dkruyt and others added 6 commits November 13, 2022 10:07
Co-authored-by: Nick Brassel <nick@tzarc.org>
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
Xelus22 and others added 9 commits November 18, 2022 10:00
Co-authored-by: Ryan <fauxpark@gmail.com>
Swap Hands on/off - it's `SH_ON/OFF` not `SW_ON/OFF`
ANAVI Knob 1 is a mini mechanical keyboard with a clickable rotary
encoder, USB-C, RP2040 microcontroller and I2C slot for a display.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
* Latest updates

* Aligning and cleaning up planck and babyv layouts

* Added license, cleaned up errors
keyboards/phantagom/rgb_npad/readme.md Outdated Show resolved Hide resolved
keyboards/phantagom/rgb_npad/info.json Outdated Show resolved Hide resolved
keyboards/phantagom/rgb_npad/info.json Outdated Show resolved Hide resolved
keyboards/phantagom/rgb_npad/info.json Outdated Show resolved Hide resolved
@github-actions
Copy link

github-actions bot commented Jan 5, 2023

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Jan 5, 2023
}

#ifdef OLED_ENABLE
bool oled_task_user(void) {
Copy link
Member

Choose a reason for hiding this comment

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

could all of this be moved to oled_mpad.c, and use the oled_task_kb function?

@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Jan 13, 2023
Comment on lines +2 to +9
"name": "oled_mpad",
"keyboard_name": "oled_mpad",
"manufacturer": "Phantagom",
"vendorId": "0xF8E8",
"productId": "0x0001",
"matrix": { "rows": 6, "cols": 5 },
"url": "",
"lighting": "qmk_rgblight",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"name": "oled_mpad",
"keyboard_name": "oled_mpad",
"manufacturer": "Phantagom",
"vendorId": "0xF8E8",
"productId": "0x0001",
"matrix": { "rows": 6, "cols": 5 },
"url": "",
"lighting": "qmk_rgblight",
"keyboard_name": "oled_mpad",
"manufacturer": "Phantagom",

Comment on lines +73 to +89
void matrix_init_user(void) {
// set CapsLock LED to output and low
setPinOutput(GP4);
writePinLow(GP4);
// set NumLock LED to output and low
setPinOutput(GP5);
writePinLow(GP5);
// set ScrollLock LED to output and low
setPinOutput(GP6);
writePinLow(GP6);
}

void led_update_ports(led_t led_state) {
writePin(GP4, led_state.num_lock);
writePin(GP5, led_state.caps_lock);
writePin(GP6, led_state.scroll_lock);
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
void matrix_init_user(void) {
// set CapsLock LED to output and low
setPinOutput(GP4);
writePinLow(GP4);
// set NumLock LED to output and low
setPinOutput(GP5);
writePinLow(GP5);
// set ScrollLock LED to output and low
setPinOutput(GP6);
writePinLow(GP6);
}
void led_update_ports(led_t led_state) {
writePin(GP4, led_state.num_lock);
writePin(GP5, led_state.caps_lock);
writePin(GP6, led_state.scroll_lock);
}

"vid": "0xF8E8",
"pid": "0x0001",
"device_version": "0.0.3"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
},
},
"indicators": {
"caps_lock": "GP5",
"num_lock": "GP4",
"scroll_lock": "GP6",
"on_state": 0
},

Comment on lines +73 to +93
void matrix_init_user(void) {
// set CapsLock LED to output and low
setPinOutput(GP4);
writePinLow(GP4);
// set NumLock LED to output and low
setPinOutput(GP5);
writePinLow(GP5);
// set ScrollLock LED to output and low
setPinOutput(GP6);
writePinLow(GP6);
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
writePin(GP4, led_state.num_lock);
writePin(GP5, led_state.caps_lock);
//writePin(B2, led_state.scroll_lock);
}
return res;
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
void matrix_init_user(void) {
// set CapsLock LED to output and low
setPinOutput(GP4);
writePinLow(GP4);
// set NumLock LED to output and low
setPinOutput(GP5);
writePinLow(GP5);
// set ScrollLock LED to output and low
setPinOutput(GP6);
writePinLow(GP6);
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
writePin(GP4, led_state.num_lock);
writePin(GP5, led_state.caps_lock);
//writePin(B2, led_state.scroll_lock);
}
return res;
}

@@ -0,0 +1,8 @@
# OLED_MPAD

![OLED_MPAD](https://i.imgur.com/EEJFeOl.jpeg)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
![OLED_MPAD](https://i.imgur.com/EEJFeOl.jpeg)
![OLED_MPAD](https://i.imgur.com/EEJFeOlh.jpeg)

@@ -0,0 +1,8 @@
# RGB_NPAD

![RGB_NPAD](https://i.imgur.com/EuGAMye.jpeg)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
![RGB_NPAD](https://i.imgur.com/EuGAMye.jpeg)
![RGB_NPAD](https://i.imgur.com/EuGAMyeh.jpeg)

Comment on lines +1 to +4
# MCU name
MCU = RP2040
# Bootloader selection
BOOTLOADER = rp2040
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# MCU name
MCU = RP2040
# Bootloader selection
BOOTLOADER = rp2040

"keyboard_name": "rgb_npad",
"manufacturer": "Phantagom",
"url": "",
"maintainer": "Phantagom",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"maintainer": "Phantagom",
"maintainer": "Phantagom",
"processor": "RP2040",
"bootloader": "rp2040",

NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGBLIGHT_DRIVER = WS2812
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
RGBLIGHT_DRIVER = WS2812

@@ -0,0 +1,19 @@
/*
Copy link
Member

Choose a reason for hiding this comment

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

This file should be removed.

@github-actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Feb 28, 2023
@github-actions
Copy link

Thank you for your contribution!
This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
// [stale-action-closed]

@github-actions github-actions bot closed this Mar 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution. via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.