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] Add Quarkeys Z67 PCB with solder and hotswap versions #19465

Merged
merged 34 commits into from
Feb 2, 2023
Merged

[Keyboard] Add Quarkeys Z67 PCB with solder and hotswap versions #19465

merged 34 commits into from
Feb 2, 2023

Commits on Dec 22, 2022

  1. [Keyboard] Add Z60 Solder

    @tommyamoszhao
    tommyamoszhao committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    1d596f7 View commit details
    Browse the repository at this point in the history

  2. License update, and config.h file merged

    @tommyamoszhao
    tommyamoszhao committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    771c757 View commit details
    Browse the repository at this point in the history

  3. [Keyboard] Add Quarkeys Z67 Solder PCB

    @tommyamoszhao
    tommyamoszhao committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    dbd6e02 View commit details
    Browse the repository at this point in the history

  4. updated as required 

    1. Meaningless defines deleted in config.h
2. Dead codes deleted in both defatul and via keymap.c
3. "LT()" function is deleted in keymap
    @tommyamoszhao
    tommyamoszhao committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    d49cf8c View commit details
    Browse the repository at this point in the history

  5. Update keyboards/quarkeys/z60/config.h 

    Co-authored-by: Joel Challis <git@zvecr.com>
    @tommyamoszhao @zvecr
    tommyamoszhao and zvecr authored Dec 22, 2022
    Configuration menu
    Copy the full SHA
    31d3e38 View commit details
    Browse the repository at this point in the history

  6. Update keyboards/quarkeys/z60/config.h 

    Co-authored-by: Joel Challis <git@zvecr.com>
    @tommyamoszhao @zvecr
    tommyamoszhao and zvecr authored Dec 22, 2022
    Configuration menu
    Copy the full SHA
    9e4a68c View commit details
    Browse the repository at this point in the history

  7. [Keyboard] Add Z60 Re-organized keyboard directory 

    Nothing is changed except that the files been moved into 'solder' & 'hotswap' subfolders.
    @tommyamoszhao
    tommyamoszhao committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    6eb25e0 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Update keyboards/quarkeys/z60/readme.md 

    Co-authored-by: jack <0x6a73@protonmail.com>
    @tommyamoszhao @waffle87
    tommyamoszhao and waffle87 authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    5765a17 View commit details
    Browse the repository at this point in the history

  2. Update keyboards/quarkeys/z60/readme.md 

    Co-authored-by: jack <0x6a73@protonmail.com>
    @tommyamoszhao @waffle87
    tommyamoszhao and waffle87 authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    0f520aa View commit details
    Browse the repository at this point in the history

  3. Update keyboards/quarkeys/z60/readme.md 

    Co-authored-by: jack <0x6a73@protonmail.com>
    @tommyamoszhao @waffle87
    tommyamoszhao and waffle87 authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    19b00a4 View commit details
    Browse the repository at this point in the history

  4. Update readme.md 

    Image link deleted
    @tommyamoszhao
    tommyamoszhao authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    f1511dd View commit details
    Browse the repository at this point in the history

  5. [Keyboard] Add Quarkeys Z60 Hotswap

    @tommyamoszhao
    tommyamoszhao authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    a18aa46 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from tommyamoszhao/Add-keyboard-Z60-Hotswap 

    [Keyboard] Add Quarkeys Z60 Hotswap
    @tommyamoszhao
    tommyamoszhao authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    8add7f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. '#ifdef' in Makefile is not needed

    @tommyamoszhao
    tommyamoszhao authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    42514bc View commit details
    Browse the repository at this point in the history

  2. Delete Makefile

    @tommyamoszhao
    tommyamoszhao authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    4f96ebf View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2023

  1. [Keyboard] Add Quarkeys Z67 Solder & Hotswap

    @tommyamoszhao
    tommyamoszhao committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    16fee53 View commit details
    Browse the repository at this point in the history

  2. Update readme.md

    @tommyamoszhao
    tommyamoszhao authored Jan 1, 2023
    Configuration menu
    Copy the full SHA
    37ccf10 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'qmk:master' into master

    @tommyamoszhao
    tommyamoszhao authored Jan 1, 2023
    Configuration menu
    Copy the full SHA
    b5eba8d View commit details
    Browse the repository at this point in the history

  4. Update keyboards/quarkeys/z67/hotswap/rules.mk 

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    @tommyamoszhao @drashna
    tommyamoszhao and drashna authored Jan 1, 2023
    Configuration menu
    Copy the full SHA
    143ddcd View commit details
    Browse the repository at this point in the history

  5. Update keyboards/quarkeys/z67/hotswap/rules.mk 

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    @tommyamoszhao @drashna
    tommyamoszhao and drashna authored Jan 1, 2023
    Configuration menu
    Copy the full SHA
    efa8705 View commit details
    Browse the repository at this point in the history

  6. Update keyboards/quarkeys/z67/solder/rules.mk 

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    @tommyamoszhao @drashna
    tommyamoszhao and drashna authored Jan 1, 2023
    Configuration menu
    Copy the full SHA
    aa622cd View commit details
    Browse the repository at this point in the history

  7. [Keymap] keymap updated with empty layouts deleted

    @tommyamoszhao
    tommyamoszhao committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    9e9cf4e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/tommyamoszhao/qmk_firmware

    @tommyamoszhao
    tommyamoszhao committed Jan 1, 2023
    Configuration menu
    Copy the full SHA
    9ebe35b View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Update keyboards/quarkeys/z67/hotswap/rules.mk 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    32861e7 View commit details
    Browse the repository at this point in the history

  2. Update keyboards/quarkeys/z67/readme.md 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    bc2be3e View commit details
    Browse the repository at this point in the history

  3. Update keyboards/quarkeys/z67/solder/rules.mk 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    dbcddea View commit details
    Browse the repository at this point in the history

  4. Update keyboards/quarkeys/z67/solder/rules.mk 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    ed52bca View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Merge branch 'qmk:master' into master

    @tommyamoszhao
    tommyamoszhao authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    5ccf67e View commit details
    Browse the repository at this point in the history

  2. Update keyboards/quarkeys/z67/hotswap/config.h 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    393544a View commit details
    Browse the repository at this point in the history

  3. Update keyboards/quarkeys/z67/solder/rules.mk 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    5483223 View commit details
    Browse the repository at this point in the history

  4. Update keyboards/quarkeys/z67/solder/info.json 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    e6a3c85 View commit details
    Browse the repository at this point in the history

  5. Update keyboards/quarkeys/z67/hotswap/info.json 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    9e4e13a View commit details
    Browse the repository at this point in the history

  6. Update keyboards/quarkeys/z67/solder/config.h 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    1e88794 View commit details
    Browse the repository at this point in the history

  7. Update keyboards/quarkeys/z67/hotswap/rules.mk 

    Co-authored-by: Ryan <fauxpark@gmail.com>
    @tommyamoszhao @fauxpark
    tommyamoszhao and fauxpark authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    5c48a1f View commit details
    Browse the repository at this point in the history