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.

Sign up for GitHub

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

Jump to bottom

[Keyboard] Update era/divine #21767

Merged
merged 5 commits into from
Sep 3, 2023
Merged

[Keyboard] Update era/divine #21767

merged 5 commits into from
Sep 3, 2023

Conversation

eerraa
Copy link
Contributor

@eerraa eerraa commented Aug 16, 2023

Fix indicator behavior

Description

Enable PWM for indicator operation and also modify readme.md.

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

@eerraa
Add backlight for indicator operation
9437f8d 
Add backlight for indicator operation
@eerraa
Add license header
c87cedc 
Add license header
zvecr
zvecr requested changes Aug 16, 2023
View reviewed changes
keyboards/era/divine/config.h Outdated Show resolved Hide resolved
keyboards/era/divine/rules.mk Outdated Show resolved Hide resolved
keyboards/era/divine/halconf.h Outdated Show resolved Hide resolved
keyboards/era/divine/halconf.h Outdated Show resolved Hide resolved
keyboards/era/divine/divine.c Outdated Show resolved Hide resolved
@zvecr zvecr changed the title [Keyboard] era/divine PCB support [Keyboard] Update era/divine Aug 16, 2023
eerraa added 2 commits August 17, 2023 00:32
@eerraa
Apply Change Request
1bd324d 
Apply Change Request
@eerraa
delete keyboard.c
9330cfe 
delete unnecessary code
@eerraa eerraa requested a review from zvecr August 17, 2023 00:42
@drashna drashna requested a review from a team August 17, 2023 03:16
@eerraa
Copy link
Contributor Author

eerraa commented Aug 17, 2023 •
edited
Loading

@zvecr
Sir, I have a question.
When does the merge from the develop branch to the master branch happen?
Is it automatically moved to the master branch?

fauxpark
fauxpark requested changes Aug 21, 2023
View reviewed changes
keyboards/era/divine/info.json Outdated Show resolved Hide resolved
@eerraa eerraa requested a review from fauxpark August 22, 2023 05:16
@drashna drashna changed the base branch from develop to master August 30, 2023 02:15
fauxpark
fauxpark requested changes Aug 31, 2023
View reviewed changes
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.

This PR should go to develop, as it modifies existing keyboard files.

@eerraa eerraa changed the base branch from master to develop August 31, 2023 23:03
@eerraa
Copy link
Contributor Author

eerraa commented Aug 31, 2023

@fauxpark
Ugh... I knew that, but I guess I made a mistake.

@zvecr zvecr merged commit 1e3095f into qmk:develop Sep 3, 2023
@eerraa eerraa mentioned this pull request Oct 5, 2023
Closed
7 tasks
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Oct 25, 2023
@eerraa @mechlovin
[Keyboard] Update era/divine (qmk#21767)
fca492c
zgagnon pushed a commit to zgagnon/qmk_firmware_waterfowl that referenced this pull request Dec 15, 2023
@eerraa @zgagnon
[Keyboard] Update era/divine (qmk#21767)
0283212
future-figs pushed a commit to future-figs/qmk_firmware that referenced this pull request Dec 27, 2023
@eerraa
[Keyboard] Update era/divine (qmk#21767)
1e12b95
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@zvecr zvecr zvecr approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eerraa @drashna @fauxpark @zvecr