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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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/ADCDemo/ADCDemoMainActivity.java b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/ADCDemo/ADCDemoMainActivity.java index ac884cf35dd..02314f4ec9b 100644 --- a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/ADCDemo/ADCDemoMainActivity.java +++ b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/ADCDemo/ADCDemoMainActivity.java @@ -94,6 +94,13 @@ public class ADCDemoMainActivity extends Activity { adc = readNumFromFile(path, "in_voltage2_raw"); ADC adcObj = new ADC(adc, String.format("[AIN%d]",channel)); adcValueList.add(adcObj); + } else if (mBoardType > BoardType.RK3576_BASE && mBoardType <= BoardType.RK3576_MAX) { + int channel = 6; + int adc = 0; + final String path = "/sys/devices/platform/2ae00000.adc/iio:device0"; + adc = readNumFromFile(path, "in_voltage6_raw"); + ADC adcObj = new ADC(adc, String.format("[AIN%d]",channel)); + adcValueList.add(adcObj); } else if (mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { int channel = 2; int adc = 0; 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 49d1cd5b5b5..b290cc916f3 100644 --- a/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/ADCDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 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 @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 000adca2feb..37cfd4208c4 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 @@ -224,6 +224,34 @@ public class GPIODemoMainActivity extends Activity { //uart7 (m1) demoGPIOPins.put("Pin11", 116); // GPIO3_C4 demoGPIOPins.put("Pin12", 117); // GPIO3_C5 + } else if (boardType == BoardType.NanoPi_M5) { + //uart2 (m1) + demoGPIOPins.put("Pin08", 141); // GPIO4_B5 + demoGPIOPins.put("Pin10", 140); // GPIO4_B4 + //uart8 (m1) + //demoGPIOPins.put("Pin11", 70); // GPIO2_A6 + //demoGPIOPins.put("Pin13", 71); // GPIO2_A7 + demoGPIOPins.put("Pin15", 130); // GPIO4_A2 + //uart3 (m0) + //demoGPIOPins.put("Pin16", 96); // GPIO3_A0 + //demoGPIOPins.put("Pin18", 97); // GPIO3_A1 + //spi4 (m2) + demoGPIOPins.put("Pin19", 137); // GPIO4_B1 + demoGPIOPins.put("Pin21", 138); // GPIO4_B2 + demoGPIOPins.put("Pin23", 136); // GPIO4_B0 + demoGPIOPins.put("Pin24", 139); // GPIO4_B3 + //spi3 (m2) + demoGPIOPins.put("Pin26", 134); // GPIO4_A6 + demoGPIOPins.put("Pin27", 135); // GPIO4_A7 + demoGPIOPins.put("Pin28", 132); // GPIO4_A4 + demoGPIOPins.put("Pin29", 131); // GPIO4_A3 + } else if (boardType == BoardType.NanoPi_R76S) { + demoGPIOPins.put("Pin03", 131); // GPIO4_A3 + demoGPIOPins.put("Pin05", 133); // GPIO4_A5 + demoGPIOPins.put("Pin07", 135); // GPIO4_A7 + //uart6 (m0) + //demoGPIOPins.put("Pin04", 132); // GPIO4_A4 + //demoGPIOPins.put("Pin06", 134); // GPIO4_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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 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 @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 100644 --- a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/PWMDemo/PWMTestingActivity.java b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/PWMDemo/PWMTestingActivity.java index 8a661024b04..6e4448f0596 100644 --- a/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/PWMDemo/PWMTestingActivity.java +++ b/vendor/friendlyelec/apps/PWMDemo/src/com/friendlyarm/PWMDemo/PWMTestingActivity.java @@ -133,6 +133,8 @@ public class PWMTestingActivity extends Activity { mBoardType = HardwareControler.getBoardType(); if (mBoardType > BoardType.RK3399_BASE && mBoardType <= BoardType.RK3399_MAX) { pwmChip = "pwmchip1"; + } else if (mBoardType > BoardType.RK3576_BASE && mBoardType <= BoardType.RK3576_MAX) { + pwmChip = "pwmchip1"; } else if (mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { pwmChip = "pwmchip1"; } else { 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 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 @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ No newline at end of file diff --git a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/RTCDemo/RTCDemoMainActivity.java b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/RTCDemo/RTCDemoMainActivity.java index 7b7670c7f32..b034ec01b5d 100644 --- a/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/RTCDemo/RTCDemoMainActivity.java +++ b/vendor/friendlyelec/apps/RTC_Demo/src/com/friendlyarm/RTCDemo/RTCDemoMainActivity.java @@ -101,8 +101,9 @@ public class RTCDemoMainActivity extends Activity { switch (msg.what) { case MSG_SHOW_DATETIME: if (mBoardType > BoardType.RK3399_BASE && mBoardType <= BoardType.RK3399_MAX - || mBoardType > BoardType.RK3568_BASE && mBoardType <= BoardType.RK3568_MAX - || mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { + || mBoardType > BoardType.RK3568_BASE && mBoardType <= BoardType.RK3568_MAX + || mBoardType > BoardType.RK3576_BASE && mBoardType <= BoardType.RK3576_MAX + || mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { mDateTextView.setText(readFromFile("/sys/class/rtc/rtc0/","date")); mTimeTextView.setText(readFromFile("/sys/class/rtc/rtc0/","time")); } @@ -140,13 +141,13 @@ public class RTCDemoMainActivity extends Activity { mEnableButton = (Button)findViewById(R.id.button_enableAutoWakeUp); mResultTextView = (TextView)findViewById(R.id.text_result); - if (mBoardType > BoardType.RK3399_BASE && mBoardType <= BoardType.RK3399_MAX) { - //rk3399 - } else { - mAutoWakeUpTextView.setVisibility(View.INVISIBLE); - mAutoWakeUpSeekBar.setVisibility(View.INVISIBLE); - mEnableButton.setVisibility(View.INVISIBLE); - } + if (mBoardType > BoardType.RK3399_BASE && mBoardType <= BoardType.RK3399_MAX) { + //rk3399 + } else { + mAutoWakeUpTextView.setVisibility(View.INVISIBLE); + mAutoWakeUpSeekBar.setVisibility(View.INVISIBLE); + mEnableButton.setVisibility(View.INVISIBLE); + } mAutoWakeUpSeekBar.setProgress(mWakeUpSeconds); mAutoWakeUpSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @@ -177,8 +178,9 @@ public class RTCDemoMainActivity extends Activity { public void onEnableAutoWakeUpPressed(View view) { if (mBoardType > BoardType.RK3399_BASE && mBoardType <= BoardType.RK3399_MAX - || mBoardType > BoardType.RK3568_BASE && mBoardType <= BoardType.RK3568_MAX - || mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { + || mBoardType > BoardType.RK3568_BASE && mBoardType <= BoardType.RK3568_MAX + || mBoardType > BoardType.RK3576_BASE && mBoardType <= BoardType.RK3576_MAX + || mBoardType > BoardType.RK3588_BASE && mBoardType <= BoardType.RK3588_MAX) { if (writeToFile("/sys/class/rtc/rtc0/wakealarm", "+" + String.valueOf(mWakeUpSeconds))) { Toast.makeText(this, String.format("Performed successfully"), Toast.LENGTH_SHORT).show(); 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 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 @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 b3c8fd09bc9..6e5f2bef9bd 100644 --- a/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java +++ b/vendor/friendlyelec/apps/SerialPortDemo/src/com/friendlyarm/SerialPortDemo/SerialPortDataProcessView.java @@ -80,6 +80,13 @@ public class SerialPortDataProcessView extends Activity implements OnClickListen } else { devName = "/dev/ttyS6"; } + } else if (mBoardType > BoardType.RK3576_BASE && mBoardType <= BoardType.RK3576_MAX) { + if (mBoardType == BoardType.NanoPi_R76S) { + // NanoPi-R76S UART6 + devName = "/dev/ttyS6"; + } else { + devName = "/dev/ttyS8"; + } } else if (mBoardType > BoardType.RK3568_BASE && mBoardType <= BoardType.RK3568_MAX) { // NanoPi-R5S UART9 devName = "/dev/ttyS9"; 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 23779c74aa8..2f440e8dac6 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 37c1f8fdad5..172844c2ce1 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 49d1cd5b5b5..b290cc916f3 100644 --- a/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java +++ b/vendor/friendlyelec/apps/WatchDogDemo/src/com/friendlyarm/FriendlyThings/BoardType.java @@ -109,4 +109,10 @@ public class BoardType { 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; + + //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; } \ 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 23779c74aa8..2f440e8dac6 100755 Binary files a/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so and b/vendor/friendlyelec/apps/prebuilt/libfriendlyarm-things.so differ