From 371981ee42a8c1119addb1bfc273335d80068be1 Mon Sep 17 00:00:00 2001 From: Andrey Parfenov Date: Sun, 21 Jan 2024 01:31:44 +0100 Subject: [PATCH] Fixing ci for android ndk (#701) * fix android ci pipelines Signed-off-by: Andrey Parfenov * fix android ci pipelines Signed-off-by: Andrey Parfenov * fix android ci pipelines Signed-off-by: Andrey Parfenov * fix android ci pipelines Signed-off-by: Andrey Parfenov * fix android ci pipelines Signed-off-by: Andrey Parfenov * fix android ci pipelines Signed-off-by: Andrey Parfenov --------- Signed-off-by: Andrey Parfenov --- .github/workflows/run_android.yml | 4 +++- .../brainflow/brainflow/board_controller_library.cs | 2 +- nodejs_package/brainflow/brainflow.types.ts | 2 ++ rust_package/brainflow/src/ffi/constants.rs | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_android.yml b/.github/workflows/run_android.yml index 8fa966c52..5e71369c8 100644 --- a/.github/workflows/run_android.yml +++ b/.github/workflows/run_android.yml @@ -30,7 +30,9 @@ jobs: cmake-version: '3.16.x' - name: Install NDK run: | - echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${ANDROID_NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT} > /dev/null + echo "y" | sudo -H ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${ANDROID_NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT} + env: + DEBIAN_FRONTEND: noninteractive # build for all ABIs - name: Compile libusb run: | diff --git a/csharp_package/brainflow/brainflow/board_controller_library.cs b/csharp_package/brainflow/brainflow/board_controller_library.cs index b667c75b4..35de08f0f 100644 --- a/csharp_package/brainflow/brainflow/board_controller_library.cs +++ b/csharp_package/brainflow/brainflow/board_controller_library.cs @@ -114,7 +114,7 @@ public enum BoardIds FREEEEG128_BOARD = 52, AAVAA_V3_BOARD = 53, EXPLORE_PLUS_8_CHAN_BOARD = 54, - EXPLORE_PLUS_32_CHAN_BOARD = 55, + EXPLORE_PLUS_32_CHAN_BOARD = 55 }; diff --git a/nodejs_package/brainflow/brainflow.types.ts b/nodejs_package/brainflow/brainflow.types.ts index 15e3a9150..21929592f 100644 --- a/nodejs_package/brainflow/brainflow.types.ts +++ b/nodejs_package/brainflow/brainflow.types.ts @@ -66,6 +66,8 @@ export enum BoardIds { GALEA_SERIAL_BOARD_V4 = 49, NTL_WIFI_BOARD = 50, ANT_NEURO_EE_511_BOARD = 51, + EXPLORE_PLUS_8_CHAN_BOARD = 54, + EXPLORE_PLUS_32_CHAN_BOARD = 55 } export enum IpProtocolTypes { diff --git a/rust_package/brainflow/src/ffi/constants.rs b/rust_package/brainflow/src/ffi/constants.rs index 216247759..6e8d43c8d 100644 --- a/rust_package/brainflow/src/ffi/constants.rs +++ b/rust_package/brainflow/src/ffi/constants.rs @@ -32,7 +32,7 @@ impl BoardIds { pub const FIRST: BoardIds = BoardIds::PlaybackFileBoard; } impl BoardIds { - pub const LAST: BoardIds = BoardIds::AavaaV3Board; + pub const LAST: BoardIds = BoardIds::ExplorePlus32ChanBoard; } #[repr(i32)] #[derive(FromPrimitive, ToPrimitive, Debug, Copy, Clone, Hash, PartialEq, Eq)] @@ -92,6 +92,8 @@ pub enum BoardIds { AntNeuroEe511Board = 51, Freeeeg128Board = 52, AavaaV3Board = 53, + ExplorePlus8ChanBoard = 54, + ExplorePlus32ChanBoard = 55, } #[repr(i32)] #[derive(FromPrimitive, ToPrimitive, Debug, Copy, Clone, Hash, PartialEq, Eq)]