Fixing ci for android ndk (#701)

Andrey1994 · web-flow · commit 371981ee42a8 · 2024-01-21T01:31:44.000+01:00
* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

* fix android ci pipelines

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;

---------

Signed-off-by: Andrey Parfenov &lt;a1994ndrey@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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)]

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ export enum BoardIds {`
`66`	`66`	`GALEA_SERIAL_BOARD_V4 = 49,`
`67`	`67`	`NTL_WIFI_BOARD = 50,`
`68`	`68`	`ANT_NEURO_EE_511_BOARD = 51,`
	`69`	`+ EXPLORE_PLUS_8_CHAN_BOARD = 54,`
	`70`	`+ EXPLORE_PLUS_32_CHAN_BOARD = 55`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`export enum IpProtocolTypes {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl BoardIds {`
`32`	`32`	`pub const FIRST: BoardIds = BoardIds::PlaybackFileBoard;`
`33`	`33`	`}`
`34`	`34`	`impl BoardIds {`
`35`		`- pub const LAST: BoardIds = BoardIds::AavaaV3Board;`
	`35`	`+ pub const LAST: BoardIds = BoardIds::ExplorePlus32ChanBoard;`
`36`	`36`	`}`
`37`	`37`	`#[repr(i32)]`
`38`	`38`	`#[derive(FromPrimitive, ToPrimitive, Debug, Copy, Clone, Hash, PartialEq, Eq)]`
`@@ -92,6 +92,8 @@ pub enum BoardIds {`
`92`	`92`	`AntNeuroEe511Board = 51,`
`93`	`93`	`Freeeeg128Board = 52,`
`94`	`94`	`AavaaV3Board = 53,`
	`95`	`+ ExplorePlus8ChanBoard = 54,`
	`96`	`+ ExplorePlus32ChanBoard = 55,`
`95`	`97`	`}`
`96`	`98`	`#[repr(i32)]`
`97`	`99`	`#[derive(FromPrimitive, ToPrimitive, Debug, Copy, Clone, Hash, PartialEq, Eq)]`