mirror
/
codec2_talkie
kopia lustrzana https://github.com/sh123/codec2_talkie
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Rig control usb connect

legacy
sh123 2022-08-06 00:37:13 +03:00
rodzic 714593ec7a
commit bd3064e20c
2 zmienionych plików z 12 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java
Wyświetl plik

@ -262,7 +262,11 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
break;
case "sound_modem":
_textConnInfo.setText(R.string.main_status_sound_modem);
startAppService(TransportFactory.TransportType.SOUND_MODEM);
String rig = _sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG, "Disabled");
if (rig.equals("Disabled"))
startAppService(TransportFactory.TransportType.SOUND_MODEM);
else
startUsbConnectActivity();
break;
case "tcp_ip":
startTcpIpConnectActivity();
@ -284,7 +288,10 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
Intent data = result.getData();
assert data != null;
int resultCode = result.getResultCode();
if (resultCode == RESULT_CANCELED) {
String transportType = _sharedPreferences.getString(PreferenceKeys.PORTS_TYPE, "loopback");
if (transportType.equals("sound_modem")) {
startAppService(TransportFactory.TransportType.SOUND_MODEM);
} else if (resultCode == RESULT_CANCELED) {
_textConnInfo.setText(R.string.main_status_loopback_test);
startAppService(TransportFactory.TransportType.LOOPBACK);
} else if (resultCode == RESULT_OK) {

3
codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/RigCtlFactory.java
Wyświetl plik

@ -6,12 +6,15 @@ import android.util.Log;
import androidx.preference.PreferenceManager;
import com.radio.codec2talkie.connect.UsbPortHandler;
import com.radio.codec2talkie.settings.PreferenceKeys;
public class RigCtlFactory {
private static final String TAG = RigCtlFactory.class.getSimpleName();
public static RigCtl create(Context context) {
if (UsbPortHandler.getPort() == null)
return new Disabled();
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
String rigName = sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG, "Disabled");
try {