From c28be145f487ffb87a7405bea1a973ddfa11a159 Mon Sep 17 00:00:00 2001 From: Ian Lavery Date: Wed, 31 Jan 2024 11:37:48 -0800 Subject: [PATCH] .NET rpi5 support (#677) --- .github/workflows/dotnet-demos.yml | 4 +++- .github/workflows/dotnet.yml | 2 +- binding/dotnet/README.md | 1 + binding/dotnet/Rhino/Rhino.csproj | 4 ++-- binding/dotnet/Rhino/Utils.cs | 6 ++++-- binding/dotnet/RhinoTest/MainTest.cs | 5 +++-- demo/dotnet/README.md | 1 + demo/dotnet/RhinoDemo/RhinoDemo.csproj | 4 ++-- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 3acb03457..edfee6b5b 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -59,7 +59,7 @@ jobs: strategy: matrix: - machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone] + machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone] include: - machine: rpi2 platform: raspberry-pi @@ -71,6 +71,8 @@ jobs: platform: raspberry-pi - machine: rpi4-64 platform: raspberry-pi + - machine: rpi5-64 + platform: raspberry-pi - machine: jetson platform: jetson - machine: beaglebone diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4a6d73863..544349065 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -97,7 +97,7 @@ jobs: strategy: matrix: - machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone] + machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone] steps: - uses: actions/checkout@v3 diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md index 9626c05b3..da8291642 100644 --- a/binding/dotnet/README.md +++ b/binding/dotnet/README.md @@ -43,6 +43,7 @@ Platforms compatible with .NET Core 3.0+: - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) + - 5 (32 and 64 bit) - NVIDIA Jetson Nano - BeagleBone diff --git a/binding/dotnet/Rhino/Rhino.csproj b/binding/dotnet/Rhino/Rhino.csproj index 324b7532c..7738f111e 100644 --- a/binding/dotnet/Rhino/Rhino.csproj +++ b/binding/dotnet/Rhino/Rhino.csproj @@ -2,7 +2,7 @@ net6.0;netcoreapp3.0;netstandard2.0 - 3.0.1 + 3.0.2 Picovoice Rhino Speech-to-Intent Engine @@ -12,7 +12,7 @@ git nlu, intent, inference, speech recognition, voice commands, offline, private, voice, ai, voice assistant See https://github.com/Picovoice/rhino/ - Picovoice 2020-2022 + Picovoice 2020-2024 Rhino is Picovoice's Speech-to-Intent engine. It directly infers intent from spoken commands within a given context of interest, in real-time. diff --git a/binding/dotnet/Rhino/Utils.cs b/binding/dotnet/Rhino/Utils.cs index 981cdfaa2..3412d067c 100644 --- a/binding/dotnet/Rhino/Utils.cs +++ b/binding/dotnet/Rhino/Utils.cs @@ -1,5 +1,5 @@ /* - Copyright 2020-2023 Picovoice Inc. + Copyright 2020-2024 Picovoice Inc. You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" file accompanying this source. @@ -75,6 +75,7 @@ public static string PvLinuxMachine() case "0xd03": return "cortex-a53" + archInfo; case "0xd07": return "cortex-a57" + archInfo; case "0xd08": return "cortex-a72" + archInfo; + case "0xd0b": return "cortex-a76" + archInfo; case "0xc08": return ""; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); @@ -88,7 +89,8 @@ public static string PvLinuxEnv() { case "0xc07": case "0xd03": - case "0xd08": return "raspberry-pi"; + case "0xd08": + case "0xd0b": return "raspberry-pi"; case "0xd07": return "jetson"; case "0xc08": return "beaglebone"; default: diff --git a/binding/dotnet/RhinoTest/MainTest.cs b/binding/dotnet/RhinoTest/MainTest.cs index f61a4a469..f6ed35ee6 100644 --- a/binding/dotnet/RhinoTest/MainTest.cs +++ b/binding/dotnet/RhinoTest/MainTest.cs @@ -1,5 +1,5 @@ /* - Copyright 2020-2023 Picovoice Inc. + Copyright 2020-2024 Picovoice Inc. You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" file accompanying this source. @@ -375,7 +375,8 @@ public static string PvLinuxEnv() { case "0xc07": case "0xd03": - case "0xd08": return "raspberry-pi"; + case "0xd08": + case "0xd0b": return "raspberry-pi"; case "0xd07": return "jetson"; case "0xc08": return "beaglebone"; default: diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index 8d378cfc8..80208cd66 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -44,6 +44,7 @@ Rhino is: - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) + - 5 (32 and 64 bit) - NVIDIA Jetson Nano - BeagleBone diff --git a/demo/dotnet/RhinoDemo/RhinoDemo.csproj b/demo/dotnet/RhinoDemo/RhinoDemo.csproj index 9aeb8e0a1..44e267a01 100644 --- a/demo/dotnet/RhinoDemo/RhinoDemo.csproj +++ b/demo/dotnet/RhinoDemo/RhinoDemo.csproj @@ -19,7 +19,7 @@ - - + +