forks/DroidStar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add scrollbars to settings/log tabs and fix android USB discovery for multiple serial devices (when using otg hubs for example)

Browse source
This commit is contained in:
Doug McLain 2021-11-15 16:23:38 -05:00
parent e28a626559
commit da5e464249
7 changed files with 28 additions and 9 deletions

1
LogTab.qml
View file

@ -47,6 +47,7 @@ Item {
logTxt.height
flickableDirection: Flickable.VerticalFlick
clip: true
ScrollBar.vertical: ScrollBar {}
TextArea {
id: logTxt
width: logTextBox.width

3
SettingsTab.qml
View file

@ -71,13 +71,14 @@ Item {
property alias modemNXDNTXLevelEdit: _modemNXDNTXLevelEdit
Flickable {
id: flickable
anchors.fill: parent
contentWidth: parent.width
contentHeight: vocoderButton.y +
vocoderButton.height + 10
flickableDirection: Flickable.VerticalFlick
clip: true
ScrollBar.vertical: ScrollBar {}
Text {
id: csLabel
x: 10

2
android/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="57" android:installLocation="auto">
<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="60" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

19
android/src/main/java/USBSerialWrapper.java
View file

@ -36,6 +36,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
public int m_parity = 0;
public int m_flowcontrol = 0;
public int m_rts = 0;
public String m_devicename;
UsbSerialPort m_port;
SerialInputOutputManagerTest usbIoManager;
@ -46,6 +47,12 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
counter++;
}
public void set_port_name(String d)
{
m_devicename = d;
System.out.println("Java Devicename: " + m_devicename);
}
public void set_baud_rate(int br)
{
m_baudrate = br;
@ -96,7 +103,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
System.out.println(availableDrivers.size() + " found");
for(int i = 0; i < availableDrivers.size(); ++i){
devices[i] = availableDrivers.get(i).getDevice().getProductName();
devices[i] = availableDrivers.get(i).getDevice().getProductName() + ":" + availableDrivers.get(i).getDevice().getDeviceName();
System.out.println("USB device getDeviceName() == " + availableDrivers.get(i).getDevice().getDeviceName());
System.out.println("USB device getProductName() == " + availableDrivers.get(i).getDevice().getProductName());
System.out.println("USB device getProductId() == " + availableDrivers.get(i).getDevice().getProductId());
@ -109,6 +116,7 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
public String setup_serial(Context c)
{
m_context = c;
int devicenum = 0;
UsbManager manager = (UsbManager) m_context.getSystemService(Context.USB_SERVICE);
List<UsbSerialDriver> availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager);
@ -123,10 +131,17 @@ public class USBSerialWrapper implements SerialInputOutputManagerTest.Listener {
System.out.println("USB device getProductName() == " + availableDrivers.get(i).getDevice().getProductName());
System.out.println("USB device getProductId() == " + availableDrivers.get(i).getDevice().getProductId());
System.out.println("USB device getVendorId() == " + availableDrivers.get(i).getDevice().getVendorId());
//if((availableDrivers.get(i).getDevice().getDeviceName()) == m_devicename){
if(m_devicename.equals(availableDrivers.get(i).getDevice().getDeviceName())){
devicenum = i;
System.out.println("Found device == " + devicenum);
}
}
}
UsbSerialDriver driver = availableDrivers.get(0);
UsbSerialDriver driver = availableDrivers.get(devicenum);
UsbDeviceConnection connection = manager.openDevice(driver.getDevice());
if (connection == null) {

4
androidserialport.cpp
View file

@ -80,7 +80,9 @@ int AndroidSerialPort::write(QByteArray data)
void AndroidSerialPort::setPortName(QString s)
{
qDebug() << "setPortName() == " << s;
QAndroidJniObject p = QAndroidJniObject::fromString(s);
jstring j = p.object<jstring>();
serialJavaObject.callMethod<void>("set_port_name", "(Ljava/lang/String;)V", j);
}
void AndroidSerialPort::setBaudRate(int br)

4
droidstar.cpp
View file

@ -290,12 +290,12 @@ void DroidStar::process_connect()
QString vocoder = "";
if( (m_vocoder != "Software vocoder") && (m_vocoder.contains(':')) ){
QStringList vl = m_vocoder.split(':');
vocoder = vl.at(0);
vocoder = vl.at(1);
}
QString modem = "";
if( (m_modem != "None") && (m_modem.contains(':')) ){
QStringList ml = m_modem.split(':');
modem = ml.at(0);
modem = ml.at(1);
}
const bool rxInvert = true;

4
serialambe.cpp
View file

@ -74,14 +74,14 @@ QMap<QString, QString> SerialAMBE::discover_devices()
fprintf(stderr, "%s", out.toStdString().c_str());fflush(stderr);
if(!serialPortInfo.isBusy()){
//devlist[serialPortInfo.systemLocation()] = serialPortInfo.portName() + " - " + serialPortInfo.manufacturer() + " " + serialPortInfo.description() + " - " + serialPortInfo.serialNumber();
devlist[serialPortInfo.systemLocation()] = serialPortInfo.systemLocation() + ":" + serialPortInfo.description();
devlist[serialPortInfo.systemLocation()] = serialPortInfo.description() + ":" + serialPortInfo.systemLocation();
}
}
}
#else
QStringList list = AndroidSerialPort::GetInstance().discover_devices();
for ( const auto& i : list ){
devlist[i] = i + ":" + i;
devlist[i] = i;
}
#endif
return devlist;