Use dedicated trx type for flash light

sh123 · sh123 · commit c0e737fa68fd · 2025-03-21T12:16:40.000+02:00
diff --git a/codec2talkie/build.gradle b/codec2talkie/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.radio.codec2talkie"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 175
-        versionName "1.75"
+        versionCode 176
+        versionName "1.76"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java
@@ -292,8 +292,6 @@ private void startTransportConnection() {
     private final ActivityResultLauncher<Intent> _usbActivityLauncher = registerForActivityResult(
         new ActivityResultContracts.StartActivityForResult(),
         result -> {
-            Intent data = result.getData();
-            assert data != null;
             int resultCode = result.getResultCode();
             if (SettingsWrapper.isSoundModemEnabled(_sharedPreferences)) {
                 _isRigCtlUsbConnected = resultCode == RESULT_OK;
@@ -302,6 +300,8 @@ private void startTransportConnection() {
                 _textConnInfo.setText(R.string.main_status_loopback_test);
                 startAppService(TransportFactory.TransportType.LOOPBACK);
             } else if (resultCode == RESULT_OK) {
+                Intent data = result.getData();
+                assert data != null;
                 _textConnInfo.setText(data.getStringExtra("name"));
                 startAppService(TransportFactory.TransportType.USB);
             }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java b/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
@@ -35,7 +35,6 @@
 import com.radio.codec2talkie.storage.position.PositionItemRepository;
 import com.radio.codec2talkie.storage.station.StationItemRepository;
 import com.radio.codec2talkie.tools.AudioTools;
-import com.radio.codec2talkie.tools.FlashLight;
 import com.radio.codec2talkie.transport.Transport;
 import com.radio.codec2talkie.transport.TransportFactory;
 
@@ -50,9 +49,6 @@ public class AppWorker extends Thread {
     private static final int PROCESS_INTERVAL_MS = 10;
     private static final int LISTEN_AFTER_MS = 1500;
 
-    private static final int FLASHLIGHT_PTT_ON_DELAY_MS = 350;
-    private static final int FLASHLIGHT_PTT_OFF_DELAY_MS = 100;
-
     private boolean _needTransmission = false;
     private AppMessage _currentStatus = AppMessage.EV_DISCONNECTED;
 
@@ -80,9 +76,6 @@ public class AppWorker extends Thread {
     private final PositionItemRepository _positionItemRepository;
     private final StationItemRepository _stationItemRepository;
 
-    // flash light / torch
-    private final FlashLight _flashLight;
-
     private final Context _context;
     private final SharedPreferences _sharedPreferences;
 
@@ -101,8 +94,6 @@ public AppWorker(TransportFactory.TransportType transportType,
         _transport = TransportFactory.create(transportType, context);
         _protocol = ProtocolFactory.create(context);
 
-        _flashLight = new FlashLight(_context);
-
         _processPeriodicTimer = new Timer();
 
         int audioSource = Integer.parseInt(_sharedPreferences.getString(PreferenceKeys.APP_AUDIO_SOURCE, "6"));
@@ -442,13 +433,11 @@ private void onListening() {
         sendTxAudioLevelUpdate(null);
         sendRxRadioLevelUpdate(0, 0);
         sendStatusUpdate(AppMessage.EV_LISTENING, null);
-        flashLightOff();
     }
 
     private void processRecordPlaybackToggle() throws IOException {
         // playback -> recording
         if (_needTransmission && _systemAudioRecorder.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
-            flashLightOn();
             _systemAudioPlayer.stop();
             _systemAudioRecorder.startRecording();
             sendRxAudioLevelUpdate(null);
@@ -458,7 +447,6 @@ private void processRecordPlaybackToggle() throws IOException {
             _protocol.flush();
             _systemAudioRecorder.stop();
             sendTxAudioLevelUpdate(null);
-            flashLightOff();
         }
     }
 
@@ -488,28 +476,6 @@ private void cleanup() {
         Log.i(TAG, "cleanup() completed");
     }
 
-    private void flashLightOn() {
-        if (SettingsWrapper.isFlashLightPttEnabled(_sharedPreferences)) {
-            _flashLight.turnOn();
-            try {
-                sleep(FLASHLIGHT_PTT_ON_DELAY_MS);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void flashLightOff() {
-        if (SettingsWrapper.isFlashLightPttEnabled(_sharedPreferences)) {
-            try {
-                sleep(FLASHLIGHT_PTT_OFF_DELAY_MS);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            _flashLight.turnOff();
-        }
-    }
-
     private void processRxTx() throws IOException {
         processRecordPlaybackToggle();
 
@@ -545,7 +511,6 @@ private void onWorkerIncomingMessage(Message msg) {
                 quitProcessing();
                 break;
             case CMD_SEND_LOCATION_TO_TNC:
-                flashLightOn();
                 try {
                     _protocol.sendPosition((Position)msg.obj);
                 } catch (IOException e) {
@@ -554,7 +519,6 @@ private void onWorkerIncomingMessage(Message msg) {
                 }
                 break;
             case CMD_SEND_MESSAGE:
-                flashLightOn();
                 TextMessage textMessage = (TextMessage) msg.obj;
                 try {
                     _protocol.sendTextMessage(textMessage);
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/connect/UsbConnectActivity.java
@@ -197,6 +197,7 @@ public void run() {
         @Override
         public void handleMessage(Message msg) {
             String toastMsg;
+            Log.i(TAG, "usb state changed " + msg.what);
             if (msg.what == USB_CONNECTED) {
                 UsbPortHandler.setPort(_usbPort);
                 UsbPortHandler.setName(_usbDeviceName);
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/Disabled.java b/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/Disabled.java
@@ -6,7 +6,7 @@
 
 import java.io.IOException;
 
-public class Disabled implements RigCtl{
+public class Disabled implements RigCtl {
     @Override
     public void initialize(Transport transport, Context context, RigCtlCallback protocolCallback) throws IOException {
     }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/PhoneTorch.java b/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/PhoneTorch.java
@@ -0,0 +1,27 @@
+package com.radio.codec2talkie.rigctl;
+
+import android.content.Context;
+import com.radio.codec2talkie.tools.FlashLight;
+import com.radio.codec2talkie.transport.Transport;
+
+import java.io.IOException;
+
+public class PhoneTorch implements RigCtl {
+
+    private FlashLight _flashLight;
+
+    @Override
+    public void initialize(Transport transport, Context context, RigCtlCallback protocolCallback) throws IOException {
+        _flashLight = new FlashLight(context);
+    }
+
+    @Override
+    public void pttOn() {
+        _flashLight.turnOn();
+    }
+
+    @Override
+    public void pttOff() {
+        _flashLight.turnOff();
+    }
+}
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/RigCtlFactory.java b/codec2talkie/src/main/java/com/radio/codec2talkie/rigctl/RigCtlFactory.java
@@ -13,12 +13,13 @@ public class RigCtlFactory {
     private static final String TAG = RigCtlFactory.class.getSimpleName();
 
     public static final String RIG_DISABLED = "Disabled";
+    public static final String RIG_PHONE_TORCH = "PhoneTorch";
 
     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, RIG_DISABLED);
+        if (UsbPortHandler.getPort() == null && !rigName.equals(RIG_PHONE_TORCH))
+            return new Disabled();
         try {
             Class<?> loadClass = Class.forName(String.format("com.radio.codec2talkie.rigctl.%s", rigName));
             Log.i(TAG, "Using rig " + rigName);
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java
@@ -72,7 +72,6 @@ public final class PreferenceKeys {
     public static String KISS_EXTENSIONS_ACTION_REBOOT_REQUESTED = "com.radio.codec2talkie.MODEM_REBOOT";
 
     public static String APP_VOLUME_PTT = "app_volume_ptt";
-    public static String APP_FLASHLIGHT_PTT = "app_flashlight_ptt";
     public static String APP_KEEP_SCREEN_ON = "app_keep_screen_on";
     public static String APP_NO_LOCK = "app_no_lock";
     public static String APP_TURN_SCREEN_ON = "app_turn_screen_on";
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java
@@ -8,8 +8,8 @@
 public class SettingsWrapper {
 
     public static boolean isSoundModemRigDisabled(SharedPreferences sharedPreferences) {
-        return sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG,
-                RigCtlFactory.RIG_DISABLED).equals(RigCtlFactory.RIG_DISABLED);
+        String rigTypeName = sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG, RigCtlFactory.RIG_DISABLED);
+        return rigTypeName.equals(RigCtlFactory.RIG_DISABLED) || rigTypeName.equals(RigCtlFactory.RIG_PHONE_TORCH);
     }
 
     public static boolean isSoundModemEnabled(SharedPreferences sharedPreferences) {
@@ -108,8 +108,4 @@ public static boolean isTextPacketsEnabled(SharedPreferences sharedPreferences)
     public static boolean isAprsIsEnabled(SharedPreferences sharedPreferences) {
         return sharedPreferences.getBoolean(PreferenceKeys.APRS_IS_ENABLE, false);
     }
-
-    public static boolean isFlashLightPttEnabled(SharedPreferences sharedPreferences) {
-        return sharedPreferences.getBoolean(PreferenceKeys.APP_FLASHLIGHT_PTT, false);
-    }
 }
diff --git a/codec2talkie/src/main/res/values/arrays.xml b/codec2talkie/src/main/res/values/arrays.xml
@@ -481,6 +481,7 @@
 
     <string-array name="ports_sound_modem_rig_entries">
         <item>Do not use rig control</item>
+        <item>Use phone torch</item>
         <item>FT-817/818/MCHF</item>
         <item>IC-7000</item>
         <item>IC-7100</item>
@@ -490,6 +491,7 @@
 
     <string-array name="ports_sound_modem_rig_values">
         <item>Disabled</item>
+        <item>PhoneTorch</item>
         <item>Ft817</item>
         <item>Ic7000</item>
         <item>Ic7100</item>
diff --git a/codec2talkie/src/main/res/values/strings.xml b/codec2talkie/src/main/res/values/strings.xml
@@ -113,9 +113,6 @@
     <string name="app_volume_ptt_title">Use volume keys for PTT</string>
     <string name="app_volume_ptt_summary">Volume up/down keys will be used for PTT</string>
 
-    <string name="app_flashlight_ptt_title">Turn ON/OFF phone torch on PTT</string>
-    <string name="app_flashlight_ptt_summary">Will turn ON/OFF phone torch when PTT to control old transceiver by opto-coupling</string>
-
     <string name="app_category_title">Application Settings</string>
 
     <string name="app_keep_screen_on_title">Keep screen ON</string>
diff --git a/codec2talkie/src/main/res/xml/preferences.xml b/codec2talkie/src/main/res/xml/preferences.xml
@@ -37,13 +37,6 @@
             app:defaultValue="false">
         </SwitchPreference>
 
-        <SwitchPreference
-            app:key="app_flashlight_ptt"
-            app:title="@string/app_flashlight_ptt_title"
-            app:summary="@string/app_flashlight_ptt_summary"
-            app:defaultValue="false">
-        </SwitchPreference>
-
         <SwitchPreference
             app:key="app_no_lock"
             app:title="@string/app_no_lock_title"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`import java.io.IOException;`
`8`	`8`
`9`		`-public class Disabled implements RigCtl{`
	`9`	`+public class Disabled implements RigCtl {`
`10`	`10`	`@Override`
`11`	`11`	`public void initialize(Transport transport, Context context, RigCtlCallback protocolCallback) throws IOException {`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`public class SettingsWrapper {`
`9`	`9`
`10`	`10`	`public static boolean isSoundModemRigDisabled(SharedPreferences sharedPreferences) {`
`11`		`- return sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG,`
`12`		`- RigCtlFactory.RIG_DISABLED).equals(RigCtlFactory.RIG_DISABLED);`
	`11`	`+ String rigTypeName = sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG, RigCtlFactory.RIG_DISABLED);`
	`12`	`+ return rigTypeName.equals(RigCtlFactory.RIG_DISABLED) \|\| rigTypeName.equals(RigCtlFactory.RIG_PHONE_TORCH);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public static boolean isSoundModemEnabled(SharedPreferences sharedPreferences) {`
`@@ -108,8 +108,4 @@ public static boolean isTextPacketsEnabled(SharedPreferences sharedPreferences)`
`108`	`108`	`public static boolean isAprsIsEnabled(SharedPreferences sharedPreferences) {`
`109`	`109`	`return sharedPreferences.getBoolean(PreferenceKeys.APRS_IS_ENABLE, false);`
`110`	`110`	`}`
`111`		`-`
`112`		`- public static boolean isFlashLightPttEnabled(SharedPreferences sharedPreferences) {`
`113`		`- return sharedPreferences.getBoolean(PreferenceKeys.APP_FLASHLIGHT_PTT, false);`
`114`		`- }`
`115`	`111`	`}`