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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 100644 --- a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 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 @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 d494a48b4b5..9b54dfd5671 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 @@ -168,7 +168,9 @@ public class GPIODemoMainActivity extends Activity { } else if (boardType == BoardType.SOM_RK3399 || boardType == BoardType.SOM_RK3399v2) { demoGPIOPins.put("Pin7", 41); demoGPIOPins.put("Pin9", 42); - } else if (boardType == BoardType.NanoPC_T6) { + } else if (boardType == BoardType.NanoPC_T6 + || boardType == BoardType.NanoPC_T6_LTS + || boardType == BoardType.CM3588) { demoGPIOPins.put("Pin07", 106); // GPIO3_B2 demoGPIOPins.put("Pin12", 111); // GPIO3_B7 demoGPIOPins.put("Pin15", 39); // GPIO1_A7 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 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 @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 100644 --- a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 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 @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 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 @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/SPI_OLED/MainActivity.java b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/SPI_OLED/MainActivity.java index 29f717ef99a..e9dfd8d7937 100644 --- a/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/SPI_OLED/MainActivity.java +++ b/vendor/friendlyelec/apps/SPI_OLED_Demo/src/com/friendlyarm/SPI_OLED/MainActivity.java @@ -76,7 +76,9 @@ public class MainActivity extends Activity implements OnClickListener { } else if (mBoardType>=BoardType.RK3399_BASE && mBoardType<=BoardType.RK3399_MAX) { gpioPin_For_DC = 33; /* GPIO1_A1 on T4, NEO4, M4, Pin11 */ gpioPin_For_Reset = 36; /* GPIO1_A4 on T4, NEO4, M4, Pin15 */ - } else if (mBoardType == BoardType.NanoPC_T6) { + } else if (mBoardType == BoardType.NanoPC_T6 + || mBoardType == BoardType.NanoPC_T6_LTS + || mBoardType == BoardType.CM3588) { gpioPin_For_DC = 108; /* GPIO3_B4, Pin18 */ gpioPin_For_Reset = 107; /* GPIO3_B3, Pin16 */ } else { 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 72981e4a874..89c2d42af04 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java @@ -68,7 +68,9 @@ public class SerialPortDataProcessView extends Activity implements OnClickListen } if (mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { - if (mBoardType == BoardType.NanoPC_T6) { + if (mBoardType == BoardType.NanoPC_T6 + || mBoardType == BoardType.NanoPC_T6_LTS + || mBoardType == BoardType.CM3588) { // NanoPC-T6 UART6 devName = "/dev/ttyS6"; } else if (mBoardType == BoardType.NanoPi_R6S || mBoardType == BoardType.NanoPi_R6C) { 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 fa484249fec..9208455dbd5 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 50588b177b2..ef4642a5317 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 c58d71c9d01..fefab4b8867 100644 --- a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -15,8 +15,9 @@ public class BoardType { public static final int NanoPi2_Fire = S5P4418_BASE+4; public static final int NanoPi_M2 = S5P4418_BASE+5; public static final int NanoPi_M2A = S5P4418_BASE+7; - public static final int Smart4418SDK = S5P4418_BASE+0x103; - public static final int S5P4418_MAX = Smart4418SDK; + public static final int Smart4418SDK = S5P4418_BASE+8; + public static final int SOM_4418 = S5P4418_BASE+9; + public static final int S5P4418_MAX = SOM_4418; //s5p6818 public static final int S5P6818_BASE = 6818; @@ -50,12 +51,12 @@ public class BoardType { public static final int NanoPi_Hero = ALLWINNER_BASE+14; public static final int NanoPi_Duo2 = ALLWINNER_BASE+15; public static final int NanoPi_R1 = ALLWINNER_BASE+16; - public static final int NanoPi_C3 = ALLWINNER_BASE+17; - public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; - public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; - public static final int ZeroPi = ALLWINNER_BASE+20; - public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; - public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; + public static final int NanoPi_C3 = ALLWINNER_BASE+17; + public static final int NanoPi_NEO2_Black = ALLWINNER_BASE+18; + public static final int NanoPi_NEO_S = ALLWINNER_BASE+19; + public static final int ZeroPi = ALLWINNER_BASE+20; + public static final int NanoPi_R1S_H3 = ALLWINNER_BASE+21; + public static final int NanoPi_R1S_H5 = ALLWINNER_BASE+22; public static final int ALLWINNER_MAX = NanoPi_R1S_H5; //amlogic @@ -103,5 +104,7 @@ public class BoardType { public static final int NanoPi_R6S = RK3588_BASE+1; public static final int NanoPC_T6 = RK3588_BASE+2; public static final int NanoPi_R6C = RK3588_BASE+3; - public static final int RK3588_MAX = NanoPi_R6C; + public static final int NanoPC_T6_LTS = RK3588_BASE+4; + public static final int CM3588 = RK3588_BASE+5; + public static final int RK3588_MAX = CM3588; } \ 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 fa484249fec..9208455dbd5 100755 Binary files a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so differ