diff --git a/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/ADCDemo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/ADCDemo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/GPIO_LED_Demo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java index 37cfd4208c4..dcfb9696280 100644 --- a/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java +++ b/vendor/friendlyelec/apps/GPIO_LED_Demo/src/com/friendlyarm/GPIODemo/GPIODemoMainActivity.java @@ -170,6 +170,7 @@ public class GPIODemoMainActivity extends Activity { demoGPIOPins.put("Pin9", 42); } else if (boardType == BoardType.NanoPC_T6 || boardType == BoardType.NanoPC_T6_LTS + || boardType == BoardType.NanoPC_T6_PLUS || boardType == BoardType.CM3588) { demoGPIOPins.put("Pin07", 106); // GPIO3_B2 demoGPIOPins.put("Pin12", 111); // GPIO3_B7 @@ -204,7 +205,7 @@ public class GPIODemoMainActivity extends Activity { //uart5 (m1) //demoGPIOPins.put("Pin11", 116); // GPIO3_C4 //demoGPIOPins.put("Pin12", 117); // GPIO3_C5 - } else if (boardType == BoardType.NanoPi_M6) { + } else if (boardType == BoardType.NanoPi_M6 || boardType == BoardType.NanoPi_M6V2) { //uart0 (m0), uart8 (m0) demoGPIOPins.put("Pin07", 136); // GPIO4_B0 demoGPIOPins.put("Pin11", 137); // GPIO4_B1 @@ -252,6 +253,16 @@ public class GPIODemoMainActivity extends Activity { //uart6 (m0) //demoGPIOPins.put("Pin04", 132); // GPIO4_A4 //demoGPIOPins.put("Pin06", 134); // GPIO4_A6 + } else if (boardType == BoardType.Core3576) { + //uart2 (m1) + //demoGPIOPins.put("Pin03", 141); // GPIO4_B5 + //demoGPIOPins.put("Pin05", 140); // GPIO4_B4 + //i2c0 (m1) + //demoGPIOPins.put("Pin04", 17); // GPIO0_C1 + //demoGPIOPins.put("Pin06", 18); // GPIO0_C2 + demoGPIOPins.put("Pin07", 27); // GPIO0_D3 + demoGPIOPins.put("Pin08", 76); // GPIO2_B4 + demoGPIOPins.put("Pin09", 70); // GPIO2_A6 } else if (android.os.Build.VERSION.RELEASE.contains("4.1.2")) { demoGPIOPins.put("LED 1", 281); demoGPIOPins.put("LED 2", 282); diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/I2C_LCD1602_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/PWMDemo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/PWMDemo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/RTC_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/RTC_Demo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SPI_OLED_Demo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SerialPortDemo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/SerialPortDemo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java index 6e5f2bef9bd..051a6e1cc03 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java @@ -70,7 +70,9 @@ public class SerialPortDataProcessView extends Activity implements OnClickListen if (mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { if (mBoardType == BoardType.NanoPC_T6 || mBoardType == BoardType.NanoPC_T6_LTS + || mBoardType == BoardType.NanoPC_T6_PLUS || mBoardType == BoardType.NanoPi_M6 + || mBoardType == BoardType.NanoPi_M6V2 || mBoardType == BoardType.CM3588) { // NanoPC-T6 UART6 devName = "/dev/ttyS6"; @@ -84,6 +86,8 @@ public class SerialPortDataProcessView extends Activity implements OnClickListen if (mBoardType == BoardType.NanoPi_R76S) { // NanoPi-R76S UART6 devName = "/dev/ttyS6"; + } else if (mBoardType == BoardType.Core3576) { + devName = "/dev/ttyS2"; } else { devName = "/dev/ttyS8"; } diff --git a/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so b/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/WatchDogDemo/libs/arm64-v8a/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so b/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so index 172844c2ce1..9adffd29faf 100755 Binary files a/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/WatchDogDemo/libs/armeabi/libfriendlyarm-things.so differ diff --git a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java index b290cc916f3..cad37037577 100644 --- a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -108,11 +108,14 @@ public class BoardType { public static final int CM3588 = RK3588_BASE+5; public static final int NanoPi_M6 = RK3588_BASE+7; public static final int CM3588_Plus = RK3588_BASE+8; - public static final int RK3588_MAX = CM3588_Plus; + public static final int NanoPC_T6_PLUS = RK3588_BASE+9; + public static final int NanoPi_M6V2 = RK3588_BASE+10; + public static final int RK3588_MAX = NanoPi_M6V2; //rk3576 public static final int RK3576_BASE = 9900; public static final int NanoPi_M5 = RK3576_BASE+1; public static final int NanoPi_R76S = RK3576_BASE+2; - public static final int RK3576_MAX = NanoPi_R76S; + public static final int Core3576 = RK3576_BASE+3; + public static final int RK3576_MAX = Core3576; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so index 2f440e8dac6..26fba7f7cb3 100755 Binary files a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so differ