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

BastardKB: upstream dilemma/4x6_4 #23816

Closed
wants to merge 6 commits into from

Commits on May 28, 2024

  1. Add dilemma max layer indicator (qmk#47)

    * tentatively add dilemma 4x6_4 WIP untested
    
    * Add dilemma 4x6_4 WIP
    
    set max brightness to 128 pending testing
    migrate rgbmatrix layout macro to info.json
    migrate other settings to info.json
    add default keymap and readme
    add via keymap readme
    
    * 4x6_4 Remove files that shouldn't be in main
    
    KLE and Via JSONs should not be included in qmk_firmware
    
    * 4x6_4 Add RGBMATRIX coordinates in info.json WIP
    
    Still pending testing to validate coordinates
    Add copyright lines
    
    * 4x6_4 Change RGB matrix centre
    
    * 4x6_4 update rgb flags for outer columns
    
    * 4x6_4 add swap_hands config from Drashna
    
    * 4x6_4 explicitly set some defaults
    
    some things were only working because "processor: RP2040" defaults to
    GENERIC_PROMICRO_RP2040.
    explicitly set "board": "GENERIC_RP_RP2040" instead.
    correctly enable SPI0 and SPID0 instead of SPI1
    
    * Update dilemma/readme.md
    
    * 4x6_4 migrate more items to info.json
    
    Forgot to move rgb matrix animations to info.json
    Didn't realise RGB_MATRIX_CENTER had an info.json mapping
    Missed migrating some rules.mk options to info.json
    
    * Update keyboards/bastardkb/dilemma/4x6_4/rules.mk
    
    per requested changes
    
    Co-authored-by: Joel Challis <git@zvecr.com>
    
    * Update keyboards/bastardkb/dilemma/4x6_4/rules.mk
    
    per requested changes
    
    Co-authored-by: Joel Challis <git@zvecr.com>
    
    * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h
    
    per requested changes
    
    Co-authored-by: Joel Challis <git@zvecr.com>
    
    * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c
    
    per requested changes
    
    Co-authored-by: Joel Challis <git@zvecr.com>
    
    * Update keyboards/bastardkb/dilemma/4x6_4/config.h
    
    per requested changes
    
    Co-authored-by: Joel Challis <git@zvecr.com>
    
    * 4x6_4/config.h formatting change per review request
    
    Co-authored-by: Drashna Jaelre <drashna@live.com>
    
    * 4x6_4/info.json formatting change per review request
    
    Co-authored-by: Drashna Jaelre <drashna@live.com>
    
    * Add layer indicators
    
    * Use predefined rgb colors for layers
    
    * Refactor layer indicators from keymap to keyboard
    
    * swap encoder volume directions for CW=volup
    
    * Revert wrong conflict solutions following review
    
    * Update keyboards/bastardkb/dilemma/4x6_4/info.json
    
    * Update keyboards/bastardkb/dilemma/4x6_4/config.h
    
    * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md
    
    * Update keyboards/bastardkb/dilemma/4x6_4/config.h
    
    * Apply suggested changes from code review
    
    * Apply suggested changes from code review
    
    * Break the brightness interval out into defines for configurability from keymap
    
    * Formatting
    
    * Add documentation for indicator brightness boosts
    
    * narrow scope of kb-internal function
    
    * fix type of counting variable
    
    * remove unneccessary condition
    
    * Remove shutdown_user
    
    Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop
    
    * Formatting
    
    ---------
    
    Co-authored-by: casuanoob <gms.rulz@hotmail.com>
    Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
    Co-authored-by: Joel Challis <git@zvecr.com>
    Co-authored-by: Drashna Jaelre <drashna@live.com>
    Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
    6 people committed May 28, 2024
    Configuration menu
    Copy the full SHA
    2203858 View commit details
    Browse the repository at this point in the history
  2. dilemma/4x6_4: fix(chrdb.doc) typo in the snip-toggle keycode

    ankostis authored and burkfers committed May 28, 2024
    Configuration menu
    Copy the full SHA
    4011485 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    949620b View commit details
    Browse the repository at this point in the history
  4. Revert 4x6_4 layout change introduced in the latest rebase onto `upst…

    …ream/master`
    0xcharly authored and burkfers committed May 28, 2024
    Configuration menu
    Copy the full SHA
    6dbdbbd View commit details
    Browse the repository at this point in the history
  5. dilemma/4x6_4: fix double definition of split transport (info.json vs…

    … config.h)
    burkfers committed May 28, 2024
    Configuration menu
    Copy the full SHA
    250ca34 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    e4d1d95 View commit details
    Browse the repository at this point in the history