From 94ac100b6b9a5d15c0d2ef881be8615ef1e4996b Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Sat, 11 Dec 2021 22:39:41 -0500
Subject: [PATCH] refactor: Move to Zephyr v3.0.0 + ZMK fixes.
---
.devcontainer/Dockerfile | 2 +-
.github/workflows/build.yml | 2 +-
.github/workflows/hardware-metadata-validation.yml | 2 +-
.github/workflows/test.yml | 2 +-
app/src/behaviors/behavior_none.c | 1 -
app/src/behaviors/behavior_reset.c | 2 +-
app/src/behaviors/behavior_transparent.c | 1 -
app/src/split_listener.c | 1 -
app/west.yml | 10 ++++------
9 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7aed4880..21a7fd5a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/zmkfirmware/zmk-dev-arm:2.5
+FROM docker.io/zmkfirmware/zmk-dev-arm:3.0
COPY .bashrc tmp
RUN mv /tmp/.bashrc ~/.bashrc
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bfb195fe..03814a48 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
if: ${{ always() }}
runs-on: ubuntu-latest
container:
- image: docker.io/zmkfirmware/zmk-build-arm:2.5
+ image: docker.io/zmkfirmware/zmk-build-arm:3.0
needs: compile-matrix
strategy:
matrix:
diff --git a/.github/workflows/hardware-metadata-validation.yml b/.github/workflows/hardware-metadata-validation.yml
index 5c2fd375..7b5ec927 100644
--- a/.github/workflows/hardware-metadata-validation.yml
+++ b/.github/workflows/hardware-metadata-validation.yml
@@ -29,7 +29,7 @@ jobs:
validate-metadata:
runs-on: ubuntu-latest
container:
- image: docker.io/zmkfirmware/zmk-dev-arm:2.5
+ image: docker.io/zmkfirmware/zmk-dev-arm:3.0
steps:
- uses: actions/checkout@v2
- name: Install dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8cdcedf..cbe60d04 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
integration_test:
runs-on: ubuntu-latest
container:
- image: docker.io/zmkfirmware/zmk-build-arm:2.5
+ image: docker.io/zmkfirmware/zmk-build-arm:3.0
steps:
- name: Checkout
uses: actions/checkout@v2
diff --git a/app/src/behaviors/behavior_none.c b/app/src/behaviors/behavior_none.c
index d53a4400..1e7eb2b0 100644
--- a/app/src/behaviors/behavior_none.c
+++ b/app/src/behaviors/behavior_none.c
@@ -7,7 +7,6 @@
#define DT_DRV_COMPAT zmk_behavior_none
#include <device.h>
-#include <power/reboot.h>
#include <drivers/behavior.h>
#include <logging/log.h>
diff --git a/app/src/behaviors/behavior_reset.c b/app/src/behaviors/behavior_reset.c
index 0705df73..47b11fa4 100644
--- a/app/src/behaviors/behavior_reset.c
+++ b/app/src/behaviors/behavior_reset.c
@@ -7,7 +7,7 @@
#define DT_DRV_COMPAT zmk_behavior_reset
#include <device.h>
-#include <power/reboot.h>
+#include <sys/reboot.h>
#include <drivers/behavior.h>
#include <logging/log.h>
diff --git a/app/src/behaviors/behavior_transparent.c b/app/src/behaviors/behavior_transparent.c
index 1f36e7a6..2ba05747 100644
--- a/app/src/behaviors/behavior_transparent.c
+++ b/app/src/behaviors/behavior_transparent.c
@@ -7,7 +7,6 @@
#define DT_DRV_COMPAT zmk_behavior_transparent
#include <device.h>
-#include <power/reboot.h>
#include <drivers/behavior.h>
#include <logging/log.h>
diff --git a/app/src/split_listener.c b/app/src/split_listener.c
index 01cd89d9..3f3763ae 100644
--- a/app/src/split_listener.c
+++ b/app/src/split_listener.c
@@ -5,7 +5,6 @@
*/
#include <device.h>
-#include <power/reboot.h>
#include <logging/log.h>
#include <zmk/split/bluetooth/service.h>
diff --git a/app/west.yml b/app/west.yml
index cab02a5a..964d54c8 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -4,12 +4,14 @@ manifest:
url-base: https://github.com/zephyrproject-rtos
- name: zmkfirmware
url-base: https://github.com/zmkfirmware
+ - name: petejohanson
+ url-base: https://github.com/petejohanson
- name: microsoft
url-base: https://github.com/microsoft
projects:
- name: zephyr
- remote: zmkfirmware
- revision: v2.5.0+zmk-fixes
+ remote: petejohanson
+ revision: v3.0.0+zmk-fixes
clone-depth: 1
import:
# TODO: Rename once upstream offers option like `exclude` or `denylist`
@@ -33,9 +35,5 @@ manifest:
- openthread
- edtt
- trusted-firmware-m
- - name: uf2
- remote: microsoft
- path: tools/uf2
- clone-depth: 1
self:
west-commands: scripts/west-commands.yml