Fix west.yaml for flip back to upstream zmk

.devcontainer/Dockerfile.rpi

@@ -0,0 +1,40 @@
+FROM ubuntu:latest as base
+
+RUN apt-get update && apt-get install -y \
+        git \
+        wget \
+        autoconf \
+        automake \
+        build-essential \
+        bzip2 \
+        ccache \
+        device-tree-compiler \
+        dfu-util \
+        g++ \
+        gcc \
+        gcc-arm-none-eabi \
+        libtool \
+        make \
+        ninja-build \
+        cmake \
+        python3-dev \
+        python3-pip \
+        python3-setuptools \
+        xz-utils \
+    && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+FROM base as dev
+RUN apt-get update && apt-get install -y nano vim emacs tmux htop tio minicom \
+    && pip3 install --user -U west \
+    && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+COPY bashrc tmp
+RUN mv /tmp/bashrc ~/.bashrc
+
+WORKDIR /workspaces
+
+ENV ZEPHYR_TOOLCHAIN_VARIANT=cross-compile
+ENV CROSS_COMPILE=/usr/bin/arm-none-eabi-
+
+CMD ["/bin/bash"]
+

.devcontainer/bashrc

@@ -1,4 +1,5 @@
 export LS_OPTIONS='-F --color=auto'
+export PATH=~/.local/bin:${PATH}
 alias ls='ls $LS_OPTIONS'
 if [ "${CODESPACES}" = "true" ]; then
   export WORKSPACE_DIR="$HOME/workspace/zmk"

DEVELOPMENT.md

@@ -0,0 +1,19 @@
+# Developing ARDUX for ZMK
+
+## Work In Progress
+
+The below is a work in progress. Don't be surprised if there are quirks in the information provided below. PRs are welcome.
+
+## Misc Notes
+
+```
+
+KiTTY has an auto reconnect option, but it's not fast enough to catch the first few messages
+ 
+There's a Kconfig setting to delay starting the logging thread.
+ 
+Set it a tad higher, should let you catch first log messages.
+ 
+LOG_PROCESS_THREAD_STARTUP_DELAY_MS is the setting.
+
+```

config/boards/shields/bluehand/bluehand_left.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/boards/shields/bluehand/bluehand_right.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/boards/shields/cradio_left/cradio_ardux_left.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/boards/shields/cradio_left/cradio_ardux_thumb_left.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/boards/shields/cradio_right/cradio_ardux_right.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/boards/shields/cradio_right/cradio_ardux_thumb_right.conf

@@ -10,7 +10,7 @@ CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
 CONFIG_BT_MAX_CONN=6
 
 # Enable display (layer in use is helpful)
-CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=n
 
 # Turn off sleep
 CONFIG_ZMK_SLEEP=n

config/west.yml

@@ -1,13 +1,13 @@
 manifest:
   remotes:
     - name: zmkfirmware
-      url-base: https://github.com/arduxio
+      url-base: https://github.com/zmkfirmware
     - name: zmk-ardux
       url-base: https://github.com/arduxio
   projects:
     - name: zmk
       remote: zmkfirmware
-      revision: ardux
+      revision: main
       import: app/west.yml
   self:
     path: config

docker_dev.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+docker run -it \
+	--name zmk-ardux-dev \
+	--network host \
+	--privileged \
+	-v /dev:/dev \
+	-v zmk:/workspaces/zmk \
+	-v ./:/workspaces/zmk-ardux \
+        -v ./.build:/workspaces/zmk/app/build \
+	zmk-ardux:latest \
+	/bin/bash

docker_setup_rpi.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+docker volume create zmk
+
+cd .devcontainer
+
+docker build --network host -t zmk-ardux:latest -f ./Dockerfile.rpi
+
+docker run --rm \
+	--network host \
+	-v zmk:/workspaces/zmk \
+	zmk-ardux:latest \
+	/bin/bash -c "git clone https://github.com/zmkfirmware/zmk /workspaces/zmk/"
+
+docker run \
+	--name zmk-ardux-setup \
+	--network host \
+	-v zmk:/workspaces/zmk \
+	zmk-ardux:latest \
+	/bin/bash -c "source ~/.bashrc && cd /workspaces/zmk && west init -l app/ && west update && west zephyr-export && pip3 install --user -r zephyr/scripts/requirements-base.txt"
+
+docker commit zmk-ardux-setup zmk-ardux:latest
+
+docker rm -f zmk-ardux-setup
+
+cd ..
+

docker_snapshot.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker commit zmk-ardux-setup zmk-ardux:latest