From e09f53943410eb8098efa9bfaa849d4a5eab5856 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Thu, 5 Oct 2023 04:33:36 +0000
Subject: [PATCH 01/25] Updated keymap

---
 config/adv360.keymap | 10 +++++-----
 config/keymap.json   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 756cd31..d9efc77 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,11 +39,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL  &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                 &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB   &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC   &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL      &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT   &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2   &none   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT     &tog 4
+ &kp EQUAL  &kp N1          &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                 &mo 4  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB   &kp Q           &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC   &kp A           &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL      &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT   &kp Z           &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 2   &none  &kp C_AC_PRINT  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT     &tog 2
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index f22e400..b696b9f 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,11 +11,11 @@
   ],
   "layers": [
     [
-       "&kp EQUAL", "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                            "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",  "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",  "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",     "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",  "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2",  "&none",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",    "&tog 4"
+       "&kp EQUAL", "&kp N1",         "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                            "&mo 4", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",  "&kp Q",          "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",  "&kp A",          "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",     "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",  "&kp Z",          "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 2",  "&none", "&kp C_AC_PRINT", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",    "&tog 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
-- 
2.40.1


From 48e6da81d82882bce1c48f4ee9d667e96e6f423d Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Thu, 5 Oct 2023 08:06:19 +0200
Subject: [PATCH 02/25] jekins file, tarball, less weird stuff, proper layers
 in dockerfile

---
 .gitignore           |  6 ++++-
 Dockerfile           | 34 ++++++++++++++++++++--------
 Jenkinsfile          | 54 ++++++++++++++++++++++++++++++++++++++++++++
 Makefile             | 23 +++++++++++++------
 bin/build.sh         | 30 ++++++++++++++----------
 bin/entrypoint.sh    | 16 +++++++++++++
 build/left/.gitkeep  |  0
 build/right/.gitkeep |  0
 8 files changed, 133 insertions(+), 30 deletions(-)
 create mode 100644 Jenkinsfile
 create mode 100755 bin/entrypoint.sh
 create mode 100644 build/left/.gitkeep
 create mode 100644 build/right/.gitkeep

diff --git a/.gitignore b/.gitignore
index bfaaf42..3b13c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
-/firmware/*.uf2
+.west/
+zephyr/
+modules/
+zmk/
+firmware/*
 .DS_Store
diff --git a/Dockerfile b/Dockerfile
index bbb8e9f..cb5c739 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,30 @@
 FROM docker.io/zmkfirmware/zmk-build-arm:stable
+MAINTAINER Ben <pkg@sudo.is>
 
-WORKDIR /app
+ENV TZ=UTC
+ENV TERM=xterm-256color
 
-COPY config/west.yml config/west.yml
+ARG USER_UID=1337
+ARG USER_GID=1337
 
-# West Init
-RUN west init -l config
-# West Update
-RUN west update
-# West Zephyr export
-RUN west zephyr-export
+RUN set -xe && \
+    groupadd -g ${USER_GID} user && \
+    useradd -u ${USER_UID} -g ${USER_GID} -d /usr/local/src --system user && \
+    chown -R user:user /usr/local/src
 
-COPY bin/build.sh ./
+WORKDIR /usr/local/src
+USER user
 
-CMD ["./build.sh"]
+COPY --chown=user:user  config/west.yml /usr/local/src/config/west.yml
+
+RUN set -x && \
+    west init -l config && \
+    west update && \
+    west zephyr-export && \
+    echo python3 -m pip install --user -r zephyr/scripts/requirements.txt
+
+COPY bin/entrypoint.sh /usr/local/bin/
+COPY bin/build.sh /usr/local/bin
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD []
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..c5f8906
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,54 @@
+// https://zmk.dev/docs/development/setup#install-west
+
+pipeline {
+    agent any
+    options {
+        timestamps()
+        ansiColor("xterm-256color")
+        disableConcurrentBuilds()
+        buildDiscarder(logRotator(daysToKeepStr: '30', numToKeepStr: '10', artifactNumToKeepStr: '1'))
+    }
+      environment {
+        VENV = "${env.WORKSPACE}@tmp/cache/venv"
+        PATH = "${env.VENV}/bin:${HOME}/.local/bin:${PATH}"
+    }
+    stages {
+        stage('checkout') {
+            steps {
+                script {
+                    env.VERSION = sh(script: "date -I", returnStdout: true).trim().replace("-",".")
+                    currentBuild.description = env.VERSION
+                    sh "ls --color=always -l"
+                }
+            }
+        }
+        stage('virtualenv') {
+            steps {
+                sh "python3 -m venv ${env.VENV}"
+                sh "pip install -U west"
+            }
+        }
+        stage('make') {
+            steps {
+                sh "make"
+                sh "tar tf firmware/Adv360-firmware_${VERSION}.tar.gz"
+            }
+        }
+    }
+    post {
+        success {
+            archiveArtifacts(
+                artifacts: "firmware/Adv360-firmware_${env.VERSION}.tar.gz,firmware/Adv360-checksums_${VERSION}.txt",
+                fingerprint: true
+                )
+        }
+        always {
+            sh "which python3 python pip hatch"
+            sh "python3 --version"
+            sh "hatch --version"
+        }
+        cleanup {
+            cleanWs(deleteDirs: true, disableDeferredWipeout: true, notFailBuild: true)
+       }
+   }
+}
diff --git a/Makefile b/Makefile
index 7e95cb8..4928e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 DOCKER := $(shell { command -v podman || command -v docker; })
-TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S")
+USER_UID := $(shell id -u)
+USER_GID := $(shell id -g)
 detected_OS := $(shell uname)  # Classify UNIX OS
 ifeq ($(strip $(detected_OS)),Darwin) #We only care if it's OS X
 SELINUX1 :=
@@ -12,13 +13,21 @@ endif
 .PHONY: all clean
 
 all:
-	$(DOCKER) build --tag zmk --file Dockerfile .
-	$(DOCKER) run --rm -it --name zmk \
-		-v $(PWD)/firmware:/app/firmware$(SELINUX1) \
-		-v $(PWD)/config:/app/config:ro$(SELINUX2) \
-		-e TIMESTAMP=$(TIMESTAMP) \
+	echo "using uid=${USER_UID},gid=${USER_GID} for the build"
+	$(DOCKER) build \
+		 --build-arg "USER_UID=${USER_UID}" \
+		 --build-arg "USER_GID=${USER_GID}" \
+		 --tag zmk \
+		 --file Dockerfile .
+	
+	$(DOCKER) run \
+		--rm \
+		--name zmk \
+		-v $(PWD)/firmware:/usr/local/src/firmware$(SELINUX1) \
+		-v $(PWD)/config:/usr/local/src/config:ro$(SELINUX2) \
 		zmk
 
 clean:
-	rm -f firmware/*.uf2
+	rm -vf firmware/*.uf2
+	rm -vf firmware/Adv360-firmware_*.tar.gz firmware/*.txt
 	$(DOCKER) image rm zmk docker.io/zmkfirmware/zmk-build-arm:stable
diff --git a/bin/build.sh b/bin/build.sh
index e783844..96ded54 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -1,17 +1,23 @@
 #!/usr/bin/env bash
 
 set -eu
+set -x
 
-PWD=$(pwd)
-TIMESTAMP="${TIMESTAMP:-$(date -u +"%Y%m%d%H%M%S")}"
 
-# West Build (left)
-west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="${PWD}/config"
-# Adv360 Left Kconfig file
-cat build/left/zephyr/.config | grep -v "^#" | grep -v "^$"
-# West Build (right)
-west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="${PWD}/config"
-# Adv360 Right Kconfig file
-cat build/right/zephyr/.config | grep -v "^#" | grep -v "^$"
-# Rename zmk.uf2
-cp build/left/zephyr/zmk.uf2 ./firmware/${TIMESTAMP}-left.uf2 && cp build/right/zephyr/zmk.uf2 ./firmware/${TIMESTAMP}-right.uf2
+west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="$(pwd)/config"
+west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="$(pwd)/config"
+
+tarball="Adv360-firmware_${VERSION}.tar.gz"
+
+echo tar \
+    --transform='flags=r;s|build/left/zephyr/zmk.uf2|left.uf2|' \
+    --transform='flags=r;s|build/right/zephyr/zmk.uf2|right.uf2|' \
+    -czvf \
+    firmware/${tarball}\
+    build/left/zephyr/zmk.uf2 \
+    build/right/zephyr/zmk.uf2
+
+cp build/left/zephyr/zmk.uf2 firmware/left_${VERSION}.uf2
+cp build/right/zephyr/zmk.uf2 firmware/right_${VERSION}.uf2
+tar -C firmware/Adv360-firmware_${VERSION}.tar.gz left_${VERSION}.uf2 right_${VERSION}.uf2
+
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
new file mode 100755
index 0000000..a9692bc
--- /dev/null
+++ b/bin/entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+
+if [[ -z "${VERSION}" ]]; then
+    export VERSION="$(date -I)-SNAPSHOT"
+fi
+
+if [[ "${1}" == "bash" || "${1}" == "shell" ]]; then
+    exec -l /bin/bash
+elif [[ -z "${1}" || "${1}" == "build" ]]; then
+    /usr/local/bin/build.sh
+else
+    $@
+fi
+
+
diff --git a/build/left/.gitkeep b/build/left/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/build/right/.gitkeep b/build/right/.gitkeep
new file mode 100644
index 0000000..e69de29
-- 
2.40.1


From 443141efb9b3f1a4ecb24a394cf76989d2ad1c82 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Fri, 6 Oct 2023 02:18:40 +0200
Subject: [PATCH 03/25] commit the fixes

---
 bin/build.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bin/build.sh b/bin/build.sh
index 96ded54..32544f4 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -7,17 +7,16 @@ set -x
 west build -s zmk/app -d build/left -b adv360_left -- -DZMK_CONFIG="$(pwd)/config"
 west build -s zmk/app -d build/right -b adv360_right -- -DZMK_CONFIG="$(pwd)/config"
 
-tarball="Adv360-firmware_${VERSION}.tar.gz"
 
-echo tar \
+TARFILE="Adv360-firmware_${VERSION}.tar.gz"
+
+tar czf \
+    firmware/${TARFILE} \
     --transform='flags=r;s|build/left/zephyr/zmk.uf2|left.uf2|' \
     --transform='flags=r;s|build/right/zephyr/zmk.uf2|right.uf2|' \
-    -czvf \
-    firmware/${tarball}\
     build/left/zephyr/zmk.uf2 \
     build/right/zephyr/zmk.uf2
 
-cp build/left/zephyr/zmk.uf2 firmware/left_${VERSION}.uf2
-cp build/right/zephyr/zmk.uf2 firmware/right_${VERSION}.uf2
-tar -C firmware/Adv360-firmware_${VERSION}.tar.gz left_${VERSION}.uf2 right_${VERSION}.uf2
+
+echo "Wrote '${TARFILE}'."
 
-- 
2.40.1


From 2a97e9193d354fbe76911063f70be19627fe78a5 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Fri, 6 Oct 2023 02:22:53 +0200
Subject: [PATCH 04/25] smal fix in jenkins pipeline

---
 Jenkinsfile  | 1 -
 Makefile     | 1 +
 bin/build.sh | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c5f8906..a2bcda4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,6 @@ pipeline {
         stage('make') {
             steps {
                 sh "make"
-                sh "tar tf firmware/Adv360-firmware_${VERSION}.tar.gz"
             }
         }
     }
diff --git a/Makefile b/Makefile
index 4928e1e..6b14460 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ all:
 	$(DOCKER) run \
 		--rm \
 		--name zmk \
+		-e VERSION="${VERSION}" \
 		-v $(PWD)/firmware:/usr/local/src/firmware$(SELINUX1) \
 		-v $(PWD)/config:/usr/local/src/config:ro$(SELINUX2) \
 		zmk
diff --git a/bin/build.sh b/bin/build.sh
index 32544f4..6fa64bb 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -18,5 +18,4 @@ tar czf \
     build/right/zephyr/zmk.uf2
 
 
-echo "Wrote '${TARFILE}'."
 
-- 
2.40.1


From da78c7ada4e1feee8faba1b307058c71d6bca0a2 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 13:44:09 +0000
Subject: [PATCH 05/25] Updated keymap

---
 config/adv360.keymap | 20 +++++++++++++++-----
 config/keymap.json   | 19 +++++++++++++------
 config/macros.dtsi   | 24 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index d9efc77..005dd74 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,11 +39,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL  &kp N1          &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                 &mo 4  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB   &kp Q           &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC   &kp A           &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL      &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT   &kp Z           &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2   &none  &kp C_AC_PRINT  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT     &tog 2
+ &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                 &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL     &tog 4   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
@@ -87,5 +87,15 @@
             >;
         };
 
+        layer_CMD_CTRL_MACRO {
+            bindings = <
+ &trans  &trans            &trans            &trans            &trans  &macro_command_t            &trans                                                  &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans            &trans            &trans            &trans            &trans            &trans                                                  &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans            &trans            &trans            &trans            &trans            &trans  &trans  &trans                  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &macro_command_x  &macro_command_c  &macro_command_v            &trans                            &trans                  &trans                  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans            &trans            &trans            &trans                              &trans  &trans  &trans                  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans
+            >;
+        };
+
     };
 };
diff --git a/config/keymap.json b/config/keymap.json
index b696b9f..7690e79 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -7,15 +7,16 @@
     "keypad",
     "fn",
     "mod",
-    "MAC"
+    "MAC",
+    "CMD_CTRL_MACRO"
   ],
   "layers": [
     [
-       "&kp EQUAL", "&kp N1",         "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                            "&mo 4", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",  "&kp Q",          "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",  "&kp A",          "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",     "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",  "&kp Z",          "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2",  "&none", "&kp C_AC_PRINT", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",    "&tog 2"
+       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                            "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",    "&tog 4",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
@@ -40,6 +41,12 @@
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
+    ], [
+       "&trans", "&trans",           "&trans",           "&trans",           "&trans", "&macro_command_t",           "&trans",                                                             "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans",           "&trans",           "&trans",           "&trans",           "&trans",           "&trans",                                                             "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans",           "&trans",           "&trans",           "&trans",           "&trans",           "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&macro_command_x", "&macro_command_c", "&macro_command_v",           "&trans",                               "&trans",                     "&trans",                     "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans",           "&trans",           "&trans",           "&trans",                               "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
     ]
   ]
 }
\ No newline at end of file
diff --git a/config/macros.dtsi b/config/macros.dtsi
index 9cc9dbf..579de84 100644
--- a/config/macros.dtsi
+++ b/config/macros.dtsi
@@ -1,3 +1,27 @@
+macro_command_v: macro_command_v{
+compatible = "zmk,behavior-macro";
+label = "macro_command_v";
+#binding-cells = <0>;
+bindings = <&kp LEFT_COMMAND>, <&kp V>;
+};
+macro_command_x: macro_command_x{
+compatible = "zmk,behavior-macro";
+label = "macro_command_x";
+#binding-cells = <0>;
+bindings = <&kp LEFT_COMMAND>, <&kp X>;
+};
+macro_command_c: macro_command_c{
+compatible = "zmk,behavior-macro";
+label = "macro_command_c";
+#binding-cells = <0>;
+bindings = <&kp LEFT_COMMAND>, <&kp C>;
+};
+macro_command_t: macro_command_t{
+compatible = "zmk,behavior-macro";
+label = "macro_command_t";
+#binding-cells = <0>;
+bindings = <&kp LEFT_COMMAND>, <&kp T>;
+};
 macro_quotes: macro_quotes{
 compatible = "zmk,behavior-macro";
 label = "macro_quotes";
-- 
2.40.1


From 1529ce5afe369b5f70398fd32cb8b3e346c535b5 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 13:46:38 +0000
Subject: [PATCH 06/25] Updated keymap

---
 config/adv360.keymap | 2 +-
 config/keymap.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 005dd74..2c034aa 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -71,7 +71,7 @@
             bindings = <
   &none  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
+  &none         &none         &none         &none         &none         &none                  &none  &tog 4   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none   &none
             >;
diff --git a/config/keymap.json b/config/keymap.json
index 7690e79..dfbee9f 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -32,7 +32,7 @@
     ], [
         "&none", "&bt BT_SEL 0", "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                 "&none", "&tog 4",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-- 
2.40.1


From 223093489c5884ba004ed3cf45d0e1d0d2b54c73 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:02:27 +0000
Subject: [PATCH 07/25] Updated keymap

---
 config/adv360.keymap | 4 ++--
 config/keymap.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 2c034aa..096b8b3 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,9 +39,9 @@
 
         default_layer {
             bindings = <
- &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                 &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+ &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 4                                                                 &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
    &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL     &tog 4   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &kp GRAVE   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
  &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
      &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
diff --git a/config/keymap.json b/config/keymap.json
index dfbee9f..a839291 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -12,9 +12,9 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                            "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 4",                                                                            "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
          "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",    "&tog 4",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&kp GRAVE",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
        "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
            "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
-- 
2.40.1


From f6c6e5a2f9b02309a6cd82da719c23aeb7676be3 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 8 Oct 2023 15:53:19 +0200
Subject: [PATCH 08/25] upload to gitea registry

---
 Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a2bcda4..4d4b564 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,11 +40,14 @@ pipeline {
                 artifacts: "firmware/Adv360-firmware_${env.VERSION}.tar.gz,firmware/Adv360-checksums_${VERSION}.txt",
                 fingerprint: true
                 )
+            withCredentials([string(credentialsId: "gitea-user-ben-full-token", variable: 'GITEA_SECRET')]) {
+                sh 'curl -u ben:$GITEA_TOKEN --upload-file firmware/Adv360_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
+            }
         }
         always {
-            sh "which python3 python pip hatch"
+            //sh "which python3 python pip hatch"
             sh "python3 --version"
-            sh "hatch --version"
+            //sh "hatch --version"
         }
         cleanup {
             cleanWs(deleteDirs: true, disableDeferredWipeout: true, notFailBuild: true)
-- 
2.40.1


From 444d5a367460fb010bc954375031e57e4ff172a6 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 8 Oct 2023 15:56:35 +0200
Subject: [PATCH 09/25] fix typo

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4d4b564..e72aa5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
                 fingerprint: true
                 )
             withCredentials([string(credentialsId: "gitea-user-ben-full-token", variable: 'GITEA_SECRET')]) {
-                sh 'curl -u ben:$GITEA_TOKEN --upload-file firmware/Adv360_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
+                sh 'curl -u ben:$GITEA_TOKEN --upload-file firmware/Adv360-firmware_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
             }
         }
         always {
-- 
2.40.1


From f16cd3c3a9a5ab30ed633556dc3a3d7e83326805 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 8 Oct 2023 16:01:20 +0200
Subject: [PATCH 10/25] use header

---
 Jenkinsfile  | 4 ++--
 bin/build.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e72aa5e..b5531fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,11 +37,11 @@ pipeline {
     post {
         success {
             archiveArtifacts(
-                artifacts: "firmware/Adv360-firmware_${env.VERSION}.tar.gz,firmware/Adv360-checksums_${VERSION}.txt",
+                artifacts: "firmware/Adv360-firmware_${env.VERSION}.tar.gz,firmware/*.sha256.txt",
                 fingerprint: true
                 )
             withCredentials([string(credentialsId: "gitea-user-ben-full-token", variable: 'GITEA_SECRET')]) {
-                sh 'curl -u ben:$GITEA_TOKEN --upload-file firmware/Adv360-firmware_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
+                sh 'curl -s -i -f -H "Authorization: token $GITEA_SECRET" --upload-file firmware/Adv360-firmware_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
             }
         }
         always {
diff --git a/bin/build.sh b/bin/build.sh
index 6fa64bb..d1a0c34 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -18,4 +18,4 @@ tar czf \
     build/right/zephyr/zmk.uf2
 
 
-
+sha256sum firmware/${TARFILE} > firmware/${TARFILE}.sha256.txt
-- 
2.40.1


From 201520e83f57bd62cd638ff54d339a2c2f118b2d Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 06:25:50 +0000
Subject: [PATCH 11/25] Updated keymap

---
 config/adv360.keymap | 10 ----------
 config/keymap.json   |  9 +--------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 096b8b3..88c72ed 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -87,15 +87,5 @@
             >;
         };
 
-        layer_CMD_CTRL_MACRO {
-            bindings = <
- &trans  &trans            &trans            &trans            &trans  &macro_command_t            &trans                                                  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans            &trans            &trans            &trans            &trans            &trans                                                  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans            &trans            &trans            &trans            &trans            &trans  &trans  &trans                  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &macro_command_x  &macro_command_c  &macro_command_v            &trans                            &trans                  &trans                  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans            &trans            &trans            &trans                              &trans  &trans  &trans                  &trans  &trans  &trans          &trans  &trans  &trans  &trans  &trans
-            >;
-        };
-
     };
 };
diff --git a/config/keymap.json b/config/keymap.json
index a839291..a00ff12 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -7,8 +7,7 @@
     "keypad",
     "fn",
     "mod",
-    "MAC",
-    "CMD_CTRL_MACRO"
+    "MAC"
   ],
   "layers": [
     [
@@ -41,12 +40,6 @@
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
-    ], [
-       "&trans", "&trans",           "&trans",           "&trans",           "&trans", "&macro_command_t",           "&trans",                                                             "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans",           "&trans",           "&trans",           "&trans",           "&trans",           "&trans",                                                             "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans",           "&trans",           "&trans",           "&trans",           "&trans",           "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&macro_command_x", "&macro_command_c", "&macro_command_v",           "&trans",                               "&trans",                     "&trans",                     "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans",           "&trans",           "&trans",           "&trans",                               "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
     ]
   ]
 }
\ No newline at end of file
-- 
2.40.1


From 67e39d61c42de1e83c748418661488353016addb Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 06:26:11 +0000
Subject: [PATCH 12/25] Updated keymap

---
 config/adv360.keymap | 2 +-
 config/keymap.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 88c72ed..8fa4999 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -71,7 +71,7 @@
             bindings = <
   &none  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none         &none                  &none  &tog 4   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
+  &none         &none         &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none   &none
   &none         &none         &none         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none   &none
             >;
diff --git a/config/keymap.json b/config/keymap.json
index a00ff12..59cf220 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -31,7 +31,7 @@
     ], [
         "&none", "&bt BT_SEL 0", "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                 "&none", "&tog 4",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-- 
2.40.1


From 65a0c7885137ddb8ea5cdf7f210166b16606f824 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 06:33:58 +0000
Subject: [PATCH 13/25] Updated keymap

---
 config/adv360.keymap | 20 ++++++++++----------
 config/keymap.json   | 20 ++++++++++----------
 config/macros.dtsi   | 12 ++++++++++++
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 8fa4999..31b4d8e 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,11 +39,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 4                                                                 &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                 &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &kp GRAVE   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                         &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
+ &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 4                                                                           &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                           &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &macro_mac_profile2   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                                   &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER            &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
@@ -79,11 +79,11 @@
 
         layer_MAC {
             bindings = <
- &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                     &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                                    &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                                    &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &macro_linux_profile1  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                                    &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans                 &trans          &trans  &trans  &trans  &trans  &trans
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index 59cf220..0eda9d4 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,11 +11,11 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 4",                                                                            "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                            "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&kp GRAVE",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
+       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 4",                                                                                      "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                                      "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&macro_mac_profile2",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                                      "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",           "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
@@ -35,11 +35,11 @@
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                               "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                               "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&macro_linux_profile1", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                                       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans",                "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
     ]
   ]
 }
\ No newline at end of file
diff --git a/config/macros.dtsi b/config/macros.dtsi
index 579de84..14441f0 100644
--- a/config/macros.dtsi
+++ b/config/macros.dtsi
@@ -1,3 +1,15 @@
+macro_linux_profile1: macro_linux_profile1{
+compatible = "zmk,behavior-macro";
+label = "macro_linux_profile1";
+#binding-cells = <0>;
+bindings = <&tog 4>, <&bt BT_SEL 0>;
+};
+macro_mac_profile2: macro_mac_profile2{
+compatible = "zmk,behavior-macro";
+label = "macro_mac_profile2";
+#binding-cells = <0>;
+bindings = <&bt BT_SEL 1>, <&tog 4>;
+};
 macro_command_v: macro_command_v{
 compatible = "zmk,behavior-macro";
 label = "macro_command_v";
-- 
2.40.1


From 22d9b8f702be005a01cbfec722eaba0a3127c89a Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 09:37:00 +0000
Subject: [PATCH 14/25] Updated keymap

---
 config/adv360.keymap | 20 ++++++++++----------
 config/keymap.json   | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 31b4d8e..4fed321 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,11 +39,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5               &tog 4                                                                           &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                &none                                                                           &none   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &macro_mac_profile2   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                                   &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER            &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
+ &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5            &macro_mac_profile2                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                          &none                                                              &kp LEFT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G                      &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &kp RIGHT_BRACKET   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                            &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                               &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
@@ -79,11 +79,11 @@
 
         layer_MAC {
             bindings = <
- &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                                    &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                                    &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &macro_linux_profile1  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                                    &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans                 &trans          &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &macro_linux_profile1                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans                           &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans                           &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans  &trans                                                           &trans                  &trans                     &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &trans  &trans  &trans  &trans                                   &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &trans
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index 0eda9d4..3b86366 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,11 +11,11 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 4",                                                                                      "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                                      "&none",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&macro_mac_profile2",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                                      "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",           "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
+       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",           "&macro_mac_profile2",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",                         "&none",                                                                         "&kp LEFT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",                     "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&kp RIGHT_BRACKET",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                               "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                                "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
@@ -35,11 +35,11 @@
         "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
         "&none",        "&none",        "&none",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                               "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                               "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&macro_linux_profile1", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                                       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans",                "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&macro_linux_profile1",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                          "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                          "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                                              "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans",                                    "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
     ]
   ]
 }
\ No newline at end of file
-- 
2.40.1


From 517508459854d25cc0c690055cab9e3b174fa2fc Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Thu, 19 Oct 2023 08:24:14 +0200
Subject: [PATCH 15/25] halfway build keymap-editor-web

---
 .dockerignore                        |   1 +
 .gitignore                           |   3 +
 .pipeline/build-keymap-editor-web.sh | 119 +++++++++++++++++++++++++++
 Jenkinsfile                          |  19 ++++-
 dist/.gitkeep                        |   0
 target/.gitkeep                      |   0
 6 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore
 create mode 100755 .pipeline/build-keymap-editor-web.sh
 create mode 100644 dist/.gitkeep
 create mode 100644 target/.gitkeep

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..5e7501d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+Adv360-Pro-KeymapEditor/.git
diff --git a/.gitignore b/.gitignore
index 3b13c16..fba089f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@ zephyr/
 modules/
 zmk/
 firmware/*
+dist/
+target/
+Adv360-Pro-KeymapEditor/
 .DS_Store
diff --git a/.pipeline/build-keymap-editor-web.sh b/.pipeline/build-keymap-editor-web.sh
new file mode 100755
index 0000000..9c83e57
--- /dev/null
+++ b/.pipeline/build-keymap-editor-web.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+#
+# Run npm in a docker container to build keymap-editor-web (Adv369-Pro-KeymapEditor)
+#
+
+set -e
+shopt -s expand_aliases
+
+alias ls='ls --color=always'
+alias grep='grep --color=always'
+
+NAME="keymap-editor-web"
+SRC_PATH="Adv360-Pro-KeymapEditor"
+SRC_REPO_URL="https://github.com/KinesisCorporation/Adv360-Pro-KeymapEditor/"
+REPO_NAME=$(git rev-parse --show-toplevel | xargs basename)
+if [[ -z "${REPO_NAME}" ]]; then
+    echo "undefined: 'REPO_NAME'"
+    exit 1
+elif [[ -z "${VERSION}" ]]; then
+    VERSION=$(date -I | tr '-' '.')-SNAPSHOT
+elif [[ ! -d "./${SRC_PATH}" ]]; then
+    git clone //github.com/KinesisCorporation/Adv360-Pro-KeymapEditor/ $(git rev-parse --show-toplevel)/Adv360-Pro-KeymapEditor
+fi
+
+# the /home/node dir is explicitly owned by uid 1000, and npm wants to write to $HOME/.npm (some logs)
+# best way seems to be to bind mount 'node_modules' from the source dir (npm expects it in its pwd).
+
+CACHE_DIR="$HOME/.cache/npm-docker/builds/${REPO_NAME}/${NAME}/.npm"
+NODE_MODULES_DIR="$HOME/.cache/npm-docker/builds/${REPO_NAME}/${NAME}/node_modules"
+OUTPUT_DIR=target/${NAME}
+
+BUILD_UID=$(id -u)
+BUILD_GID=$(id -g)
+
+echo "Cleaning up..."
+if [[ -d "./${OUTPUT_DIR}" ]]; then
+    echo "removing: '${OUTPUT_DIR}'"
+    rm -r ./${OUTPUT_DIR}
+fi
+find dist/ -name "${NAME}_${VERSION}.zip" -print -delete
+
+mkdir -pv $CACHE_DIR $NODE_MODULES_DIR $OUTPUT_DIR
+
+echo
+echo "Directories mounted to the npm container to build ${NAME} (working around the container expecting to run as uid=1000"
+echo "CACHE_DIR: ${CACHE_DIR}"
+echo "NODE_MODULES_DIR: ${NODE_MODULES_DIR}"
+
+echo
+echo "Directory mounted to write the build output to:"
+echo "OUTPUT_DIR: ${OUTPUT_DIR}"
+
+echo
+echo "Running npm container as uid=${BUILD_UID}, gid=${BUILD_GID}"
+echo
+
+if [[ -t 1 ]]; then
+    # run docker container with -t if we are in a TTY
+    DOCKER_OPT_TTY="-t"
+fi
+
+# the package.json file on the SRC repo root invokes application/package.json
+# the one in the root is for running dev sever
+#
+
+(
+    # https://github.com/KinesisCorporation/Adv360-Pro-KeymapEditor/blob/master/running-locally.md
+    #
+
+    set -e
+    set -x
+    ls -1 dist/
+    docker pull node:latest
+    docker run \
+        --rm \
+        $DOCKER_OPT_TTY \
+        -w /${NAME} \
+        -e "HOME=/home/node" \
+        -v ./${SRC_PATH}:/${NAME} \
+        -v ./config:/${NAME}/config \
+        -v ./${OUTPUT_DIR}:/${OUTPUT_DIR} \
+        -v ${CACHE_DIR}:/home/node/.npm \
+        -v ${NODE_MODULES_DIR}:/${REPO_NAME}-server/web-src/node_modules \
+        -e FORCE_COLOR=1 \
+        -e TERM="xterm256-color" \
+        -e NPM_CONFIG_PREFIX=/home/node/.npm \
+        -e NODE_PATH=/home/node/.npm/node_modules \
+        -e NODE_MODULES=/home/node/.npm/node_modules \
+        -e NODE_INSTALL_PATH=/home/node/.npm/node_modules \
+        -e OUTPUT_DIR=${OUTPUT_DIR} \
+        --user "${BUILD_UID}:${BUILD_GID}" \
+        node:latest bash -c "
+            set -ex && \
+            npm ci && \
+            npm install && \
+            cd application && \
+            npm install
+            "
+
+    # npm run build (was last)
+    # npm run build  -- --minify=false --outDir=/${OUTPUT_DIR} --emptyOutDir
+    # the docs say:
+    #  npm install
+    #  npm run dev
+    # which would presumably start a dev server. lets see how this works first
+
+    ls -lah dist/
+)
+
+#(
+#    set -e
+#    pushd $OUTPUT_DIR
+#    echo
+#    echo "creating zip file from '${OUTPUT_DIR}'"
+#    zip -r ../../dist/${NAME}_${VERSION}.zip ./
+#)
+
+echo
+ls -1 dist/
diff --git a/Jenkinsfile b/Jenkinsfile
index b5531fa..b535d57 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,6 +16,11 @@ pipeline {
         stage('checkout') {
             steps {
                 script {
+                    sh "git remote add github https://www.github.com/benediktkr/kinesis360"
+                    sh "git pull --rebase github main"
+                    sh "git config --global color.ui true"
+                    sh "git --no-pager log HEAD^..HEAD"
+                    //sh "git push origin main"
                     env.VERSION = sh(script: "date -I", returnStdout: true).trim().replace("-",".")
                     currentBuild.description = env.VERSION
                     sh "ls --color=always -l"
@@ -33,6 +38,17 @@ pipeline {
                 sh "make"
             }
         }
+        stage('keymap-editor-web') {
+            steps {
+                script {
+                    dir("Adv360-Pro-KeymapEditor") {
+                        git "https://github.com/KinesisCorporation/Adv360-Pro-KeymapEditor"
+                    }
+                    sh ".pipeline/build-keymap-editor-web.sh"
+                }
+            }
+        }
+
     }
     post {
         success {
@@ -41,7 +57,8 @@ pipeline {
                 fingerprint: true
                 )
             withCredentials([string(credentialsId: "gitea-user-ben-full-token", variable: 'GITEA_SECRET')]) {
-                sh 'curl -s -i -f -H "Authorization: token $GITEA_SECRET" --upload-file firmware/Adv360-firmware_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
+                sh 'curl -i -H "Authorization: token $GITEA_SECRET" --upload-file firmware/Adv360-firmware_${VERSION}.tar.gz https://git.sudo.is/api/packages/ben/generic/kinesis360/${VERSION}/Adv360-firmware_${VERSION}.tar.gz'
+                // add -s -f to silence and fail on errors
             }
         }
         always {
diff --git a/dist/.gitkeep b/dist/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/target/.gitkeep b/target/.gitkeep
new file mode 100644
index 0000000..e69de29
-- 
2.40.1


From d15d85d4edadf60beed8d13e60fa256f98b31a92 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:45:42 +0000
Subject: [PATCH 16/25] Updated keymap

---
 config/adv360.keymap | 30 +++++++++++++++---------------
 config/keymap.json   | 30 +++++++++++++++---------------
 config/macros.dtsi   | 16 +++++++++++-----
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 4fed321..15a6e03 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -39,11 +39,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL           &kp N1  &kp N2    &kp N3     &kp N4  &kp N5            &macro_mac_profile2                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB            &kp Q   &kp W     &kp E      &kp R   &kp T                          &none                                                              &kp LEFT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC            &kp A   &kp S     &kp D      &kp F   &kp G                      &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &kp RIGHT_BRACKET   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT            &kp Z   &kp X     &kp C      &kp V   &kp B                                            &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2  &kp PRINTSCREEN   &none  &kp LEFT  &kp RIGHT                               &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
+ &kp EQUAL               &kp N1           &kp N2    &kp N3     &kp N4  &kp N5                       &none                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB                &kp Q            &kp W     &kp E      &kp R   &kp T            &kp LEFT_BRACKET                                                             &kp RIGHT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC                &kp A            &kp S     &kp D      &kp F   &kp G                   &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL              &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT                &kp Z            &kp X     &kp C      &kp V   &kp B                                         &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 4  &macro_mac_profile1  &kp PRINTSCREEN  &kp LEFT  &kp RIGHT                            &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
@@ -69,21 +69,21 @@
 
         layer_mod {
             bindings = <
-  &none  &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none   &none
-  &none         &none         &none         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none   &none
+                 &none         &bt BT_SEL 0         &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none   &none
+                 &none                &none                &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none   &none
+                 &none                &none                &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
+                 &none                &none                &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none   &none
+ &macro_linux_profile0  &macro_mac_profile1  &macro_mac_profile3         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none   &none
             >;
         };
 
         layer_MAC {
             bindings = <
- &trans  &trans  &trans  &trans  &trans  &trans            &macro_linux_profile1                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans                           &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans                           &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans  &trans                                                           &trans                  &trans                     &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &trans  &trans  &trans  &trans                                   &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans  &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                     &trans  &trans  &trans  &trans  &trans  &trans
+ &trans  &macro_linux_profile0  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &trans
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index 3b86366..36f7998 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,11 +11,11 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",          "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",           "&macro_mac_profile2",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",           "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",                         "&none",                                                                         "&kp LEFT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",           "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",                     "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&kp RIGHT_BRACKET",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",           "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                               "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2", "&kp PRINTSCREEN",  "&none", "&kp LEFT", "&kp RIGHT",                                "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
+       "&kp EQUAL",              "&kp N1",          "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",                      "&none",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",               "&kp Q",           "&kp W",    "&kp E",     "&kp R",  "&kp T",           "&kp LEFT_BRACKET",                                                                        "&kp RIGHT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",               "&kp A",           "&kp S",    "&kp D",     "&kp F",  "&kp G",                  "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",             "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",               "&kp Z",           "&kp X",    "&kp C",     "&kp V",  "&kp B",                                            "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 4", "&macro_mac_profile1", "&kp PRINTSCREEN", "&kp LEFT", "&kp RIGHT",                             "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
@@ -29,17 +29,17 @@
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                               "&trans",                     "&trans",                     "&trans", "&trans", "&trans",  "&trans",  "&trans",  "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",           "&trans", "&trans",  "&trans",  "&trans",  "&trans"
     ], [
-        "&none", "&bt BT_SEL 0", "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-        "&none",        "&none",        "&none",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
+                       "&none",        "&bt BT_SEL 0",        "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
+       "&macro_linux_profile0", "&macro_mac_profile1", "&macro_mac_profile3",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&macro_linux_profile1",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                          "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                          "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                                              "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&trans", "&trans", "&trans", "&trans",                                    "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
+       "&trans", "&macro_linux_profile0", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
     ]
   ]
 }
\ No newline at end of file
diff --git a/config/macros.dtsi b/config/macros.dtsi
index 14441f0..a0e3bfa 100644
--- a/config/macros.dtsi
+++ b/config/macros.dtsi
@@ -1,15 +1,21 @@
-macro_linux_profile1: macro_linux_profile1{
+macro_mac_profile3: macro_mac_profile3{
 compatible = "zmk,behavior-macro";
-label = "macro_linux_profile1";
+label = "macro_mac_profile3";
 #binding-cells = <0>;
-bindings = <&tog 4>, <&bt BT_SEL 0>;
+bindings = <&bt BT_SEL 3>, <&tog 4>;
 };
-macro_mac_profile2: macro_mac_profile2{
+macro_mac_profile1: macro_mac_profile1{
 compatible = "zmk,behavior-macro";
-label = "macro_mac_profile2";
+label = "macro_mac_profile1";
 #binding-cells = <0>;
 bindings = <&bt BT_SEL 1>, <&tog 4>;
 };
+macro_linux_profile0: macro_linux_profile0{
+compatible = "zmk,behavior-macro";
+label = "macro_linux_profile0";
+#binding-cells = <0>;
+bindings = <&tog 4>, <&bt BT_SEL 0>;
+};
 macro_command_v: macro_command_v{
 compatible = "zmk,behavior-macro";
 label = "macro_command_v";
-- 
2.40.1


From 815268464337f8946076b12f37793ef0a5feac49 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:28:28 +0000
Subject: [PATCH 17/25] Updated keymap

---
 config/adv360.keymap | 15 ++++++++-------
 config/keymap.json   | 14 +++++++-------
 config/version.dtsi  |  0
 3 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 config/version.dtsi

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 15a6e03..8d3c4e3 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -21,6 +21,7 @@
 / {
   behaviors {
     #include "macros.dtsi"
+    #include "version.dtsi"
 
     hm: homerow_mods {
         compatible = "zmk,behavior-hold-tap";
@@ -39,11 +40,11 @@
 
         default_layer {
             bindings = <
- &kp EQUAL               &kp N1           &kp N2    &kp N3     &kp N4  &kp N5                       &none                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+ &kp EQUAL               &kp N1           &kp N2    &kp N3     &kp N4  &kp N5                      &tog 1                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
    &kp TAB                &kp Q            &kp W     &kp E      &kp R   &kp T            &kp LEFT_BRACKET                                                             &kp RIGHT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
    &kp ESC                &kp A            &kp S     &kp D      &kp F   &kp G                   &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL              &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
  &kp LSHFT                &kp Z            &kp X     &kp C      &kp V   &kp B                                         &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 4  &macro_mac_profile1  &kp PRINTSCREEN  &kp LEFT  &kp RIGHT                            &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
+     &mo 2  &macro_mac_profile1  &kp PRINTSCREEN  &kp LEFT  &kp RIGHT                            &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
@@ -79,11 +80,11 @@
 
         layer_MAC {
             bindings = <
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans  &trans
- &trans                 &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                     &trans  &trans  &trans  &trans  &trans  &trans
- &trans  &macro_linux_profile0  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                      &mo 3  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans                 &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                     &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans  &macro_linux_profile0  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &macro_linux_profile0
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index 36f7998..2e558c9 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,11 +11,11 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",              "&kp N1",          "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",                      "&none",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+       "&kp EQUAL",              "&kp N1",          "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",                     "&tog 1",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
          "&kp TAB",               "&kp Q",           "&kp W",    "&kp E",     "&kp R",  "&kp T",           "&kp LEFT_BRACKET",                                                                        "&kp RIGHT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
          "&kp ESC",               "&kp A",           "&kp S",    "&kp D",     "&kp F",  "&kp G",                  "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",             "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
        "&kp LSHFT",               "&kp Z",           "&kp X",    "&kp C",     "&kp V",  "&kp B",                                            "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 4", "&macro_mac_profile1", "&kp PRINTSCREEN", "&kp LEFT", "&kp RIGHT",                             "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
+           "&mo 2", "&macro_mac_profile1", "&kp PRINTSCREEN", "&kp LEFT", "&kp RIGHT",                             "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
        "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
          "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
@@ -35,11 +35,11 @@
                        "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
        "&macro_linux_profile0", "&macro_mac_profile1", "&macro_mac_profile3",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
     ], [
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",
-       "&trans", "&macro_linux_profile0", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&trans"
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                 "&mo 3", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans", "&macro_linux_profile0", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&macro_linux_profile0"
     ]
   ]
 }
\ No newline at end of file
diff --git a/config/version.dtsi b/config/version.dtsi
new file mode 100644
index 0000000..e69de29
-- 
2.40.1


From 1b3efe73840bfa258aa97928ac9408171de3606d Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Thu, 7 Dec 2023 12:34:58 +0100
Subject: [PATCH 18/25] pull on build

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6b14460..e7f4365 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,12 @@ endif
 all:
 	echo "using uid=${USER_UID},gid=${USER_GID} for the build"
 	$(DOCKER) build \
+		 --pull \
 		 --build-arg "USER_UID=${USER_UID}" \
 		 --build-arg "USER_GID=${USER_GID}" \
 		 --tag zmk \
 		 --file Dockerfile .
-	
+
 	$(DOCKER) run \
 		--rm \
 		--name zmk \
-- 
2.40.1


From 6d5d926ebe8d030f44e6cec3a6fc7f4018a861a0 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sat, 16 Dec 2023 13:34:20 +0100
Subject: [PATCH 19/25] fix

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b535d57..ee99dde 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
         disableConcurrentBuilds()
         buildDiscarder(logRotator(daysToKeepStr: '30', numToKeepStr: '10', artifactNumToKeepStr: '1'))
     }
-      environment {
+    environment {
         VENV = "${env.WORKSPACE}@tmp/cache/venv"
         PATH = "${env.VENV}/bin:${HOME}/.local/bin:${PATH}"
     }
-- 
2.40.1


From 57ac195cdec53aa9442cf6de257cc7daf99238ad Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 31 Dec 2023 13:48:08 +0100
Subject: [PATCH 20/25] add links

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c0c3885..73e290b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # ADV360-PRO-ZMK
 
+* GitHub: [`benediktkr/kinesis360`](https://github.com/benediktkr/kinesis360)
+* Forked from: [`KinesisCorporation/Adv360-Pro-ZMK`](https://github.com/KinesisCorporation/Adv360-Pro-ZMK)
+
+
 ## Modifying the keymap
 
 [The ZMK documentation](https://zmk.dev/docs) covers both basic and advanced functionality and has a table of OS compatibility for keycodes. Please note that the RGB Underglow, Backlight and Power Management sections are not relevant to the Advantage 360 Pro's custom ZMK fork. For more information see [this note](#note)
@@ -62,11 +66,11 @@ Follow the programming instruction on page 8 of the [Quick Start Guide](https://
 1. Unplug the right side keyboard and turn it back on.
 1. Enjoy!
 
-> Note: There are also physical reset buttons on both keyboards which can be used to enter and exit the bootloader mode. Their location is described in section 2.7 on page 9 in the [User Manual](https://kinesis-ergo.com/wp-content/uploads/Advantage360-ZMK-KB360-PRO-Users-Manual-v3-10-23.pdf) and use is described in section 5.9 on page 14. 
+> Note: There are also physical reset buttons on both keyboards which can be used to enter and exit the bootloader mode. Their location is described in section 2.7 on page 9 in the [User Manual](https://kinesis-ergo.com/wp-content/uploads/Advantage360-ZMK-KB360-PRO-Users-Manual-v3-10-23.pdf) and use is described in section 5.9 on page 14.
 
 ### Upgrading from V2 to V3
 
-If you are upgrading from V2 to V3, and if the flashing didn't work as expected (i.e. if you are unable to pair the keyboard via Bluetooth), then consider [resetting](https://kinesis-ergo.com/support/kb360pro/#firmware-updates) both halves of the keyboard to its native state. Make sure to use the `settings-reset.uf2` file from 
+If you are upgrading from V2 to V3, and if the flashing didn't work as expected (i.e. if you are unable to pair the keyboard via Bluetooth), then consider [resetting](https://kinesis-ergo.com/support/kb360pro/#firmware-updates) both halves of the keyboard to its native state. Make sure to use the `settings-reset.uf2` file from
 the V3 branch of this repository. After doing this, proceed with the flashing instructions above.
 
 ## Changelog
-- 
2.40.1


From fa329d43e03bcc040cc64eb9ea66de6741f71305 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 31 Dec 2023 14:09:24 +0100
Subject: [PATCH 21/25] explicitly enable bluetooth battery reporting, link to
 docs and kinesis pr

---
 config/boards/arm/adv360/adv360_left_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/boards/arm/adv360/adv360_left_defconfig b/config/boards/arm/adv360/adv360_left_defconfig
index 33ef88e..0b88cfb 100644
--- a/config/boards/arm/adv360/adv360_left_defconfig
+++ b/config/boards/arm/adv360/adv360_left_defconfig
@@ -55,6 +55,10 @@ CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=600
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=12
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=24
 CONFIG_BT_PERIPHERAL_PREF_LATENCY=30
+# Battery reporting
+# https://zmk.dev/docs/config/system#bluetooth
+# https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/248/files
+CONFIG_BT_BAS=y
 
 #Misc configuration
 CONFIG_USB_DEVICE_VID=0x29EA
-- 
2.40.1


From e886b718c53518eab475267bd49a4abbf6903ffe Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 31 Dec 2023 14:14:06 +0100
Subject: [PATCH 22/25] tap-dance, comment with idea and links to docs

---
 config/adv360.keymap | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 8d3c4e3..385b6a5 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -12,6 +12,16 @@
  * edit it directly.
  */
 
+/*
+ *
+ * Use Tap-Dance: https://zmk.dev/docs/behaviors/tap-dance
+ *
+ * Both: tap C -> C
+ * Normal layer: tap,tap C -> ctrl C
+ * Mac layer:    tap,tap C -> cmd C
+ *
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
-- 
2.40.1


From dce38f8a57670d64b0c0ea7f69a48978659baa91 Mon Sep 17 00:00:00 2001
From: "adv360proapp[bot]"
 <105741512+adv360proapp[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:41:00 +0000
Subject: [PATCH 23/25] Updated keymap

---
 config/adv360.keymap | 50 ++++++++++++++++++--------------------------
 config/keymap.json   | 40 +++++++++++++++++------------------
 2 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/config/adv360.keymap b/config/adv360.keymap
index 385b6a5..d4e4860 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -12,16 +12,6 @@
  * edit it directly.
  */
 
-/*
- *
- * Use Tap-Dance: https://zmk.dev/docs/behaviors/tap-dance
- *
- * Both: tap C -> C
- * Normal layer: tap,tap C -> ctrl C
- * Mac layer:    tap,tap C -> cmd C
- *
- */
-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
@@ -50,21 +40,21 @@
 
         default_layer {
             bindings = <
- &kp EQUAL               &kp N1           &kp N2    &kp N3     &kp N4  &kp N5                      &tog 1                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
-   &kp TAB                &kp Q            &kp W     &kp E      &kp R   &kp T            &kp LEFT_BRACKET                                                             &kp RIGHT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
-   &kp ESC                &kp A            &kp S     &kp D      &kp F   &kp G                   &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL              &none   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
- &kp LSHFT                &kp Z            &kp X     &kp C      &kp V   &kp B                                         &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
-     &mo 2  &macro_mac_profile1  &kp PRINTSCREEN  &kp LEFT  &kp RIGHT                            &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
+ &kp EQUAL               &kp N1           &kp N2    &kp N3     &kp N4  &kp N5               &tog 1                                                                         &mo 3  &kp N6  &kp N7     &kp N8    &kp N9    &kp N0  &kp MINUS
+   &kp TAB                &kp Q            &kp W     &kp E      &kp R   &kp T                &none                                                              &kp LEFT_BRACKET   &kp Y   &kp U      &kp I     &kp O     &kp P   &kp BSLH
+   &kp ESC                &kp A            &kp S     &kp D      &kp F   &kp G            &kp GRAVE  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL  &kp RIGHT_BRACKET   &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT
+ &kp LSHFT                &kp Z            &kp X     &kp C      &kp V   &kp B                                  &kp HOME                  &kp PG_UP                                 &kp N   &kp M  &kp COMMA   &kp DOT  &kp FSLH  &kp RSHFT
+     &mo 2  &macro_mac_profile1  &kp PRINTSCREEN  &kp LEFT  &kp RIGHT                     &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER          &kp SPACE          &kp UP   &kp DOWN  &kp LBKT  &kp RBKT      &mo 2
             >;
         };
 
         layer_keypad {
             bindings = <
- &kp EQUAL     &kp N1    &kp N2    &kp N3     &kp N4  &kp N5              &trans                                                                 &mo 3  &kp N6  &kp KP_NUM  &kp KP_EQUAL  &kp KP_DIVIDE  &kp KP_MULTIPLY  &kp MINUS
-   &kp TAB      &kp Q     &kp W     &kp E      &kp R   &kp T               &none                                                                 &none   &kp Y   &kp KP_N7     &kp KP_N8      &kp KP_N9     &kp KP_MINUS   &kp BSLH
-   &kp ESC      &kp A     &kp S     &kp D      &kp F   &kp G               &none  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL      &none   &kp H   &kp KP_N4     &kp KP_N5      &kp KP_N6      &kp KP_PLUS    &kp SQT
- &kp LSHFT      &kp Z     &kp X     &kp C      &kp V   &kp B                                 &kp HOME                  &kp PG_UP                         &kp N   &kp KP_N1     &kp KP_N2      &kp KP_N3     &kp KP_ENTER  &kp RSHFT
-     &mo 2  &kp GRAVE  &kp CAPS  &kp LEFT  &kp RIGHT                    &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp KP_N0              &kp UP      &kp DOWN     &kp KP_DOT         &kp RBKT     &trans
+ &kp EQUAL  &kp N1  &kp N2    &kp N3     &kp N4  &kp N5              &trans                                                                 &mo 3  &kp N6  &kp KP_NUM  &kp KP_EQUAL  &kp KP_DIVIDE  &kp KP_MULTIPLY  &kp MINUS
+   &kp TAB   &kp Q   &kp W     &kp E      &kp R   &kp T               &none                                                                 &none   &kp Y   &kp KP_N7     &kp KP_N8      &kp KP_N9     &kp KP_MINUS   &kp BSLH
+   &kp ESC   &kp A   &kp S     &kp D      &kp F   &kp G               &none  &kp LCTRL  &kp LALT                   &kp LGUI  &kp RCTRL      &none   &kp H   &kp KP_N4     &kp KP_N5      &kp KP_N6      &kp KP_PLUS    &kp SQT
+ &kp LSHFT   &kp Z   &kp X     &kp C      &kp V   &kp B                                 &kp HOME                  &kp PG_UP                         &kp N   &kp KP_N1     &kp KP_N2      &kp KP_N3     &kp KP_ENTER  &kp RSHFT
+    &trans  &trans  &trans  &kp LEFT  &kp RIGHT                    &kp BSPC    &kp DEL   &kp END                  &kp PG_DN  &kp ENTER  &kp KP_N0              &kp UP      &kp DOWN     &kp KP_DOT         &kp RBKT     &trans
             >;
         };
 
@@ -80,21 +70,21 @@
 
         layer_mod {
             bindings = <
-                 &none         &bt BT_SEL 0         &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none   &none
-                 &none                &none                &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none   &none
-                 &none                &none                &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none   &none
-                 &none                &none                &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none   &none
- &macro_linux_profile0  &macro_mac_profile1  &macro_mac_profile3         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none   &none
+  &none         &bt BT_SEL 0         &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4                  &none                                                                          &trans   &none       &none       &none   &none   &none                  &none
+  &none                &none                &none         &none         &none         &none            &bootloader                                                                     &bootloader   &none       &none       &none   &none   &none                  &none
+  &none                &none                &none         &none         &none         &none                  &none   &none   &none                  &bt BT_CLR       &none  &rgb_ug RGB_MEFS_CMD 5   &none       &none       &none   &none   &none                  &none
+  &none                &none                &none         &none         &none         &none                                  &none                       &none                                       &none       &none       &none   &none   &none                  &none
+  &none  &macro_mac_profile1  &macro_mac_profile3         &none         &none                                &none   &none   &none                       &none  &bl BL_TOG         &rgb_ug RGB_TOG          &bl BL_INC  &bl BL_DEC   &none   &none  &macro_linux_profile0
             >;
         };
 
         layer_MAC {
             bindings = <
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                      &mo 3  &trans  &trans  &trans  &trans  &trans                 &trans
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans                                                                     &trans  &trans  &trans  &trans  &trans  &trans                 &trans
- &trans                 &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &trans  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans                 &trans
- &trans                 &trans  &trans  &trans  &trans  &trans                                            &trans                  &trans                     &trans  &trans  &trans  &trans  &trans                 &trans
- &trans  &macro_linux_profile0  &trans  &trans  &trans                    &trans            &trans        &trans                  &trans     &trans  &trans          &trans  &trans  &trans  &trans  &macro_linux_profile0
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                        &mo 3  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans                                                                       &trans  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans  &trans  &trans  &trans  &trans  &trans            &trans  &kp LEFT_COMMAND  &kp LEFT_ALT                  &kp LGUI  &kp RCTRL  &trans  &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans  &trans  &trans  &trans  &trans  &trans                                            &trans                    &trans                     &trans  &trans  &trans  &trans  &trans                 &trans
+ &trans  &trans  &trans  &trans  &trans                    &trans            &trans        &trans                    &trans     &trans  &trans          &trans  &trans  &trans  &trans  &macro_linux_profile0
             >;
         };
 
diff --git a/config/keymap.json b/config/keymap.json
index 2e558c9..1682412 100644
--- a/config/keymap.json
+++ b/config/keymap.json
@@ -11,17 +11,17 @@
   ],
   "layers": [
     [
-       "&kp EQUAL",              "&kp N1",          "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",                     "&tog 1",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
-         "&kp TAB",               "&kp Q",           "&kp W",    "&kp E",     "&kp R",  "&kp T",           "&kp LEFT_BRACKET",                                                                        "&kp RIGHT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
-         "&kp ESC",               "&kp A",           "&kp S",    "&kp D",     "&kp F",  "&kp G",                  "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",             "&none",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
-       "&kp LSHFT",               "&kp Z",           "&kp X",    "&kp C",     "&kp V",  "&kp B",                                            "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
-           "&mo 2", "&macro_mac_profile1", "&kp PRINTSCREEN", "&kp LEFT", "&kp RIGHT",                             "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
+       "&kp EQUAL",              "&kp N1",          "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",              "&tog 1",                                                                                    "&mo 3", "&kp N6", "&kp N7",    "&kp N8",   "&kp N9",   "&kp N0", "&kp MINUS",
+         "&kp TAB",               "&kp Q",           "&kp W",    "&kp E",     "&kp R",  "&kp T",               "&none",                                                                         "&kp LEFT_BRACKET",  "&kp Y",  "&kp U",     "&kp I",    "&kp O",    "&kp P",  "&kp BSLH",
+         "&kp ESC",               "&kp A",           "&kp S",    "&kp D",     "&kp F",  "&kp G",           "&kp GRAVE", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL", "&kp RIGHT_BRACKET",  "&kp H",  "&kp J",     "&kp K",    "&kp L", "&kp SEMI",   "&kp SQT",
+       "&kp LSHFT",               "&kp Z",           "&kp X",    "&kp C",     "&kp V",  "&kp B",                                     "&kp HOME",                     "&kp PG_UP",                                    "&kp N",  "&kp M", "&kp COMMA",  "&kp DOT", "&kp FSLH", "&kp RSHFT",
+           "&mo 2", "&macro_mac_profile1", "&kp PRINTSCREEN", "&kp LEFT", "&kp RIGHT",                      "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER",         "&kp SPACE",           "&kp UP",  "&kp DOWN", "&kp LBKT", "&kp RBKT",     "&mo 2"
     ], [
-       "&kp EQUAL",    "&kp N1",   "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
-         "&kp TAB",     "&kp Q",    "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
-         "&kp ESC",     "&kp A",    "&kp S",    "&kp D",     "&kp F",  "&kp G",              "&none", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",     "&none",  "&kp H",  "&kp KP_N4",    "&kp KP_N5",     "&kp KP_N6",     "&kp KP_PLUS",   "&kp SQT",
-       "&kp LSHFT",     "&kp Z",    "&kp X",    "&kp C",     "&kp V",  "&kp B",                                    "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp KP_N1",    "&kp KP_N2",     "&kp KP_N3",    "&kp KP_ENTER", "&kp RSHFT",
-           "&mo 2", "&kp GRAVE", "&kp CAPS", "&kp LEFT", "&kp RIGHT",                     "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp KP_N0",               "&kp UP",     "&kp DOWN",    "&kp KP_DOT",        "&kp RBKT",    "&trans"
+       "&kp EQUAL", "&kp N1", "&kp N2",   "&kp N3",    "&kp N4", "&kp N5",             "&trans",                                                                            "&mo 3", "&kp N6", "&kp KP_NUM", "&kp KP_EQUAL", "&kp KP_DIVIDE", "&kp KP_MULTIPLY", "&kp MINUS",
+         "&kp TAB",  "&kp Q",  "&kp W",    "&kp E",     "&kp R",  "&kp T",              "&none",                                                                            "&none",  "&kp Y",  "&kp KP_N7",    "&kp KP_N8",     "&kp KP_N9",    "&kp KP_MINUS",  "&kp BSLH",
+         "&kp ESC",  "&kp A",  "&kp S",    "&kp D",     "&kp F",  "&kp G",              "&none", "&kp LCTRL", "&kp LALT",                      "&kp LGUI", "&kp RCTRL",     "&none",  "&kp H",  "&kp KP_N4",    "&kp KP_N5",     "&kp KP_N6",     "&kp KP_PLUS",   "&kp SQT",
+       "&kp LSHFT",  "&kp Z",  "&kp X",    "&kp C",     "&kp V",  "&kp B",                                    "&kp HOME",                     "&kp PG_UP",                            "&kp N",  "&kp KP_N1",    "&kp KP_N2",     "&kp KP_N3",    "&kp KP_ENTER", "&kp RSHFT",
+          "&trans", "&trans", "&trans", "&kp LEFT", "&kp RIGHT",                     "&kp BSPC",   "&kp DEL",  "&kp END",                     "&kp PG_DN", "&kp ENTER", "&kp KP_N0",               "&kp UP",     "&kp DOWN",    "&kp KP_DOT",        "&kp RBKT",    "&trans"
     ], [
        "&kp F1", "&kp F2", "&kp F3", "&kp F4", "&kp F5", "&kp F6",           "&tog 1",                                                              "&mo 3", "&kp F7", "&kp F8", "&kp F9", "&kp F10", "&kp F11", "&kp F12",
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",            "&none",                                                              "&none", "&trans", "&trans", "&trans",  "&trans",  "&trans",  "&trans",
@@ -29,17 +29,17 @@
        "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                               "&trans",                     "&trans",                     "&trans", "&trans", "&trans",  "&trans",  "&trans",  "&trans",
        "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",                     "&trans", "&trans", "&trans",           "&trans", "&trans",  "&trans",  "&trans",  "&trans"
     ], [
-                       "&none",        "&bt BT_SEL 0",        "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-                       "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",  "&none",
-       "&macro_linux_profile0", "&macro_mac_profile1", "&macro_mac_profile3",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none",  "&none"
+        "&none",        "&bt BT_SEL 0",        "&bt BT_SEL 1", "&bt BT_SEL 2", "&bt BT_SEL 3", "&bt BT_SEL 4",                 "&none",                                                                                     "&trans",  "&none",      "&none",      "&none",  "&none",  "&none",                 "&none",
+        "&none",               "&none",               "&none",        "&none",        "&none",        "&none",           "&bootloader",                                                                                "&bootloader",  "&none",      "&none",      "&none",  "&none",  "&none",                 "&none",
+        "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                 "&none",  "&none",  "&none",                     "&bt BT_CLR",      "&none", "&rgb_ug RGB_MEFS_CMD 5",  "&none",      "&none",      "&none",  "&none",  "&none",                 "&none",
+        "&none",               "&none",               "&none",        "&none",        "&none",        "&none",                                     "&none",                          "&none",                                          "&none",      "&none",      "&none",  "&none",  "&none",                 "&none",
+        "&none", "&macro_mac_profile1", "&macro_mac_profile3",        "&none",        "&none",                                 "&none",  "&none",  "&none",                          "&none", "&bl BL_TOG",        "&rgb_ug RGB_TOG",           "&bl BL_INC", "&bl BL_DEC",  "&none",  "&none", "&macro_linux_profile0"
     ], [
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                 "&mo 3", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&trans", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
-       "&trans",                "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                     "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
-       "&trans", "&macro_linux_profile0", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                     "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&macro_linux_profile0"
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                   "&mo 3", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans",                                                                                  "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",           "&trans", "&kp LEFT_COMMAND", "&kp LEFT_ALT",                     "&kp LGUI", "&kp RCTRL", "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans", "&trans",                                               "&trans",                       "&trans",                        "&trans", "&trans", "&trans", "&trans", "&trans",                "&trans",
+       "&trans", "&trans", "&trans", "&trans", "&trans",                     "&trans",           "&trans",       "&trans",                       "&trans",    "&trans", "&trans",           "&trans", "&trans", "&trans", "&trans", "&macro_linux_profile0"
     ]
   ]
 }
\ No newline at end of file
-- 
2.40.1


From 71b7236213f0fbab2fe1900001eca363cf13edfa Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Sun, 31 Dec 2023 14:14:06 +0100
Subject: [PATCH 24/25] tap-dance, comment with idea and links to docs

---
 README.md            |  8 ++++++++
 config/adv360.keymap | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 73e290b..c168ade 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,14 @@
 * Forked from: [`KinesisCorporation/Adv360-Pro-ZMK`](https://github.com/KinesisCorporation/Adv360-Pro-ZMK)
 
 
+## Use Tap-Dance
+
+Tap-Dance: https://zmk.dev/docs/behaviors/tap-dance
+
+Both: `tap` `C` -> `C`
+Normal layer: `tap,tap` `C` -> `ctrl C`
+Mac layer:    `tap,tap` `C` -> `cmd C`
+
 ## Modifying the keymap
 
 [The ZMK documentation](https://zmk.dev/docs) covers both basic and advanced functionality and has a table of OS compatibility for keycodes. Please note that the RGB Underglow, Backlight and Power Management sections are not relevant to the Advantage 360 Pro's custom ZMK fork. For more information see [this note](#note)
diff --git a/config/adv360.keymap b/config/adv360.keymap
index d4e4860..e5d2e6e 100644
--- a/config/adv360.keymap
+++ b/config/adv360.keymap
@@ -12,6 +12,16 @@
  * edit it directly.
  */
 
+/*
+ *
+ * Use Tap-Dance: https://zmk.dev/docs/behaviors/tap-dance
+ *
+ * Both:         tap C     -> C
+ * Normal layer: tap,tap C -> ctrl C
+ * Mac layer:    tap,tap C -> cmd C
+ *
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
-- 
2.40.1


From d9853dbd4317aa13527b6924ef8bbe19fe177010 Mon Sep 17 00:00:00 2001
From: Ben Kristinsson <ben@sudo.is>
Date: Tue, 30 Jan 2024 17:42:28 +0100
Subject: [PATCH 25/25] markdown

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c168ade..4d6fa6b 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
 
 Tap-Dance: https://zmk.dev/docs/behaviors/tap-dance
 
-Both: `tap` `C` -> `C`
-Normal layer: `tap,tap` `C` -> `ctrl C`
-Mac layer:    `tap,tap` `C` -> `cmd C`
+ * Both: `tap` `C` -> `C`
+ * Normal layer: `tap,tap` `C` -> `ctrl C`
+ * Mac layer:    `tap,tap` `C` -> `cmd C`
 
 ## Modifying the keymap
 
-- 
2.40.1