Merge branch 'main' into puddly/packet-filter-multicast-extension

NabuCasa · Jun 6, 2024 · 9025b7b · 9025b7b
2 parents 9d5167e + f8c797f
commit 9025b7b
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 165 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,12 @@ Command line building requires:
 
 > [!TIP]
 > If you have set up Simplicity Studio on macOS, everything will be automatically
-> detected with the exception of `slc-cli`. This is the only tool you need to download.
+> detected with the exception of `slc`. This is the only tool you need to download.
+
+> [!WARNING]
+> M1 users should set `JAVA_HOME=$(/usr/libexec/java_home -a x86_64)` when running the
+> build command to make sure the correct Java version is picked by slc-cli. It currently
+> is not compatible with ARM Java.
 
 `slc-cli` maintains its own SDK and extension trust store so you first must trust all
 SDK extensions for every SDK you plan to use:

diff --git a/...ts/skyconnect_bootloader-uart-xmodem.yaml → ...sa/skyconnect_bootloader-uart-xmodem.yaml b/...ts/skyconnect_bootloader-uart-xmodem.yaml → ...sa/skyconnect_bootloader-uart-xmodem.yaml
diff --git a/manifests/skyconnect_firmware-eraser.yaml → .../nabucasa/skyconnect_firmware-eraser.yaml b/manifests/skyconnect_firmware-eraser.yaml → .../nabucasa/skyconnect_firmware-eraser.yaml
diff --git a/manifests/skyconnect_ncp-uart-hw.yaml → ...ests/nabucasa/skyconnect_ncp-uart-hw.yaml b/manifests/skyconnect_ncp-uart-hw.yaml → ...ests/nabucasa/skyconnect_ncp-uart-hw.yaml
diff --git a/manifests/skyconnect_ot-rcp.yaml → manifests/nabucasa/skyconnect_ot-rcp.yaml b/manifests/skyconnect_ot-rcp.yaml → manifests/nabucasa/skyconnect_ot-rcp.yaml
diff --git a/manifests/skyconnect_rcp-uart-802154.yaml → .../nabucasa/skyconnect_rcp-uart-802154.yaml b/manifests/skyconnect_rcp-uart-802154.yaml → .../nabucasa/skyconnect_rcp-uart-802154.yaml
diff --git a/...-lr2_zwave_ncp_serial_api_controller.yaml → ...-lr2_zwave_ncp_serial_api_controller.yaml b/...-lr2_zwave_ncp_serial_api_controller.yaml → ...-lr2_zwave_ncp_serial_api_controller.yaml
diff --git a/...a-lr_zwave_ncp_serial_api_controller.yaml → ...a-lr_zwave_ncp_serial_api_controller.yaml b/...a-lr_zwave_ncp_serial_api_controller.yaml → ...a-lr_zwave_ncp_serial_api_controller.yaml
diff --git a/...001a_zwave_ncp_serial_api_controller.yaml → ...001a_zwave_ncp_serial_api_controller.yaml b/...001a_zwave_ncp_serial_api_controller.yaml → ...001a_zwave_ncp_serial_api_controller.yaml
diff --git a/manifests/yellow_bootloader-uart-xmodem.yaml → ...bucasa/yellow_bootloader-uart-xmodem.yaml b/manifests/yellow_bootloader-uart-xmodem.yaml → ...bucasa/yellow_bootloader-uart-xmodem.yaml
diff --git a/manifests/yellow_ncp-uart-hw.yaml → manifests/nabucasa/yellow_ncp-uart-hw.yaml b/manifests/yellow_ncp-uart-hw.yaml → manifests/nabucasa/yellow_ncp-uart-hw.yaml
diff --git a/manifests/yellow_ot-rcp.yaml → manifests/nabucasa/yellow_ot-rcp.yaml b/manifests/yellow_ot-rcp.yaml → manifests/nabucasa/yellow_ot-rcp.yaml
diff --git a/manifests/yellow_rcp-uart-802154.yaml → ...ests/nabucasa/yellow_rcp-uart-802154.yaml b/manifests/yellow_rcp-uart-802154.yaml → ...ests/nabucasa/yellow_rcp-uart-802154.yaml