diff --git a/keyboards/nullbitsco/tidbit/layer-3---zmk-thumb.png b/keyboards/nullbitsco/tidbit/layer-3---zmk-thumb.png new file mode 100644 index 00000000..efbd84d1 Binary files /dev/null and b/keyboards/nullbitsco/tidbit/layer-3---zmk-thumb.png differ diff --git a/keyboards/nullbitsco/tidbit/layer-3---zmk.json b/keyboards/nullbitsco/tidbit/layer-3---zmk.json new file mode 100644 index 00000000..a7ce4b02 --- /dev/null +++ b/keyboards/nullbitsco/tidbit/layer-3---zmk.json @@ -0,0 +1,46 @@ +[ + { + "backcolor": "#00f3ff", + "name": "Layer 3 - ZMK", + "author": "KemoNine" + }, + [ + { + "x": 1, + "a": 7 + }, + "TG(0)", + "Reset", + "Boot" + ], + [ + "Out Tog", + "Out USB", + "Out BLE", + "" + ], + [ + "RGB Tog", + "BT Prev", + "BT next", + "BT Clear" + ], + [ + "Ext Pwr Tog", + "BT Sel 4", + "BT Sel 5", + "BT Sel 6" + ], + [ + { + "a": 5 + }, + "Vol Up\nVol Dn\n\n\n\n\nMute", + { + "a": 7 + }, + "BT Sel 1", + "BT Sel 2", + "BT Sel 3" + ] +] \ No newline at end of file diff --git a/keyboards/nullbitsco/tidbit/zmk-config/README.md b/keyboards/nullbitsco/tidbit/zmk-config/README.md new file mode 100644 index 00000000..cfc75fd0 --- /dev/null +++ b/keyboards/nullbitsco/tidbit/zmk-config/README.md @@ -0,0 +1,13 @@ +# ZMK Notes for Tidbit + +## Docker Volume + +Need to have the `zmk-config` directory mounted at `/root/zmk-config` in Docker container + +## Building + +``` sh + +west build -p --board nice_nano -d build/tidbit/ -- -DSHIELD=tidbit -DZMK_CONFIG="/root/zmk-config/config" + +``` diff --git a/keyboards/zmk-config-kmn/config/tidbit_19key.conf b/keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.conf similarity index 86% rename from keyboards/zmk-config-kmn/config/tidbit_19key.conf rename to keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.conf index b736c866..d46de67e 100644 --- a/keyboards/zmk-config-kmn/config/tidbit_19key.conf +++ b/keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.conf @@ -12,3 +12,6 @@ CONFIG_WS2812_STRIP=y # Display CONFIG_ZMK_DISPLAY=y + +# Number of BT Profiles +CONFIG_BT_MAX_CONN=6 \ No newline at end of file diff --git a/keyboards/zmk-config-kmn/config/tidbit_19key.keymap b/keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.keymap similarity index 70% rename from keyboards/zmk-config-kmn/config/tidbit_19key.keymap rename to keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.keymap index f1a89b0e..5db95674 100644 --- a/keyboards/zmk-config-kmn/config/tidbit_19key.keymap +++ b/keyboards/nullbitsco/tidbit/zmk-config/config/tidbit.keymap @@ -9,6 +9,7 @@ #include #include #include +#include &encoder_4 { status = "okay"; @@ -26,10 +27,20 @@ keymap { compatible = "zmk,keymap"; - default_layer { bindings = < - &tog 1 &kp KP_NUMLOCK &kp KP_SLASH + &tog 1 &bootloader &none + &none &none &none &kp LC(LA(TAB)) + &none &none &none &kp LG(DOWN_ARROW) + &kp ESCAPE &none &none &none + &kp C_MUTE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &none + >; + + sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; + }; + num_pad_layer { + bindings = < + &tog 2 &kp KP_NUMLOCK &kp KP_SLASH &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_MINUS &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp KP_PLUS diff --git a/keyboards/zmk-config-kmn/config/west.yml b/keyboards/nullbitsco/tidbit/zmk-config/config/west.yml similarity index 100% rename from keyboards/zmk-config-kmn/config/west.yml rename to keyboards/nullbitsco/tidbit/zmk-config/config/west.yml diff --git a/keyboards/zmk-config-kmn/.github/workflows/build.yml b/keyboards/zmk-config-kmn/.github/workflows/build.yml deleted file mode 100644 index fd6acad6..00000000 --- a/keyboards/zmk-config-kmn/.github/workflows/build.yml +++ /dev/null @@ -1,64 +0,0 @@ -on: [push, pull_request, workflow_dispatch] - -name: Build - -jobs: - build: - runs-on: ubuntu-latest - name: Build Test - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Cache west modules - uses: actions/cache@v2 - env: - cache-name: cache-zephyr-modules - with: - path: | - modules/ - tools/ - zephyr/ - bootloader/ - zmk/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: West Init - uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' - id: west-init - with: - args: 'init "-l config"' - - name: West Update - uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' - id: west-update - with: - args: 'update' - - name: West Config Zephyr Base - uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' - id: west-config - with: - args: 'config "--global zephyr.base-prefer configfile"' - - name: West Zephyr Export - uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' - id: west-zephyr-export - with: - args: 'zephyr-export' - - name: West Build (Tidbit - 19 keys) - uses: 'docker://zmkfirmware/zephyr-west-action-arm:latest' - id: west-build-tidbit_19key - with: - args: 'build "-s zmk/app -b nice_nano -- -DSHIELD=tidbit_19key -DZMK_CONFIG=/github/workspace/config"' - - name: Tidbit - 19 keys DTS File - if: ${{ always() }} - run: cat -n build/zephyr/nice_nano.dts.pre.tmp - - name: Tidbit - 19 keys Kconfig file - run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" - - name: Rename zmk.uf2 - run: cp build/zephyr/zmk.uf2 tidbit_19key_nice_nano.uf2 - - name: Archive (Tidbit - 19 keys) - uses: actions/upload-artifact@v2 - with: - name: firmware - path: tidbit_19key_nice_nano.uf2 diff --git a/keyboards/zmk-config-kmn/README.md b/keyboards/zmk-config-kmn/README.md deleted file mode 100644 index e1479146..00000000 --- a/keyboards/zmk-config-kmn/README.md +++ /dev/null @@ -1,3 +0,0 @@ - - -west build -p --board nice_nano -d build/tidbit/19_key -- -DSHIELD=tidbit_19key \ No newline at end of file