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 Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 #14252

Merged
merged 14 commits into from
Sep 24, 2021

Conversation

mechlovin
Copy link
Contributor

Add Adelais RGB_LED rev. 3 (STM32F303)
Adelais rev.4 APM32F103
Adelais AVR rev. 1 (Atmega32u4)

Description

Add Adelais PCB.
Adelais En Ciel Rev. 3: add Adelais RGB Rev. 3, adelais/rgb_led/rev3 (STM32F303 - IS31FL3741)
Adelais rev. 4: add support for APM32F303CBT6, adelais/standard_led/arm/rev4/apm32f103
Adelais AVR: add Adelais AVR rev. 1 (Atmega32u4), adelais/standard_led/avr/rev1.
Thank you.

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

keyboards/mechlovin/adelais/rgb_led/rev1/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev2/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/config.h Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rules.mk Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h Outdated Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented Sep 2, 2021

Also, because this is a significant change, it should probably target develop.

@mechlovin
Copy link
Contributor Author

Thank you for your suggestion. If we target Develop now, can it be moved/targeted to Master later and how? VIA requires the PCB to be in QMK Master.

@drashna
Copy link
Member

drashna commented Sep 8, 2021

Thank you for your suggestion. If we target Develop now, can it be moved/targeted to Master later and how? VIA requires the PCB to be in QMK Master.

Develop gets merged into master quarterly, so it will end up in master, eventually. Unfortunately, the last cycle ended a week or so ago, so it will be around November for the next merge.

That said, the requirement seems to be a soft one. Especially as tzarc has an automated build system that compiles from develop, and includes both default and via firmware images: https://qmk.tzarc.io/

@mechlovin mechlovin changed the base branch from master to develop September 8, 2021 08:07
@mechlovin
Copy link
Contributor Author

@drashna Thank you for clarifying, and targeted to Develop as suggested.

mechlovin and others added 10 commits September 18, 2021 13:36
Add Adelais RGB_LED rev. 3 (STM32F303)
Adelais rev.4 APM32F103
Adelais AVR rev. 1 (Atmega32u4)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@drashna drashna requested a review from a team September 18, 2021 19:25
keyboards/mechlovin/adelais/rules.mk Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rules.mk Outdated Show resolved Hide resolved
keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c Outdated Show resolved Hide resolved
mechlovin and others added 3 commits September 18, 2021 22:44
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@drashna
Copy link
Member

drashna commented Sep 24, 2021

Thanks!

@drashna drashna merged commit fcb7c7b into qmk:develop Sep 24, 2021
ptrxyz pushed a commit to ptrxyz/qmk_firmware that referenced this pull request Apr 9, 2022
…03, Adelais AVR rev. 1 (qmk#14252)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 3, 2022
…03, Adelais AVR rev. 1 (qmk#14252)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants