Migrate code to the nRF Connect SDK

.devcontainer/devcontainer.json

@@ -0,0 +1,13 @@
+{
+	"name": "nrf-connect:v2.1",
+	"image": "nordicplayground/nrfconnect-sdk:v2.1-branch",
+	"features": {
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"nordic-semiconductor.nrf-connect"
+			]
+		}
+	}
+}

.github/actions/build/Dockerfile

@@ -1,12 +1,4 @@
-FROM debian:bullseye-slim
-
-RUN apt-get update && \
-  apt-get -y install wget tar unzip make clang-format gcc-arm-none-eabi
-
-RUN cd /opt && \
-  wget https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5/Binaries/nRF5SDK1702d674dde.zip -O nRF5_SDK.zip && \
-  unzip nRF5_SDK.zip && \
-  mv nRF5_SDK_17.0.2_d674dde nRF5_SDK
+FROM nordicplayground/nrfconnect-sdk:v2.1-branch
 
 COPY build.sh /build.sh
 

.github/actions/build/action.yml

@@ -1,5 +1,23 @@
 name: 'Build'
-description: 'Builds b-parasite firmware'
+description: 'Builds a nrf-connect sample for b-parasite'
+inputs:
+  sample-dir:
+    description: 'Sample directory to build'
+    required: true
+  board:
+    description: 'Board definition to use'
+    default: bparasite_nrf52840
+  cmake-extra:
+    description: 'Extra CMake arguments'
+    default: ''
+  output-bin:
+    description: 'Name of the .hex output'
+    required: true
 runs:
   using: 'docker'
   image: 'Dockerfile'
+  args:
+    - ${{ inputs.sample-dir }}
+    - ${{ inputs.board }}
+    - ${{ inputs.cmake-extra }}
+    - ${{ inputs.output-bin }}

.github/actions/build/build.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 set -eux -o pipefail
 
-export SDK_ROOT=/opt/nRF5_SDK
-export GNU_INSTALL_ROOT=/usr/bin/
+SAMPLE_DIR=$1
+BOARD=$2
+CMAKE_EXTRA=$3
+OUTPUT_BIN=$4
 
-cd "$GITHUB_WORKSPACE/code/b-parasite"
-make clean
-make lint
-make
+cd "${GITHUB_WORKSPACE}/${SAMPLE_DIR}"
+
+west build --build-dir ./build --pristine --board "${BOARD}" -- $CMAKE_EXTRA
+
+mv build/zephyr/zephyr.hex build/zephyr/"${OUTPUT_BIN}"

.github/actions/build_and_upload/action.yml

@@ -0,0 +1,29 @@
+name: 'Build and upload artifact'
+description: 'Builds a nrf-connect sample for b-parasite'
+inputs:
+  sample-dir:
+    description: 'Sample directory to build'
+    required: true
+  board:
+    description: 'Board definition to use'
+    required: true
+  cmake-extra:
+    description: 'Extra CMake arguments'
+    default: ''
+  output-bin:
+    description: 'Name of the .hex output'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/build
+      with:
+        sample-dir: ${{ inputs.sample-dir }}
+        board: ${{ inputs.board }}
+        cmake-extra: ${{ inputs.cmake-extra }}
+        output-bin: ${{ inputs.output-bin }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: sample-binaries
+        path: code/nrf-connect/samples/ble/build/zephyr/${{ inputs.output-bin }}

.github/workflows/b-parasite.yml

@@ -9,9 +9,49 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Checks format & builds b-parasite's firmware
+    name: Check format & build samples
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
+        uses: actions/checkout@v3
+      - name: Check clang-format
+        uses: jidicula/clang-format-action@v4.9.0
+        with:
+          check-path: 'code/nrf-connect'
+      - name: Build blinky
         uses: ./.github/actions/build
+        with:
+          sample-dir: code/nrf-connect/samples/blinky
+          board: bparasite_nrf52840
+          output-bin: blinky_nrf52840.hex
+      - name: Build soil_read_loop
+        uses: ./.github/actions/build
+        with:
+          sample-dir: code/nrf-connect/samples/soil_read_loop
+          board: bparasite_nrf52840
+          output-bin: soil_read_loop_nrf52840.hex
+      - name: Build ble_nrf52840_default.hex
+        uses: ./.github/actions/build_and_upload
+        with:
+          sample-dir: code/nrf-connect/samples/ble
+          board: bparasite_nrf52840
+          output-bin: ble_nrf52840_default.hex
+      - name: Build ble_nrf52840_bthomev1.hex
+        uses: ./.github/actions/build_and_upload
+        with:
+          sample-dir: code/nrf-connect/samples/ble
+          board: bparasite_nrf52840
+          cmake-extra: -DCONFIG_PRST_BLE_ENCODING_BTHOME_V1=y
+          output-bin: ble_nrf52840_bthomev1.hex
+      - name: Build ble_nrf52833_default.hex
+        uses: ./.github/actions/build_and_upload
+        with:
+          sample-dir: code/nrf-connect/samples/ble
+          board: bparasite_nrf52833
+          output-bin: ble_nrf52833_default.hex
+      - name: Build ble_nrf52833_bthomev1.hex
+        uses: ./.github/actions/build_and_upload
+        with:
+          sample-dir: code/nrf-connect/samples/ble
+          board: bparasite_nrf52833
+          cmake-extra: -DCONFIG_PRST_BLE_ENCODING_BTHOME_V1=y
+          output-bin: ble_nrf52833_bthomev1.hex

code/.clang-format

@@ -0,0 +1,4 @@
+---
+
+BasedOnStyle: Google
+ColumnLimit: 0

code/nrf-connect/prstlib/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+add_library(prstlib STATIC
+	src/adc.c
+	src/button.c
+	src/led.c
+	src/sensors.c
+	src/shtc3.c
+)
+
+target_include_directories(prstlib PRIVATE include)
+target_link_libraries(prstlib PUBLIC zephyr_interface)

code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig

@@ -0,0 +1,9 @@
+
+if BOARD_BPARASITE_NRF52833
+
+config BOARD_ENABLE_DCDC
+	bool "DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+
+endif  # BOARD_BPARASITE_NRF52833

code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig.board

@@ -0,0 +1,4 @@
+
+config BOARD_BPARASITE_NRF52833
+	bool "b-parasite nRF52833 board"
+	depends on SOC_NRF52833_QIAA

code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig.defconfig

@@ -0,0 +1,10 @@
+
+if BOARD_BPARASITE_NRF52833
+
+config BOARD
+	default "bparasite_nrf52833"
+
+config BT_CTLR
+	default BT
+
+endif  # BOARD_BPARASITE_NRF52833

code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/board.cmake

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+board_runner_args(jlink "--device=nRF52833_xxAA" "--speed=4000")
+board_runner_args(pyocd "--target=nrf52833" "--frequency=4000000")
+# set(OPENOCD_NRF5_SUBFAMILY "nrf52")
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833-pinctrl.dtsi

@@ -0,0 +1,48 @@
+
+&pinctrl {
+	uart0_default: uart0_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 25)>,
+							<NRF_PSEL(UART_RX, 0, 23)>;
+		};
+	};
+
+	uart0_sleep: uart0_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 25)>,
+							<NRF_PSEL(UART_RX, 0, 23)>;
+			low-power-enable;
+		};
+	};
+
+	/* Configure pwm0 instance to use pin 5. */
+	pwm0_default: pwm0_default {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 5)>;
+			nordic,invert;
+		};
+	};
+
+	pwm0_sleep: pwm0_sleep {
+		group1 {
+			psels = <NRF_PSEL(PWM_OUT0, 0, 5)>;
+			low-power-enable;
+		};
+	};
+
+	/* Configure i2c0 instance to use pins 24 (SDA) & 13 (SCL). */
+	i2c0_default: i2c0_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
+							<NRF_PSEL(TWIM_SCL, 0, 13)>;
+		};
+	};
+
+	i2c0_sleep: i2c0_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
+							<NRF_PSEL(TWIM_SCL, 0, 13)>;
+			low-power-enable;
+		};
+	};
+};