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

First support for SnR Iron165 R2 H #22595

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from

Conversation

Gondolindrim
Copy link
Contributor

@Gondolindrim Gondolindrim commented Dec 2, 2023

Description

This is the continuation of PR 20617 which due to the time it lasted made the merge conflicts obnoxiously big. Naturally it incorporates all feedback from that PR: thanks @drashna and @noroadsleft for the feedback!

Adds support for the Iron 165-H (hotswap) PCB. Since right now there is only a iron165r2 folder, the Iron165-S (solderable) was moved to a new folder iron165r2_s so that iron165r2_h would be used for the hotswap.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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 Dec 2, 2023
@Gondolindrim Gondolindrim marked this pull request as ready for review December 2, 2023 04:03
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.

Moved keyboards need to be added to keyboard_aliases.hjson.

keyboards/smithrune/iron165r2_h/info.json Show resolved Hide resolved
keyboards/smithrune/iron165r2_s/info.json Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team December 2, 2023 05:29
keyboards/smithrune/iron165r2_s/info.json Outdated Show resolved Hide resolved
@Gondolindrim
Copy link
Contributor Author

Moved keyboards need to be added to keyboard_aliases.hjson.

Done in 23822f0

@github-actions github-actions bot added the dd Data Driven Changes label Dec 3, 2023
@dunk2k
Copy link
Contributor

dunk2k commented Dec 3, 2023

@Gondolindrim:
Directory keyboards/smithrune/iron165r2_h/ missing readme.md file 😳

keyboards/smithrune/iron165r2_s/readme.md Outdated Show resolved Hide resolved
keyboards/smithrune/iron165r2_s/info.json Outdated Show resolved Hide resolved
keyboards/smithrune/iron165r2_h/info.json Outdated Show resolved Hide resolved
Gondolindrim and others added 3 commits December 4, 2023 16:44
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
keyboards/smithrune/iron165r2_s/info.json Outdated Show resolved Hide resolved
Gondolindrim and others added 3 commits December 4, 2023 17:02
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Gondolindrim
Copy link
Contributor Author

Not sure what to do about the Lint error. It claims no LAYOUT_65_ansi_blocker_tsangan() macro found yet the macro is defined on info.json

@Gondolindrim Gondolindrim reopened this Dec 4, 2023
keyboards/smithrune/iron165r2_s/info.json Outdated Show resolved Hide resolved
@dunk2k
Copy link
Contributor

dunk2k commented Dec 4, 2023

Not sure what to do about the Lint error. It claims no LAYOUT_65_ansi_blocker_tsangan() macro found yet the macro is defined on info.json

spelling mistake - my fault, apologies. Suggestion with correction

keyboards/smithrune/iron165r2_h/config.h Outdated Show resolved Hide resolved
Gondolindrim and others added 2 commits December 5, 2023 00:34
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@drashna drashna requested review from a team and fauxpark December 5, 2023 04:01
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 Jan 20, 2024
@drashna drashna added awaiting review and removed stale Issues or pull requests that have become inactive without resolution. labels Feb 1, 2024
@noroadsleft
Copy link
Member

Looks like this needs a rebase due to merge conflicts.

  • WS2812_DMA_STREAM has been renamed to WS2812_PWM_DMA_STREAM
  • WS2812_DMA_CHANNEL has been renamed to WS2812_PWM_DMA_CHANNEL
  • config.h's #define RGBLIGHT_DEFAULT_VAL is now represented in info.json/keyboard.json as rgblight.default.val:
    {
        ...
        "rgblight": {
            "default": {
                "val": 0
            }
        },
        ...
    }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting review dd Data Driven Changes 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.

5 participants