Corne switch test

Encoders and screen enabled

.gitea/workflows/build.yml

@@ -1,411 +0,0 @@
-name: Build
-
-on:
-  push:
-    paths:
-      - ".gitea/workflows/build.yml"
-      - "app/**"
-  pull_request:
-    paths:
-      - ".gitea/workflows/build.yml"
-      - "app/**"
-  schedule:
-    - cron: "22 4 * * *"
-
-jobs:
-  build:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    container:
-      image: docker.io/zmkfirmware/zmk-build-arm:3.2
-    needs: compile-matrix
-    strategy:
-      matrix:
-        include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Cache west modules
-        uses: actions/cache@v3.0.2
-        env:
-          cache-name: cache-zephyr-modules
-        with:
-          path: |
-            modules/
-            tools/
-            zephyr/
-            bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        timeout-minutes: 2
-        continue-on-error: true
-      - name: Initialize workspace (west init)
-        run: west init -l app
-      - name: Update modules (west update)
-        run: west update
-      - name: Export Zephyr CMake package (west zephyr-export)
-        run: west zephyr-export
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14.x"
-      - name: Install @actions/artifact
-        run: npm install @actions/artifact
-      - name: Build and upload artifacts
-        uses: actions/github-script@v4
-        id: boards-list
-        with:
-          script: |
-            const fs = require('fs');
-            const artifact = require('@actions/artifact');
-            const artifactClient = artifact.create();
-
-            const execSync = require('child_process').execSync;
-
-            const buildShieldArgs = JSON.parse(`${{ matrix.shieldArgs }}`);
-
-            let error = false;
-
-            for (const shieldArgs of buildShieldArgs) {
-              try {
-                const output = execSync(`west build -s app -p -b ${{ matrix.board }} -- ${shieldArgs.shield ? '-DSHIELD="' + shieldArgs.shield + '"' : ''} ${shieldArgs['cmake-args'] || ''}`);
-
-                console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Build`)
-                console.log(output.toString());
-
-                const fileExtensions = ["hex", "uf2"];
-
-                const files = fileExtensions
-                  .map(extension => "build/zephyr/zmk." + extension)
-                  .filter(path => fs.existsSync(path));
-
-                const rootDirectory = 'build/zephyr';
-                const options = {
-                    continueOnError: true
-                }
-
-                const cmakeName = shieldArgs['cmake-args'] ? '-' + (shieldArgs.nickname || shieldArgs['cmake-args'].split(' ').join('')) : '';
-                const artifactName = `${{ matrix.board }}${shieldArgs.shield ? '-' + shieldArgs.shield : ''}${cmakeName}-zmk`;
-
-                await artifactClient.uploadArtifact(artifactName, files, rootDirectory, options);
-              } catch (e) {
-                console.error(`::error::Failed to build or upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
-                console.error(e);
-                error = true;
-              } finally {
-                console.log('::endgroup::');
-              }
-            }
-
-            if (error) {
-              throw new Error('Failed to build one or more configurations');
-            }
-  compile-matrix:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    needs: [core-coverage, board-changes, nightly]
-    outputs:
-      include-list: ${{ steps.compile-list.outputs.result }}
-    steps:
-      - name: Join build lists
-        uses: actions/github-script@v4
-        id: compile-list
-        with:
-          script: |
-            const coreCoverage = `${{ needs.core-coverage.outputs.core-include }}` || "[]";
-            const boardChanges = `${{ needs.board-changes.outputs.boards-include }}` || "[]";
-            const nightly = `${{ needs.nightly.outputs.nightly-include }}` || "[]";
-
-            const combined = [
-              ...JSON.parse(coreCoverage),
-              ...JSON.parse(boardChanges),
-              ...JSON.parse(nightly)
-            ];
-            const combinedUnique = [...new Map(combined.map(el => [JSON.stringify(el), el])).values()];
-
-            const perBoard = {};
-
-            for (const configuration of combinedUnique) {
-              if (!perBoard[configuration.board])
-                perBoard[configuration.board] = [];
-
-              perBoard[configuration.board].push({
-                shield: configuration.shield,
-                'cmake-args': configuration['cmake-args'],
-                nickname: configuration.nickname
-              })
-            }
-
-            return Object.entries(perBoard).map(([board, shieldArgs]) => ({
-              board,
-              shieldArgs: JSON.stringify(shieldArgs),
-            }));
-  core-coverage:
-    if: ${{ needs.get-changed-files.outputs.core-changes == 'true' }}
-    runs-on: ubuntu-latest
-    needs: get-changed-files
-    outputs:
-      core-include: ${{ steps.core-list.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - uses: actions/github-script@v4
-        id: core-list
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const coreCoverage = yaml.load(fs.readFileSync('app/core-coverage.yml', 'utf8'));
-
-            let include = coreCoverage.board.flatMap(board =>
-              coreCoverage.shield.map(shield => ({ board, shield }))
-            );
-
-            return [...include, ...coreCoverage.include];
-  board-changes:
-    if: ${{ needs.get-changed-files.outputs.board-changes == 'true' }}
-    runs-on: ubuntu-latest
-    needs: [get-grouped-hardware, get-changed-files]
-    outputs:
-      boards-include: ${{ steps.boards-list.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - uses: actions/github-script@v4
-        id: boards-list
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const changedFiles = JSON.parse(`${{ needs.get-changed-files.outputs.changed-files }}`);
-            const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`);
-            const boardChanges = new Set(changedFiles.filter(f => f.startsWith('app/boards')).map(f => f.split('/').slice(0, 4).join('/')));
-
-            return (await Promise.all([...boardChanges].flatMap(async bc => {
-              const globber = await glob.create(bc + "/*.zmk.yml");
-              const files = await globber.glob();
-
-              const aggregated = files.flatMap((f) =>
-                yaml.loadAll(fs.readFileSync(f, "utf8"))
-              );
-
-              const boardAndShield = (b, s) => {
-                if (s.siblings) {
-                  return s.siblings.map(shield => ({
-                    board: b.id,
-                    shield,
-                  }));
-                } else {
-                  return {
-                    board: b.id,
-                    shield: s.id
-                  };
-                }
-              }
-
-              return aggregated.flatMap(hm => {
-                switch (hm.type) {
-                  case "board":
-                    if (hm.features && hm.features.includes("keys")) {
-                      if (hm.siblings) {
-                        return hm.siblings.map(board => ({
-                          board,
-                        }));
-                      } else {
-                        return {
-                          board: hm.id
-                        };
-                      }
-                    } else if (hm.exposes) {
-                      return hm.exposes.flatMap(i =>
-                        metadata.interconnects[i].shields.flatMap(s => boardAndShield(hm, s))
-                      );
-                    } else {
-                      console.error("Board without keys or interconnect");
-                    }
-                    break;
-                  case "shield":
-                    if (hm.features && hm.features.includes("keys")) {
-                      return hm.requires.flatMap(i =>
-                        metadata.interconnects[i].boards.flatMap(b => boardAndShield(b, hm))
-                      );
-                    } else {
-                      console.warn("Unhandled shield without keys");
-                      return [];
-                    }
-                    break;
-                  case "interconnect":
-                    return [];
-                }
-              });
-            }))).flat();
-  nightly:
-    if: ${{ github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    needs: get-grouped-hardware
-    outputs:
-      nightly-include: ${{ steps.nightly-list.outputs.result }}
-    steps:
-      - name: Create nightly list
-        uses: actions/github-script@v4
-        id: nightly-list
-        with:
-          script: |
-            const metadata = JSON.parse(`${{ needs.get-grouped-hardware.outputs.organized-metadata }}`);
-
-            let includeOnboard = metadata.onboard.flatMap(b => {
-              if (b.siblings) {
-                return b.siblings.map(board => ({
-                  board,
-                }));
-              } else {
-                return {
-                  board: b.id,
-                };
-              }
-            });
-
-            let includeInterconnect = Object.values(metadata.interconnects).flatMap(i =>
-              i.boards.flatMap(b =>
-                i.shields.flatMap(s => {
-                  if (s.siblings) {
-                    return s.siblings.map(shield => ({
-                      board: b.id,
-                      shield,
-                    }));
-                  } else {
-                    return {
-                      board: b.id,
-                      shield: s.id,
-                    };
-                  }
-                })
-              )
-            );
-
-            return [...includeOnboard, ...includeInterconnect];
-  get-grouped-hardware:
-    runs-on: ubuntu-latest
-    outputs:
-      organized-metadata: ${{ steps.organize-metadata.outputs.result }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14.x"
-      - name: Install js-yaml
-        run: npm install js-yaml
-      - name: Aggregate Metadata
-        uses: actions/github-script@v4
-        id: aggregate-metadata
-        with:
-          script: |
-            const fs = require('fs');
-            const yaml = require('js-yaml');
-
-            const globber = await glob.create("app/boards/**/*.zmk.yml");
-            const files = await globber.glob();
-
-            const aggregated = files.flatMap((f) =>
-              yaml.loadAll(fs.readFileSync(f, "utf8"))
-            );
-
-            return JSON.stringify(aggregated).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
-          result-encoding: string
-
-      - name: Organize Metadata
-        uses: actions/github-script@v4
-        id: organize-metadata
-        with:
-          script: |
-            const hardware = JSON.parse(`${{ steps.aggregate-metadata.outputs.result }}`);
-
-            const grouped = hardware.reduce((agg, hm) => {
-              switch (hm.type) {
-                case "board":
-                  if (hm.features && hm.features.includes("keys")) {
-                    agg.onboard.push(hm);
-                  } else if (hm.exposes) {
-                    hm.exposes.forEach((element) => {
-                      let ic = agg.interconnects[element] || {
-                        boards: [],
-                        shields: [],
-                      };
-                      ic.boards.push(hm);
-                      agg.interconnects[element] = ic;
-                    });
-                  } else {
-                    console.error("Board without keys or interconnect");
-                  }
-                  break;
-                case "shield":
-                  if (hm.features && hm.features.includes("keys")) {
-                    hm.requires.forEach((id) => {
-                      let ic = agg.interconnects[id] || { boards: [], shields: [] };
-                      ic.shields.push(hm);
-                      agg.interconnects[id] = ic;
-                    });
-                  }
-                  break;
-                case "interconnect":
-                  let ic = agg.interconnects[hm.id] || { boards: [], shields: [] };
-                  ic.interconnect = hm;
-                  agg.interconnects[hm.id] = ic;
-                  break;
-              }
-              return agg;
-            },
-            { onboard: [], interconnects: {} });
-
-            return JSON.stringify(grouped).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
-          result-encoding: string
-  get-changed-files:
-    if: ${{ github.event_name != 'schedule' }}
-    runs-on: ubuntu-latest
-    outputs:
-      changed-files: ${{ steps.changed-files.outputs.all }}
-      board-changes: ${{ steps.board-changes.outputs.result }}
-      core-changes: ${{ steps.core-changes.outputs.result }}
-    steps:
-      - uses: Ana06/get-changed-files@v2.0.0
-        id: changed-files
-        with:
-          format: "json"
-      - uses: actions/github-script@v4
-        id: board-changes
-        with:
-          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
-            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
-            return boardChanges.length ? 'true' : 'false';
-          result-encoding: string
-      - uses: actions/github-script@v4
-        id: core-changes
-        with:
-          script: |
-            const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
-            const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
-            const appChanges = changedFiles.filter(f => f.startsWith('app'));
-            const ymlChanges = changedFiles.includes('.github/workflows/build.yml');
-            return boardChanges.length < appChanges.length || ymlChanges ? 'true' : 'false';
-          result-encoding: string
-

.github/workflows/build.yml

@@ -2,10 +2,4 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@v0.3
-
----
-include:
-  - board: nice_nano_v2
-    shield: sofle_left
-    snippet: zmk-usb-logging
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main

build.yaml

@@ -1,13 +1,9 @@
 include:
-  - board: nice_nano@2.0.0
+  - board: nice_nano_v2
     shield: corne_left
-    snippet: zmk-usb-logging
-  - board: nice_nano@2.0.0
+  - board: nice_nano_v2
     shield: corne_right
-    snippet: zmk-usb-logging
-  - board: nice_nano@2.0.0
+  - board: nice_nano_v2
     shield: sofle_left
-    snippet: zmk-usb-logging
-  - board: nice_nano@2.0.0
+  - board: nice_nano_v2
     shield: sofle_right
-    snippet: zmk-usb-logging

config/corne.keymap

@@ -5,7 +5,6 @@
  */
 
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
 
 // dt-formatter: indent = "  "
@@ -17,13 +16,13 @@
       compatible = "zmk,behavior-tap-dance";
       label = "LLAYERS";
       #binding-cells = <0>;
-      bindings = <&mo 5>, <&mo 1>, <&tog 5>;
+      bindings = <&mo 0>, <&mo 0>, <&tog 0>;
     };
     rlayers: rlayers {
       compatible = "zmk,behavior-tap-dance";
       label = "RLAYERS";
       #binding-cells = <0>;
-      bindings = <&mo 5>;
+      bindings = <&mo 0>;
     };
     lmods: lmods {
       compatible = "zmk,behavior-tap-dance";
@@ -78,7 +77,7 @@
     };
 
     l5 {
-      bindings = <&sl 5>;
+      bindings = <&sl 0>;
       key-positions = <36 40 41 37>;
     };
   };
@@ -91,66 +90,11 @@
 
     base {
       bindings = <
-&kp TAB         &kp Q  &kp W  &kp F  &kp P  &kp G        &kp J      &kp L  &kp U      &kp Y    &kp SEMI  &kp INS
-&kp BACKSPACE   &kp A  &kp R  &kp S  &kp T  &kp D        &kp H      &kp N  &kp E      &kp I    &kp O     &kp DEL
-&kp LEFT_SHIFT  &kp Z  &kp X  &kp C  &kp V  &kp B        &kp K      &kp M  &kp COMMA  &kp DOT  &kp FSLH  &kp RSHFT
-                              &mo 1  &mo 2  &kp SPACE    &kp ENTER  &mo 3  &mo 4
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A    &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A    &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A    &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+                     &kp A  &kp A  &kp A    &kp A  &kp A  &kp A
       >;
     };
-
-    altkeypad {
-      bindings = <
-&trans    &kp MINUS     &kp PLUS  &kp N7  &kp N8  &kp N9       &trans  &trans  &trans  &trans  &trans  &trans
-&kp BSPC  &kp FSLH      &kp STAR  &kp N4  &kp N5  &kp N6       &trans  &trans  &trans  &trans  &trans  &trans
-&trans    &kp KP_EQUAL  &kp DOT   &kp N1  &kp N2  &kp N3       &trans  &trans  &trans  &trans  &trans  &trans
-                                  &trans  &kp N0  &kp ENTER    &trans  &trans  &trans
-      >;
-
-      label = "altkeypad";
-    };
-
-    navigation {
-      bindings = <
-&kp ESC   &kp HOME  &kp PAGE_DOWN  &kp PG_UP  &kp END    &kp ENTER    &kp KP_NUMBER_7  &kp KP_NUMBER_8  &kp KP_NUMBER_9  &kp KP_PLUS      &kp KP_MINUS   &trans
-&kp BSPC  &kp LEFT  &kp UP         &kp DOWN   &kp RIGHT  &kp DEL      &kp KP_NUMBER_4  &kp KP_NUMBER_5  &kp KP_NUMBER_6  &kp KP_MULTIPLY  &kp KP_DIVIDE  &kp BACKSPACE
-&trans    &none     &none          &none      &none      &none        &kp KP_NUMBER_1  &kp KP_NUMBER_2  &kp KP_NUMBER_3  &kp KP_DOT       &kp KP_EQUAL   &trans
-                                   &trans     &trans     &trans       &kp ENTER        &kp KP_N0        &trans
-      >;
-
-      label = "navigation";
-    };
-
-    punctuation {
-      bindings = <
-&kp F1  &mt N1 F2   &mt N2 F3   &mt N3 F4   &mt N4 F5   &mt N5 F6     &mt N6 F7         &mt N7 F8         &mt N8 F9          &mt N9 F10        &mt N0 F11         &kp F12
-&trans  &kp LS(N1)  &kp LS(N2)  &kp LS(N3)  &kp LS(N4)  &kp LS(N5)    &kp LS(N6)        &kp LS(N7)        &kp LS(N8)         &kp LS(N9)        &kp LS(N0)         &trans
-&trans  &kp NUBS    &kp PIPE    &kp NUHS    &kp MINUS   &kp UNDER     &kp LS(NUMBER_2)  &kp SINGLE_QUOTE  &kp DOUBLE_QUOTES  &kp LEFT_BRACKET  &kp RIGHT_BRACKET  &trans
-                                &trans      &trans      &trans        &trans            &trans            &trans
-      >;
-
-      label = "punctuation";
-    };
-
-    altium {
-      bindings = <
-&kp ESC         &kp X      &kp SPACE  &kp UP            &kp LS(SPACE)  &kp STAR    &none  &none  &none   &none  &none  &none
-&kp TAB         &kp Y      &kp LEFT   &kp DOWN          &kp RIGHT      &kp L       &none  &none  &none   &none  &none  &none
-&kp LEFT_SHIFT  &kp LC(Z)  &kp LC(X)  &kp LC(C)         &kp LC(V)      &none       &none  &none  &none   &none  &none  &none
-                                      &kp LEFT_CONTROL  &trans         &kp RET     &none  &none  &trans
-      >;
-
-      label = "altium";
-    };
-
-    configuration {
-      bindings = <
-&trans  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4    &trans          &trans  &trans  &trans  &trans  &trans
-&trans  &trans        &bt BT_PRV    &bt BT_CLR    &bt BT_NXT    &trans          &kp KP_NUMLOCK  &trans  &trans  &trans  &trans  &trans
-&trans  &trans        &trans        &trans        &trans        &trans          &trans          &trans  &trans  &trans  &trans  &trans
-                                    &trans        &trans        &trans          &trans          &trans  &trans
-      >;
-
-      label = "configuration";
-    };
   };
 };

config/sofle.conf

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: MIT
 
 # Uncomment the following line to enable the Sofle OLED Display
-# CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=y
 
 # Uncomment these two lines to add support for encoders
-# CONFIG_EC11=y
-# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
+CONFIG_EC11=y
+CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Uncomment this line below to add rgb underglow / backlight support
 # CONFIG_ZMK_RGB_UNDERGLOW=y
@@ -15,13 +15,3 @@
 # By default toggling the underglow on and off also toggles external power
 # on and off. This also causes the display to turn off.
 # CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
-
-# Debounce
-CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=10
-CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10
-
-# No sleeping
-CONFIG_ZMK_SLEEP=n
-
-# Still hunting my sticky key bug!
-CONFIG_ZMK_SPLIT_BLE_CENTRAL_POSITION_QUEUE_SIZE=10

config/sofle.keymap

@@ -5,9 +5,7 @@
  */
 
 #include <behaviors.dtsi>
-#include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/outputs.h>
 
 #define BASE 0
 #define LOWER 1
@@ -17,176 +15,30 @@
 / {
     // Activate ADJUST layer by pressing raise and lower
 
-    left_encoder: encoder_left {
-        compatible = "alps,ec11";
-        label = "LEFT_ENCODER";
-        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
+    conditional_layers {
+        compatible = "zmk,conditional-layers";
     };
 
-    right_encoder: encoder_right {
-        compatible = "alps,ec11";
-        label = "RIGHT_ENCODER";
-        a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-        steps = <80>;
-    };
-
-    sensors {
-        compatible = "zmk,keymap-sensors";
-        sensors = <&left_encoder &right_encoder>;
-        triggers-per-rotation = <20>;
-    };
-
-    conditional_layers { compatible = "zmk,conditional-layers"; };
-
     behaviors {
-        mtd: mtd {
-            compatible = "zmk,behavior-tap-dance";
-            label = "Mod-Tap-Dance";
-            #binding-cells = <0>;
-            bindings = <&mo 2>, <&tog 3>, <&sl 5>;
-        };
-
-        shift_caps_l: shift_caps_l {
-            compatible = "zmk,behavior-tap-dance";
-            label = "SHIFT_CAPS_L";
-            #binding-cells = <0>;
-            bindings = <&kp LSHFT>, <&kp CAPS>;
-        };
-
-        shift_caps_r: shift_caps_r {
-            compatible = "zmk,behavior-tap-dance";
-            label = "SHIFT_CAPS_R";
-            #binding-cells = <0>;
-            bindings = <&kp RSHFT>, <&kp CAPS>;
-        };
-
-        hlt: hlt {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HLT";
-            bindings = <&mo>, <&kp>;
-
-            #binding-cells = <2>;
-            tapping-term-ms = <200>;
-            flavor = "hold-preferred";
-            retro-tap;
-        };
-
-        th: th {
-            compatible = "zmk,behavior-hold-tap";
-            label = "TH";
-            bindings = <&kp>, <&kp>;
-
-            #binding-cells = <2>;
-            flavor = "tap-preferred";
-            tapping-term-ms = <300>;
-        };
     };
 
     combos {
         compatible = "zmk,combos";
-
-        qwerty {
-            bindings = <&tog 4>;
-            key-positions = <57 58 59>;
-        };
-
-        CAPS_COMBO {
-            bindings = <&kp CAPS>;
-            key-positions = <49 36>;
-        };
     };
 
     keymap {
         compatible = "zmk,keymap";
 
-        base {
-            label = "Base";
-
-            // ------------------------------------------------------------------------------------------------------------
-            // |   `   |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |       |
-            // |  ESC  |  Q  |  W  |  E   |  R   |  T   |                   |  Y   |  U    |  I    |  O   |   P   | BKSPC |
-            // |  TAB  |  A  |  S  |  D   |  F   |  G   |                   |  H   |  J    |  K    |  L   |   ;   |   '   |
-            // | SHIFT |  Z  |  X  |  C   |  V   |  B   |  MUTE  |  |       |  N   |  M    |  ,    |  .   |   /   | SHIFT |
-            //               | GUI | ALT  | CTRL | LOWER|  ENTER |  | SPACE | RAISE| CTRL  | ALT   | GUI  |
-
+        layer_0 {
             bindings = <
-&th F12 ESCAPE  &th F1 N1  &th F2 N2  &th F3 N3     &th F4 N4  &th F5 N5                                     &th F6 N6     &th F7 N7  &th F8 N8      &th F9 N9          &th F10 N0  &th F11 MINUS
-&kp TAB         &kp Q      &kp W      &kp F         &kp P      &kp G                                         &kp J         &kp L      &kp U          &kp Y              &kp SEMI    &kp GRAVE
-&kp BSPC        &kp A      &kp R      &kp S         &kp T      &kp D                                         &kp H         &kp N      &kp E          &kp I              &kp O       &kp SINGLE_QUOTE
-&kp LEFT_SHIFT  &kp Z      &kp X      &kp C         &kp V      &kp B         &kp C_MUTE    &kp C_PLAY_PAUSE  &kp K         &kp M      &kp COMMA      &kp DOT            &kp FSLH    &kp RSHIFT
-                           &kp LCTRL  &kp LEFT_WIN  &kp LALT   &hlt 2 SPACE  &hlt 1 RET    &hlt 1 ENTER      &hlt 2 SPACE  &kp RALT   &kp RIGHT_WIN  &kp RIGHT_CONTROL
-            >;
-        };
-
-        mirrored {
-            bindings = <
-&th F11 MINUS   &th F10 N0  &th F9 N9  &th F8 N8  &th F7 N7  &th F6 N6                    &th F5 N5  &th F4 N4  &th F3 N3  &th F2 N2  &th F1 N1  &th F12 ESCAPE
-&kp GRAVE       &kp SEMI    &kp Y      &kp U      &kp L      &kp J                        &kp G      &kp P      &kp F      &kp W      &kp Q      &kp TAB
-&kp SQT         &kp O       &kp I      &kp E      &kp N      &kp H                        &kp D      &kp T      &kp S      &kp R      &kp A      &kp BSPC
-&kp LEFT_SHIFT  &kp FSLH    &kp DOT    &kp COMMA  &kp M      &kp K      &trans    &trans  &kp B      &kp V      &kp C      &kp X      &kp Z      &kp RIGHT_SHIFT
-                            &kp RCTRL  &kp RGUI   &kp RALT   &trans     &trans    &trans  &trans     &kp LALT   &kp LGUI   &kp LCTRL
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A                  &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A                  &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A                  &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+&kp A  &kp A  &kp A  &kp A  &kp A  &kp A  &kp A    &kp A  &kp A  &kp A  &kp A  &kp A  &kp A  &kp A
+              &kp A  &kp A  &kp A  &kp A  &kp A    &kp A  &kp A  &kp A  &kp A  &kp A
             >;
 
-            label = "Mirrored";
-        };
-
-        mod_a {
-            bindings = <
-&kp EQUAL        &kp LBKT  &kp RBKT  &trans    &trans     &trans                           &trans              &trans              &trans              &kp LEFT_BRACKET  &kp RIGHT_BRACKET  &kp EQUAL
-&kp NON_US_HASH  &trans    &trans    &trans    &trans     &trans                           &mt F7 KP_NUMBER_7  &mt F8 KP_NUMBER_8  &mt F9 KP_NUMBER_9  &kp KP_ASTERISK   &kp KP_DIVIDE      &kp NON_US_HASH
-&kp DELETE       &kp INS   &kp HOME  &kp UP    &kp END    &kp PG_UP                        &mt F4 KP_NUMBER_4  &mt F5 KP_NUMBER_5  &mt F6 KP_NUMBER_6  &kp KP_PLUS       &kp KP_MINUS       &kp BACKSPACE
-&kp LSHIFT       &kp NUBS  &kp LEFT  &kp DOWN  &kp RIGHT  &kp PAGE_DOWN  &trans    &trans  &mt F1 KP_NUMBER_1  &mt F2 KP_NUMBER_2  &mt F3 KP_NUMBER_3  &kp KP_DOT        &kp KP_EQUAL       &kp RSHIFT
-                           &trans    &trans    &trans     &trans         &tog 3    &tog 3  &trans              &kp KP_NUMBER_0     &trans              &trans
-            >;
-
-            label = "Mod A";
-        };
-
-        mod_b {
-            label = "Mod b";
-
-            // TODO: Some binds are waiting for shifted keycode support.
-            // ------------------------------------------------------------------------------------------------------------
-            // |       |  F1 |  F2 |  F3  |  F4  |  F5  |                   |  F6  |  F7   |  F8   |  F9  |  F10  |  F11  |
-            // |   `   |  1  |  2  |  3   |  4   |  5   |                   |  6   |  7    |  8    |  9   |   0   |  F12  |
-            // |       |  !  |  @  |  #   |  $   |  %   |                   |  ^   |  &    |  *    |  (   |   )   |   |   |
-            // |       |  =  |  -  |  +   |  {   |  }   |        |  |       |  [   |  ]    |  ;    |  :   |   \   |       |
-            //               |     |      |      |      |        |  |       |      |       |       |      |
-
-            bindings = <
-&kp EQUAL       &kp LEFT_BRACKET  &kp RIGHT_BRACKET  &trans              &trans              &trans                                &trans         &trans    &trans    &kp LEFT_BRACKET  &kp RIGHT_BRACKET  &kp EQUAL
-&kp KP_NUMLOCK  &kp KP_DIVIDE     &kp KP_MULTIPLY    &mt F7 KP_NUMBER_7  &mt F8 KP_NUMBER_8  &mt F9 KP_NUMBER_9                    &trans         &trans    &trans    &trans            &trans             &kp NON_US_HASH
-&kp BACKSPACE   &kp KP_SUBTRACT   &kp KP_PLUS        &mt F4 KP_NUMBER_4  &mt F5 KP_NUMBER_5  &mt F6 KP_NUMBER_6                    &kp PG_UP      &kp HOME  &kp UP    &kp END           &kp INS            &kp DELETE
-&kp LEFT_SHIFT  &kp KP_EQUAL      &kp KP_DOT         &mt F1 KP_NUMBER_1  &mt F2 KP_NUMBER_2  &mt F3 KP_NUMBER_3  &trans    &trans  &kp PAGE_DOWN  &kp LEFT  &kp DOWN  &kp RIGHT         &kp NUBS           &kp RIGHT_SHIFT
-                                  &trans             &trans              &kp KP_N0           &tog 3              &mo 5     &mo 5   &tog 3         &trans    &trans    &trans
-            >;
-        };
-
-        qwerty {
-            bindings = <
-&trans          &trans  &trans  &trans  &trans  &trans                    &trans  &trans  &trans     &trans   &trans    &trans
-&trans          &kp Q   &kp W   &kp E   &kp R   &kp T                     &kp Y   &kp U   &kp I      &kp O    &kp P     &trans
-&trans          &kp A   &kp S   &kp D   &kp F   &kp G                     &kp H   &kp J   &kp K      &kp L    &kp SEMI  &trans
-&kp LEFT_SHIFT  &kp Z   &kp X   &kp C   &kp V   &kp B   &trans    &trans  &kp N   &kp M   &kp COMMA  &kp DOT  &kp FSLH  &kp RIGHT_SHIFT
-                        &trans  &trans  &trans  &trans  &trans    &trans  &trans  &trans  &trans     &trans
-            >;
-
-            label = "QWERTY";
-        };
-
-        conf {
-            bindings = <
-&sys_reset   &bt BT_SEL 0   &bt BT_SEL 1   &bt BT_SEL 2    &bt BT_SEL 3   &bt BT_SEL 4                      &trans  &trans  &trans  &trans  &trans  &sys_reset
-&bootloader  &bt BT_DISC 0  &bt BT_DISC 1  &bt BT_DISC 2   &bt BT_DISC 3  &bt BT_DISC 4                     &trans  &trans  &trans  &trans  &trans  &bootloader
-&trans       &trans         &out OUT_USB   &bt BT_CLR_ALL  &out OUT_BLE   &trans                            &trans  &trans  &trans  &trans  &trans  &trans
-&trans       &trans         &bt BT_PRV     &bt BT_CLR      &bt BT_NXT     &studio_unlock  &trans    &trans  &trans  &trans  &trans  &trans  &trans  &trans
-                            &trans         &trans          &trans         &trans          &trans    &trans  &trans  &trans  &trans  &trans
-            >;
-
-            label = "conf";
+            sensor-bindings = <&inc_dec_kp A A>, <&inc_dec_kp A A>;
         };
     };
 };

config/west.yml

@@ -5,7 +5,7 @@ manifest:
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: v0.3
+      revision: main
       import: app/west.yml
   self:
     path: config