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

Add keyboard clap_studio/flame60 #24870

Merged
merged 1 commit into from
Jan 26, 2025
Merged

Add keyboard clap_studio/flame60 #24870

merged 1 commit into from
Jan 26, 2025

Conversation

mickimnet
Copy link
Contributor

Hello everybody,

even if the group-buy for the Clap_Studio Flame 60% keyboard ran about 3 years ago, I would like to add it to QMK.

Description

  • Got the source code from the Clap_Studio Discord server
  • Migrated the source code to keyboard.json format
  • Added more layouts for most common cases
  • Fixed errors in keymaps/default/keymap.c
  • Updated the picture with a real picture of the PCB, to avoid confusion

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout (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).

@mickimnet
Add keyboard clap_studio/flame60
f46f51e 
- Got the source code from the _Clap_Studio_ Discord server
- Migrated the source code to `keyboard.json` format
- Added more layouts for most common cases
- Fixed errors in `keymaps/default/keymap.c`
- Updated the picture with a real picture of the PCB, to avoid confusion
@waffle87 waffle87 requested a review from a team January 25, 2025 16:01
@waffle87 waffle87 merged commit 04c2dbd into qmk:master Jan 26, 2025
3 checks passed
@mickimnet mickimnet mentioned this pull request Jan 27, 2025
Merged
4 tasks
alk-alyss added a commit to alk-alyss/qmk_firmware that referenced this pull request Jan 30, 2025
@alk-alyss
Merge branch 'master' of https://github.com/qmk/qmk_firmware
07d8f40 
* 'master' of https://github.com/qmk/qmk_firmware: (221 commits)
  Add Keychron C3 Pro (Red & RGB) (qmk#24874)
  [OS Detection] Improve MacOS detection (qmk#24708)
  Bump vite from 5.2.14 to 5.4.12 in /builddefs/docsgen (qmk#24852)
  Reject keyboard.json next to info.json (qmk#24882)
  Add keyboard clap_studio/flame60 (qmk#24870)
  [Keyboard] Add Support E8ghtyNeo (qmk#24859)
  [License Violation] add pressplayid (qmk#24869)
  Fix missing wait.h include in Dip Switch Map (qmk#24863)
  Add Model-B keyboard (qmk#24681)
  Updated Licence Violations for Chosfox L75 (qmk#24833)
  License violations updates. (qmk#24831)
  Add Lily (qmk#24813)
  `kikoslab/kl90`: fix keymap (qmk#24826)
  [Keyboard] Add ic45v2 (qmk#24818)
  Allow running Docker container on MacOS (without in-container USB support) (qmk#24412)
  `salane/ncr80alpsskfl`: add additional layouts (qmk#24809)
  Bump nanoid from 3.3.7 to 3.3.8 in /builddefs/docsgen (qmk#24713)
  Fix a build warning and tidy up a keymap (qmk#24805)
  [Bug] Fix Underglow keycode processing (qmk#24798)
  [Docs] Fix wording in Mod Tap documentation (qmk#24796)
  ...
Rumadon pushed a commit to Rumadon/qmk_firmware that referenced this pull request Jan 31, 2025
@mickimnet @Rumadon
Add keyboard clap_studio/flame60 (qmk#24870)
0873fed 
- Got the source code from the _Clap_Studio_ Discord server
- Migrated the source code to `keyboard.json` format
- Added more layouts for most common cases
- Fixed errors in `keymaps/default/keymap.c`
- Updated the picture with a real picture of the PCB, to avoid confusion
MaximumP pushed a commit to MaximumP/qmk_firmware that referenced this pull request Feb 1, 2025
@mickimnet
Add keyboard clap_studio/flame60 (qmk#24870)
18c1aec 
- Got the source code from the _Clap_Studio_ Discord server
- Migrated the source code to `keyboard.json` format
- Added more layouts for most common cases
- Fixed errors in `keymaps/default/keymap.c`
- Updated the picture with a real picture of the PCB, to avoid confusion
@mickimnet mickimnet mentioned this pull request Feb 1, 2025
Merged
9 tasks
thomasc791 pushed a commit to thomasc791/qmk_firmware that referenced this pull request Feb 4, 2025
@mickimnet @thomasc791
Add keyboard clap_studio/flame60 (qmk#24870)
65fab43 
- Got the source code from the _Clap_Studio_ Discord server
- Migrated the source code to `keyboard.json` format
- Added more layouts for most common cases
- Fixed errors in `keymaps/default/keymap.c`
- Updated the picture with a real picture of the PCB, to avoid confusion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@waffle87 waffle87 waffle87 approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@mickimnet @fauxpark @waffle87