diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java index 1196ada..a231802 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java @@ -172,6 +172,7 @@ public class Kiss implements Protocol { */ String freq = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FREQUENCY, "433775000"); String freqTx = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FREQUENCY_TX, "433775000"); + if (_sharedPreferences.getBoolean(PreferenceKeys.KISS_EXTENSIONS_RADIO_SPLIT_FREQ, false)) freqTx = freq; String modType = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_MOD, "0"); String bw = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_BANDWIDTH, "125000"); String sf = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_SF, "7"); @@ -181,7 +182,7 @@ public class Kiss implements Protocol { byte crc = (byte)(_sharedPreferences.getBoolean(PreferenceKeys.KISS_EXTENSIONS_RADIO_CRC, true) ? 1 : 0); String fskBitRate = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FSK_BIT_RATE, "4800"); String fskFreqDev = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FSK_FREQ_DEV, "1200"); - String fskRxBw = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FSK_FREQ_DEV, "9700"); + String fskRxBw = _sharedPreferences.getString(PreferenceKeys.KISS_EXTENSIONS_RADIO_FSK_RX_BW, "9700"); ByteBuffer rawBuffer = ByteBuffer.allocate(KISS_RADIO_CONTROL_COMMAND_SIZE); diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java index e8c2c45..f2bf3cf 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java @@ -48,6 +48,7 @@ public final class PreferenceKeys { public static String KISS_EXTENSIONS_ENABLED = "kiss_extensions_enable"; public static String KISS_EXTENSIONS_RADIO_MOD = "kiss_extension_radio_mod"; + public static String KISS_EXTENSIONS_RADIO_SPLIT_FREQ = "kiss_extension_radio_split_freq"; public static String KISS_EXTENSIONS_RADIO_FREQUENCY = "kiss_extension_radio_frequency"; public static String KISS_EXTENSIONS_RADIO_FREQUENCY_TX = "kiss_extension_radio_frequency_tx"; public static String KISS_EXTENSIONS_RADIO_BANDWIDTH = "kiss_extension_radio_bandwidth"; diff --git a/codec2talkie/src/main/res/values/arrays.xml b/codec2talkie/src/main/res/values/arrays.xml index e4cd5e7..358e655 100644 --- a/codec2talkie/src/main/res/values/arrays.xml +++ b/codec2talkie/src/main/res/values/arrays.xml @@ -275,7 +275,76 @@ /y + + LoRa + FSK + + + + 0 + 1 + + + + 4800 + 5800 + 7300 + 9700 + 11700 + 14600 + 19500 + 23400 + 29300 + 39000 + 46900 + 58600 + 78200 + 93800 + 117300 + 156200 + 187200 + 234300 + 312000 + 373000 + 467000 + + + + 4800 + 5800 + 7300 + 9700 + 11700 + 14600 + 19500 + 23400 + 29300 + 39000 + 46900 + 58600 + 78200 + 93800 + 117300 + 156200 + 187200 + 234300 + 312000 + 373000 + 467000 + + + -9 dBm + -8 dBm + -7 dBm + -6 dBm + -5 dBm + -4 dBm + -3 dBm + -2 dBm + -1 dBm + 0 dBm + 1 dBm 2 dBm 3 dBm 4 dBm @@ -300,6 +369,17 @@ + -9 + -8 + -7 + -6 + -5 + -4 + -3 + -2 + -1 + 0 + 1 2 3 4 diff --git a/codec2talkie/src/main/res/values/strings.xml b/codec2talkie/src/main/res/values/strings.xml index b464838..3ada0c4 100644 --- a/codec2talkie/src/main/res/values/strings.xml +++ b/codec2talkie/src/main/res/values/strings.xml @@ -54,11 +54,24 @@ Enable extensions Enable radio control and signal level reports + Select radio modulation type + Set radio parameters Set frequency, bandwidth and other radio parameters + Set LoRa modulation parameters + Set FSK modulation parameters + + Modem control + + Split frequency operation + Use separate frequencies for RX and TX + Frequency (Hz) - Set radio frequency + Set radio frequency for RX/TX or RX frequency when split operation is enabled + + Frequency TX (Hz) + Set transmit radio frequency Bandwidth (Hz) Set radio bandwidth @@ -78,6 +91,14 @@ Enable CRC check Enable packet CRC check + Bit rate (600–300000bps) + Set bit rate + + Set freq deviation (600–200000Hz) + Set freq deviation + + Set receive bandwidth (Hz) + Use volume keys for PTT Volume up/down keys will be used for PTT diff --git a/codec2talkie/src/main/res/xml/preferences_radio.xml b/codec2talkie/src/main/res/xml/preferences_radio.xml index 6ed138f..956fa42 100644 --- a/codec2talkie/src/main/res/xml/preferences_radio.xml +++ b/codec2talkie/src/main/res/xml/preferences_radio.xml @@ -13,14 +13,21 @@ app:defaultValue="433775000"> - - + + + + + + app:defaultValue="0"> - - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file