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

Bocaj Layout and Userspace Refactor #4753

Merged
merged 44 commits into from
Jan 2, 2019
Merged

Bocaj Layout and Userspace Refactor #4753

merged 44 commits into from
Jan 2, 2019

Commits on Apr 10, 2018

  1. Bocaj Layout Revamp

    JacobJerrell committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    59c6870 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. Pull in Upstream (#1)

    * Various tweaks for some Input:Club build processes
    
    * change KEYMAP to LAYOUT for all new keyboards made using this script
    
    * Add support for rev3 of the Atom47 (#2672)
    
    * Added support for rev3 of the Atom47
    
    * Updated Atom47 readme's
    
    * Fix redefine error on rev2 and add maartenwut's keymap
    
    * Fix redefine error on LEdiodes keymap
    
    * Add Nyquist keymap (#2692)
    
    * nyquist
    
    * danielhklein nyquist setup
    
    * shift left controls
    
    * remove readme
    
    * cleanup before pr
    
    * ready for pr
    
    * Adds Phantom TKL support (#2696)
    
    * Add an info.json to phantom keyboard
    
    * Add layouts
    
     - KEYMAP_WINKEYLESS
     - KEYMAP_7BIT
     - KEYMAP_ISO
     - KEYMAP_ISO_WINKEYLESS
    
    * Add key_counts
    
    * Add 2 missing F-Row keys
    
    * Add TKC1800 info.json
    
    Created an info.json for the tkc1800.
    
    * Clueboard 60 info.json
    
     - adds
       - LAYOUT_60_ansi
       - LAYOUT_60_iso
       - KEYMAP_AEK
       - KEYMAP
       - LAYOUT_60_ansi_split_bs_rshift
    
    * Add the Speedo keyboard
    
    * Fix KC60 info.json file (#2707)
    
    * change KEYMAP to LAYOUT in all the KC60 files
    
    * Redo the info.json file
    
    * Small fixes to TKC1800
    
     - adjust F-row to use 0.25 spacing
     - split left shift
     - add key_count
    
    * Fix some Configurator Warnings regarding LAYOUT vs KEYMAP (#2708)
    
    * change diverge 3 KC_KEYMAP to LAYOUT
    
    * Change KEYMAP to LAYOUT for handwired arrow pad
    
    * change M10A to LAYOUT for m10-a
    
    * Change KC_KEYMAP to LAYOUT_kc and KEYMAP to LAYOUT for mf68
    
    * change KC_KEYMAP to LAYOUT for nano
    
    * Refactor to LAYOUT
    
    * refactor to LAYOUT-ansi and LAYOUT_iso for s65
    
    * LAYOUT conversions for lfkkeyboards
    
    * missed a few renames
    
    * mini1800 for lfkeyobards support of LAYOUT
    
    * Improve state/chord handling and clean up namespace
    
    Some values that can never, ever, change were held in local
    variables, rather than in PROGMEM. Fixed.
    
    Change "pressed" to a signed int so the test for < 0 makes
    sense, and to avoid possible weird failure modes in the
    case where a key release comes in when pressed is already
    zero. (Shouldn't happen, sure, but computers are weird.)
    
    A lot of things in process_steno had external linkage for no
    particular reason. They've been marked static. Stuff still
    builds.
    
    Distinguish between currently-held keys and keys that have
    been held, and expose these values through a nicely-named API
    so other code could, say, check on the current set of steno
    chording in order to make displays. Also in passing fix up the
    "state" value having external linkage so it could clash with
    other people's variable declarations.
    
    The API also provides hooks for key processing and steno chord
    events, so you can monitor those events without having to
    run in matrix_scan_user and recheck the values directly. Also
    document these.
    
    There is no path through processing a key that doesn't
    end with a return false, so the nested return foo() are
    gone and we just return false.
    
    * Pull information from config.h and rules.mk (#2711)
    
    * Pull information from config.h and rules.mk
    
    * Readd the kbd75 maintainer
    
    * Remove obsolete info.json entries (#2712)
    
    * Clean up some long-standing errors when populating the API (#2715)
    
    * More Configurator Warning Fixes (#2716)
    
    * mf68_ble did not have the correct .c and .h files
    
    * Fix JC65 KEYMAP to LAYOUT
    
    * Change KEYMAP to LAYOUT for s60_x
    
    * Convert KEYMAP to LAYOUT for lets_split boards
    
    * Convert KEYMAP to LAYOUT
    
    * more fixes to keymap for iris
    
    * convert KEYMAP to LAYOUT for levinson keyboard
    
    * change losinggeneration's KEYMAP to LAYOUT
    
    * convert KEYMAP to LAYOUT
    
    * convert KEYMAP to LAYOUT for nyquist
    
    * convert KEYMAP to LAYOUT
    
    * convert KEYMAP to LAYOUT for viterbi
    
    * convert KEYMAP to LAYOUT
    
    * convert KEYMAP and its subsidiries to the LAYOUT standard
    
    * convert KEYMAP and its subsidiries to the new LAYOUT standard
    
    * Normacos keymap for let's split keyboard (#2691)
    
    * Cheers let's split keymap
    
    * fixed typo on norman layer of cheers keymap for let's split
    
    * fixed right handed mappings for home row
    
    * cheers keymap for let's split redefinition
    
    * updated Cheers keymap for let's split
    
    * cheers keymap for let's split updated with some terminal macros
    
    * renamed cheers let's split keymap to a more appropriate normacos
    
    * updated normacos keymap doc / removed non functional keys
    
    * reset let's split rules to default values
    
    * added more spotlight search macros
    
    * normalized keymap comments
    
    * Moved numpad on lower layer
    
    * hhkb jp personal keymap (#2698)
    
    * Add JJ40 Cockpit personal keymap (#2713)
    
    * Add JJ40 Cockpit keymap
    
    * Fix lower layer symbols
    
    * Add readme for "major" keyboards to eliminate more QMK Configurator errors (#2718)
    
    * add readme to ktype keyboard
    
    * add readme to m10a
    
    * add readme to mini1800
    
    * add readme to parent directory
    JacobJerrell authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    eeba0ce View commit details
    Browse the repository at this point in the history
  2. Revert "Pull in Upstream (#1)"

    This reverts commit eeba0ce.
    JacobJerrell authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    b17fa50 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from JacobJerrell/revert-1-master

    Revert "Pull in Upstream"
    JacobJerrell authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    0a945eb View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3 from qmk/master

    Pull in Upstream
    JacobJerrell authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    9b7e1e9 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2018

  1. Updates to Bocaj Files

    - Gave up on Tap Dance for ' -> '
    + Added another 'Secret'
    + Add ' -> ' to the Swap Hands key
    + Add Swap Hands to the ' -> ' key
    + Made Hand Swapping a momentary toggle
    - Removed Auto Shift
    + Added Layer Toggle to KC_QUOTE for the _TOOLS layer
    - Disabled Tap Dance
    JacobJerrell committed Apr 20, 2018
    Configuration menu
    Copy the full SHA
    3aaab4e View commit details
    Browse the repository at this point in the history

Commits on May 19, 2018

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

Commits on May 31, 2018

  1. Configuration menu
    Copy the full SHA
    638c005 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    850f7c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Updates to Bocaj

    Added Game Layers, Removed Unused Macros
    JacobJerrell committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    603f9e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    10dd01f View commit details
    Browse the repository at this point in the history
  3. Removed 'secrets.h'

    JacobJerrell authored Jul 10, 2018
    Configuration menu
    Copy the full SHA
    e106f84 View commit details
    Browse the repository at this point in the history
  4. Updates to Bocaj

    Remove 'secrets'.
    Remove 'sendstring_workman.h' and set related layer back to qwerty due to macro compatibility issues
    JacobJerrell committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    b46a20e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b94845e View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. Configuration menu
    Copy the full SHA
    cbc7673 View commit details
    Browse the repository at this point in the history
  2. Missed readme.md file

    JacobJerrell committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    59a18c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. Configuration menu
    Copy the full SHA
    cb723cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9414e91 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2018

  1. Configuration menu
    Copy the full SHA
    23898fd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    beb30dd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a4539a7 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. Update settings.json

    JacobJerrell authored Aug 27, 2018
    Configuration menu
    Copy the full SHA
    90b1506 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Pushing local updates

    JacobJerrell committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    b8261d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e7b52ee View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7a2f2f4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9734427 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4f0ba55 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    de4d404 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8f99d4d View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Updates to Bocaj keymap.c

    - Extended pretty_osx and pretty_win wrappers to allow modification of the bottom rows and thumb clusters.
    - Fixed already wrapped layouts to align with the change
    - Wrapped _NUMS and _CLICKY layers with the _osx wrapper because I main with a Mac
    JacobJerrell committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    41e6e4d View commit details
    Browse the repository at this point in the history
  2. Updates to Bocaj

    Small documentation updates, added KC_MAKE from Drashna's layout, added KC_LOCK back to the diablo layer.
    JacobJerrell committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    8bf314e View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

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

Commits on Nov 7, 2018

  1. Minor changes to bocaj

    Put wrappers in userspace and added RESET keycode to the Adjust layer
    JacobJerrell committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    c1d2a9c View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. Configuration menu
    Copy the full SHA
    36b975a View commit details
    Browse the repository at this point in the history
  2. Updates to Bocaj config & keymap; Fixed problem with process_leader.c

    - Made lots of changes to the bocaj layout and userspace
    - Pulled in latest upstream/master
    - Attempted to compile with latest and found an unneccessary `break` in process_leader.c
    JacobJerrell committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    99eba51 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2018

  1. Bocaj - Updates to Layout and Userspace

    * Adjust LEADER_TIMEOUT to 350
    * Put KC_GRAVE on _ADJUST layer
    * Eliminate _LOWER layer and associated definitions
    * Adjusted layer indicating LEDs to match changes
    * Fixed Diablo leader sequence
    * Added build info leader sequence
    * Got rid of obsoleted IGNORE_MOD_TAP_INTERRUPT/PERMISSIVE_HOLD/PREVENT_STUCK_MODIFIERS (may add STRICT_LAYER_RELEASE in the future)
    JacobJerrell committed Dec 24, 2018
    Configuration menu
    Copy the full SHA
    f5e36bf View commit details
    Browse the repository at this point in the history
  2. Remove type_traits

    Not sure what in my VSCode config always brings this one in
    JacobJerrell authored Dec 24, 2018
    Configuration menu
    Copy the full SHA
    5184a40 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

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

Commits on Dec 29, 2018

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

Commits on Dec 31, 2018

  1. refactor stage 1

    JacobJerrell committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    2a08975 View commit details
    Browse the repository at this point in the history
  2. Bocaj Refactor Phase II

    * Made LED_2 brighter if both CTRL & GUI are being held
    * Enabled unicode because I got it to work in Mac OS
    * Finalized Build Info leader combination after testing in Mac OS
    * Not sure why KC_D3_1 was set to ASDF if !TAP_DANCE_ENABLE. So I changed that back
    * Experienced issues with `EXTRAFLAGS += -flto` using Docker in MacOS. Not sure what it does, but I don't seem to be missing anything
    * Wrote obligatory readme.md files and mentioned Drashna too many times... I don't think I can actually take credit for much of anything here.
    JacobJerrell committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    0ce51d0 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2019

  1. Updates to Bocaj

    Made LED changes, added LM_DFLT which is similar to the grave macro, enabled retro tapping, working on a unicode idea -- currently fails to build.
    JacobJerrell committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    6220995 View commit details
    Browse the repository at this point in the history
  2. Bocaj Refactor Phase 3 Part 2

    - Continuation of implementing unicode switching based on default layer
    - Slight adjustments to _DIABLO and base wrapper because LM_DFLT macro didn't function as I'd hoped
    JacobJerrell committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    cedfa6b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    be0de32 View commit details
    Browse the repository at this point in the history