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

Refactor S60x #5596

Merged
merged 15 commits into from May 4, 2019
Merged

Refactor S60x #5596

merged 15 commits into from May 4, 2019

Conversation

mechmerlin
Copy link
Contributor

@mechmerlin mechmerlin commented Apr 10, 2019

Description

Refactored S60-X to do the following:

  1. Force users to select which version rgb, or default when compiling firmware to avoid flashing defaults onto non supported hardware.
  2. Introduce HHKB LAYOUT macro and QMK Configurator support
  3. Have both rgb and default pcbs share one info.json file
  4. Cleanups such as #pragma once usage

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.
  • 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/sentraq/s60_x/default/config.h Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/default/config.h Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/default/rules.mk Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/rgb/config.h Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/rgb/config.h Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/rgb/rules.mk Outdated Show resolved Hide resolved
keyboards/sentraq/s60_x/readme.md Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented May 4, 2019

Thanks!

@drashna drashna merged commit 997bafc into qmk:master May 4, 2019
foosinn pushed a commit to foosinn/qmk_firmware that referenced this pull request May 6, 2019
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
KauyonKais pushed a commit to KauyonKais/qmk_firmware that referenced this pull request May 8, 2019
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
KauyonKais pushed a commit to KauyonKais/qmk_firmware that referenced this pull request May 8, 2019
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
@mechmerlin mechmerlin deleted the feature/s60x_refactor branch June 8, 2019 15:51
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
* remove files that contributed to default hex file creation

* fix up rgb pcb rules and config that previously depended on rules and config in a parent directory

* use #pragma once

* turn on backlight breathing and use #pragma once

* fix config.h and rules.mk to not depend on the parent directory

* use #pragma once

* removed keyboard info.jsons in favor of a shared one

* add in hhkb layout and shared info.json file

* fixup readme file

* remove cruft

* use bootmagic lite over yes

* fix config path and use pragma once

* commit PR fixes

* update manufacturer

* set bootloader correctly
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.

None yet

3 participants