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

Added 3 new keyboards #17314

Merged
merged 26 commits into from
Jul 2, 2022
Merged

Added 3 new keyboards #17314

merged 26 commits into from
Jul 2, 2022

Conversation

DeskDaily
Copy link
Contributor

Description

Added 4 folders for 4 new keyboards

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

Neil Brian Ramirez and others added 21 commits May 20, 2020 22:34
Create Alter folder
361103b
Revert "Create Alter folder"
33648e0 
This reverts commit 361103b.
Merge branch 'master' of https://github.com/qmk/qmk_firmware
2bb261d
Merge branch 'master' of https://github.com/qmk/qmk_firmware
6cc8fdc
Merge branch 'master' of https://github.com/qmk/qmk_firmware
7d49b70
Merge branch 'master' of https://github.com/qmk/qmk_firmware
bbcc0fa
Merge branch 'master' of https://github.com/qmk/qmk_firmware
ffbdc9b
Merge branch 'master' of https://github.com/qmk/qmk_firmware into master
0bb60c7
Merge branch 'master' of https://github.com/qmk/qmk_firmware into master
d6e7d57
Merge branch 'master' of https://github.com/qmk/qmk_firmware into master
b3d1eab
Merge branch 'master' of https://github.com/qmk/qmk_firmware into master
bcfd9f5
Merge branch 'master' of https://github.com/qmk/qmk_firmware
23ee535
Merge branch 'master' of https://github.com/qmk/qmk_firmware
c9a8ffb
Merge branch 'master' of https://github.com/qmk/qmk_firmware
73f4667
Merge branch 'master' of https://github.com/qmk/qmk_firmware
6d7b019
Merge branch 'master' of https://github.com/qmk/qmk_firmware
324da7d
Merge branch 'master' of https://github.com/qmk/qmk_firmware
fde540d
Merge branch 'master' of https://github.com/qmk/qmk_firmware
a2bc287
Merge branch 'master' of https://github.com/NightlyBoards/qmk_firmware
976d90e
Merge branch 'master' of https://github.com/qmk/qmk_firmware
aacb4db
Added 4 new keyboards
e485619
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Jun 6, 2022
drashna
drashna requested changes Jun 7, 2022
View reviewed changes
keyboards/nightly_boards/alter_lite/config.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/alter_lite/config.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/alter_lite/rules.mk Outdated Show resolved Hide resolved
keyboards/nightly_boards/conde60/config.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/conde60/rules.mk Outdated Show resolved Hide resolved
keyboards/nightly_boards/octopadplus/octopadplus.c Outdated Show resolved Hide resolved
keyboards/nightly_boards/octopadplus/octopadplus.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/octopadplus/octopadplus.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/paraluman/config.h Outdated Show resolved Hide resolved
keyboards/nightly_boards/paraluman/rules.mk Outdated Show resolved Hide resolved
@DeskDaily
Copy link
Contributor Author

I removed the Octopad+ folder. Will edit that in a separate pull request instead @drashna

@drashna drashna requested a review from a team June 10, 2022 01:07
@DeskDaily DeskDaily changed the title Added 4 new keyboards Added 3 new keyboards Jun 16, 2022
tzarc
tzarc approved these changes Jul 2, 2022
View reviewed changes
Copy link
Member

@tzarc tzarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In future, it'll probably be simpler to raise separate PRs for each keyboard.

@tzarc tzarc merged commit d66b5db into qmk:master Jul 2, 2022
fauxpark
fauxpark reviewed Jul 2, 2022
View reviewed changes
keyboards/nightly_boards/paraluman/info.json
Comment on lines +5 to +6
"width": 17.25,
"height": 5,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These need to be removed.

keyboards/nightly_boards/conde60/readme.md
@@ -0,0 +1,20 @@
# DeskDaily Conde60

![Conde60](https://media.discordapp.net/attachments/755074685862936686/982918555882360852/unknown.png?width=853&height=396)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be an imgur link.

keyboards/nightly_boards/alter_lite/readme.md
@@ -0,0 +1,20 @@
#DeskDaily Alter

![Alter Lite](https://media.discordapp.net/attachments/946989936941346857/946992282576519279/PXL_20220226_044706997.PORTRAIT2.jpg?width=704&height=396)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

keyboards/nightly_boards/alter_lite/info.json
Comment on lines +11 to +25
{"x":1.75, "y":0.24999999999999997},
{"x":2.75, "y":0.24999999999999997},
{"x":3.75, "y":0.24999999999999997},
{"x":4.75, "y":0.24999999999999997},
{"x":5.75, "y":0.24999999999999997},
{"x":6.75, "y":0.24999999999999997},
{"x":7.75, "y":0.24999999999999997},
{"x":11.25, "y":0.24999999999999997},
{"x":12.25, "y":0.24999999999999997},
{"x":13.25, "y":0.24999999999999997},
{"x":14.25, "y":0.24999999999999997},
{"x":15.25, "y":0.24999999999999997},
{"x":16.25, "y":0.24999999999999997},
{"x":17.25, "y":0.24999999999999997},
{"x":18.25, "y":0.24999999999999997},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct.

keyboards/nightly_boards/alter_lite/info.json
Comment on lines +5 to +6
"width": 20,
"height": 5.25,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

tzarc added a commit to tzarc/qmk_firmware that referenced this pull request Jul 2, 2022
@tzarc
Cleanup post-qmk#17314.
21a0a94
@tzarc tzarc mentioned this pull request Jul 2, 2022
Merged
14 tasks
tzarc added a commit that referenced this pull request Jul 2, 2022
@tzarc
Cleanup post-#17314. (#17536)
7e926f5
casuanoob pushed a commit to casuanoob/qmk_firmware that referenced this pull request Jul 2, 2022
@DeskDaily @casuanoob
Added 3 new keyboards (qmk#17314)
195cb1d 
Co-authored-by: Neil Brian Ramirez <[email protected]>
casuanoob pushed a commit to casuanoob/qmk_firmware that referenced this pull request Jul 2, 2022
@tzarc @casuanoob
Cleanup post-qmk#17314. (qmk#17536)
43e1064
tim-bennett83 pushed a commit to tim-bennett83/qmk_firmware that referenced this pull request Jul 27, 2022
Merge tag '0.17.5'
24c1665 
* tag '0.17.5': (117 commits)
  MSYS2 install: use MinGW python-qmk package (qmk#17302)
  My ErgoDox Keymap (finally perfected, I think) (qmk#17208)
  Add BigBoy macro pad (qmk#16962)
  [Keyboard] Add Support to Ducky One2 SF (qmk#17260)
  add rotary encoder support for Quark^2 (qmk#17470)
  [Keyboard]KPrepublic bm80v2 Keyboard ANSI support (qmk#17192)
  add crkbd/keymaps/bermeo (qmk#17320)
  [keyboard] annepro2 Add support for sticky keys (qmk#17359)
  Cleanup post-qmk#17314. (qmk#17536)
  [keymap] Add tiny text, full width characters to Ergodone->Vega (qmk#17427)
  Added 3 new keyboards (qmk#17314)
  feat(keymap): add keebio/iris/rev6/radlinskii keymap (qmk#17216)
  Allow for RGB actions to take place on Keydown instead of Keyup (qmk#16886)
  Add note about qmk doctor in newbs_flashing.md (qmk#15688)
  [Keyboard] New IDOBAO ID63 (a.k.a. Denwir D60) (qmk#17144)
  Added VIA support for Drop CTRL (qmk#17336)
  Add keymaps for muralis and kuru (qmk#17337)
  Swift65 Hotswap Support (qmk#16987)
  Add Jpe230 Preonic Keymap (qmk#17331)
  Add personal YMDK Split64 keymap (qmk#16980)
  ...
schattenbrot pushed a commit to schattenbrot/qmk_firmware that referenced this pull request Aug 2, 2022
@DeskDaily @schattenbrot
Added 3 new keyboards (qmk#17314)
5f8e965 
Co-authored-by: Neil Brian Ramirez <[email protected]>
schattenbrot pushed a commit to schattenbrot/qmk_firmware that referenced this pull request Aug 2, 2022
@tzarc @schattenbrot
Cleanup post-qmk#17314. (qmk#17536)
e197b5c
This was referenced Sep 25, 2022
Merged
Merged
Merged
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
@DeskDaily @nolanseaton
Added 3 new keyboards (qmk#17314)
3f9a0aa 
Co-authored-by: Neil Brian Ramirez <[email protected]>
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
@tzarc @nolanseaton
Cleanup post-qmk#17314. (qmk#17536)
b4dd0ac
@DeskDaily DeskDaily deleted the addboards branch May 6, 2023 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark left review comments

@drashna drashna drashna approved these changes

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@DeskDaily @drashna @tzarc @fauxpark