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

add 5075 keyboard. #20556

Open
wants to merge 83 commits into
base: master
Choose a base branch
from
Open

add 5075 keyboard. #20556

wants to merge 83 commits into from

Conversation

jonylee1986
Copy link
Contributor

Description

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 Apr 25, 2023
@adophoxia
Copy link
Contributor

Don't know how, but you guys forgot to specify both, the MCU and bootloader, in info.json which is causing the CI to fail. 🙂

keyboards/akko/5075/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/akko/5075/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/akko/5075/keymaps/via/rules.mk Outdated Show resolved Hide resolved
keyboards/akko/5075/rules.mk Outdated Show resolved Hide resolved
@adophoxia
Copy link
Contributor

Bit curious about this board. @jonylee1986, is the firmware from this PR for the 5075S that's already being sold on Akko's website or this for a different variant?

@jonylee1986
Copy link
Contributor Author

the firmware from this PR is prepared for the upcoming release of 5075 which on the AKKO official website,and it is a different variant supports the QMK.@adophoxia

@jonylee1986 jonylee1986 requested a review from adophoxia April 26, 2023 06:26
@github-actions
Copy link

github-actions bot commented Aug 9, 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 Aug 9, 2023
@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Aug 10, 2023
@drashna drashna requested a review from a team August 14, 2023 07:20
jonylee1986 and others added 2 commits May 15, 2024 09:05
keyboards/akko/5075/5075.c Outdated Show resolved Hide resolved
A customizable 75% encoder keyboard.

* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
* Hardware Supported: Akko 5075

Choose a reason for hiding this comment

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

Maybe mention this code is also valid for 5075S kit to avoid confusion.

@tzarc
Copy link
Member

tzarc commented Aug 26, 2024

As of August 26, 2024, qmk/qmk_firmware is no longer accepting VIA-enabled keymaps as these have now transitioned to a repository under the VIA team's control.

As you've submitted a PR containing via or VIA-enabled keymap(s), this is your notice that they should be removed from this PR. You should now submit a secondary PR to the VIA QMK Userspace repository with your associated via or VIA-enabled keymaps instead.

@Imlimp
Copy link

Imlimp commented Oct 8, 2024

Does this work for Akko 5075B Plus @jonylee1986?

@adophoxia
Copy link
Contributor

Does this work for Akko 5075B Plus @ jonylee1986?

It does not, @Imlimp. This is only for the 5075S VIA variant that is explicitly called that.

keyboards/akko/5075/keyboard.json Outdated Show resolved Hide resolved
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.

RGB_ -> RM_ keycodes after this round of breaking changes.

Comment on lines +49 to +54
_______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______,
_______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
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
_______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RGB_MOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______,
_______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
_______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, RM_NEXT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______,
_______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, RM_NEXT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU, _______,
_______, GU_TOGG, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU),

Comment on lines +73 to +78
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______,
_______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
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
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_MOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______,
_______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RM_NEXT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______,
_______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR,_______, _______, RM_NEXT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, RM_HUEU, _______,
_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RM_VALU, _______,
_______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_VALD, RM_SATU),

Comment on lines +84 to +87
[WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }
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
[WIN_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_FN] = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD) }
[WIN_FN] = { ENCODER_CCW_CW(RM_VALU, RM_VALD) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[MAC_FN] = { ENCODER_CCW_CW(RM_VALU, RM_VALD) }

}

void housekeeping_task_kb(void) {
gpio_write_pin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3)));

Choose a reason for hiding this comment

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

This is making the LED that's supposed to inform if the keyboard is on Mac or Windows have a strange behaviour: it informs we are on the default layer on Mac by turning on, but turns off if the FN key is pressed. On Windows, it turns off on default layer as expected, but will actually turn on when we press the FN key. Maybe something like this would be better:

Suggested change
gpio_write_pin(LED_MAC_OS_PIN, ((get_highest_layer(default_layer_state | layer_state) == 2) || (get_highest_layer(default_layer_state | layer_state) == 3)));
gpio_write_pin(LED_MAC_OS_PIN,
(get_highest_layer(default_layer_state | layer_state) == 3) ||
(get_highest_layer(default_layer_state | layer_state) == 4) ||
(get_highest_layer(default_layer_state | layer_state) == 5));

This will only turn the led on when any layer related to Mac is active.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.