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

Added settings for FSK

master
sh123 2023-11-16 21:16:05 +02:00
rodzic 3a4438e80c
commit 561325757b
5 zmienionych plików z 212 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java
Wyświetl plik

@ -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);

1
codec2talkie/src/main/java/com/radio/codec2talkie/settings/PreferenceKeys.java
Wyświetl plik

@ -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";

80
codec2talkie/src/main/res/values/arrays.xml vendored
Wyświetl plik

@ -275,7 +275,76 @@
<item>/y</item>
</string-array>
<string-array name="radio_mod_entries">
<item>LoRa</item>
<item>FSK</item>
</string-array>
<string-array name="radio_mod_values">
<item>0</item>
<item>1</item>
</string-array>
<string-array name="fsk_rx_bw_entries">
<item>4800</item>
<item>5800</item>
<item>7300</item>
<item>9700</item>
<item>11700</item>
<item>14600</item>
<item>19500</item>
<item>23400</item>
<item>29300</item>
<item>39000</item>
<item>46900</item>
<item>58600</item>
<item>78200</item>
<item>93800</item>
<item>117300</item>
<item>156200</item>
<item>187200</item>
<item>234300</item>
<item>312000</item>
<item>373000</item>
<item>467000</item>
</string-array>
<string-array name="fsk_rx_bw_values">
<item>4800</item>
<item>5800</item>
<item>7300</item>
<item>9700</item>
<item>11700</item>
<item>14600</item>
<item>19500</item>
<item>23400</item>
<item>29300</item>
<item>39000</item>
<item>46900</item>
<item>58600</item>
<item>78200</item>
<item>93800</item>
<item>117300</item>
<item>156200</item>
<item>187200</item>
<item>234300</item>
<item>312000</item>
<item>373000</item>
<item>467000</item>
</string-array>
<string-array name="lora_power_entries">
<item>-9 dBm</item>
<item>-8 dBm</item>
<item>-7 dBm</item>
<item>-6 dBm</item>
<item>-5 dBm</item>
<item>-4 dBm</item>
<item>-3 dBm</item>
<item>-2 dBm</item>
<item>-1 dBm</item>
<item>0 dBm</item>
<item>1 dBm</item>
<item>2 dBm</item>
<item>3 dBm</item>
<item>4 dBm</item>
@ -300,6 +369,17 @@
</string-array>
<string-array name="lora_power_values">
<item>-9</item>
<item>-8</item>
<item>-7</item>
<item>-6</item>
<item>-5</item>
<item>-4</item>
<item>-3</item>
<item>-2</item>
<item>-1</item>
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>

23
codec2talkie/src/main/res/values/strings.xml vendored
Wyświetl plik

@ -54,11 +54,24 @@
<string name="kiss_extensions_enable_title">Enable extensions</string>
<string name="kiss_extensions_enable_summary">Enable radio control and signal level reports</string>
<string name="kiss_extensions_radio_mod_title">Select radio modulation type</string>
<string name="kiss_extensions_radio_control_title">Set radio parameters</string>
<string name="kiss_extensions_radio_control_summary">Set frequency, bandwidth and other radio parameters</string>
<string name="kiss_extensions_radio_category_lora_title">Set LoRa modulation parameters</string>
<string name="kiss_extensions_radio_category_fsk_title">Set FSK modulation parameters</string>
<string name="kiss_extensions_radio_category_other_title">Modem control</string>
<string name="kiss_extension_radio_split_freq_title">Split frequency operation</string>
<string name="kiss_extension_radio_split_freq_summary">Use separate frequencies for RX and TX</string>
<string name="kiss_extensions_radio_frequency_title">Frequency (Hz)</string>
<string name="kiss_extensions_radio_frequency_summary">Set radio frequency</string>
<string name="kiss_extensions_radio_frequency_summary">Set radio frequency for RX/TX or RX frequency when split operation is enabled</string>
<string name="kiss_extensions_radio_frequency_title_tx">Frequency TX (Hz)</string>
<string name="kiss_extensions_radio_frequency_summary_tx">Set transmit radio frequency</string>
<string name="kiss_extensions_radio_bandwidth_title">Bandwidth (Hz)</string>
<string name="kiss_extensions_radio_bandwidth_summary">Set radio bandwidth</string>
@ -78,6 +91,14 @@
<string name="kiss_extensions_radio_crc_title">Enable CRC check</string>
<string name="kiss_extensions_radio_crc_summary">Enable packet CRC check</string>
<string name="kiss_extension_radio_fsk_bit_rate_title">Bit rate (600–300000bps)</string>
<string name="kiss_extension_radio_fsk_bit_rate_summary">Set bit rate</string>
<string name="kiss_extension_radio_fsk_freq_dev_title">Set freq deviation (600–200000Hz)</string>
<string name="kiss_extension_radio_fsk_freq_dev_summary">Set freq deviation</string>
<string name="kiss_extension_radio_fsk_rx_bw_title">Set receive bandwidth (Hz)</string>
<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>

146
codec2talkie/src/main/res/xml/preferences_radio.xml vendored
Wyświetl plik

@ -13,14 +13,21 @@
app:defaultValue="433775000">
</EditTextPreference>
<ListPreference
app:key="kiss_extension_radio_bandwidth"
app:title="@string/kiss_extensions_radio_bandwidth_title"
app:entries="@array/lora_bandwidths"
app:entryValues="@array/lora_bandwidths"
app:defaultValue="125000"
app:summary="%s">
</ListPreference>
<SwitchPreference
app:key="kiss_extension_radio_split_freq"
app:title="@string/kiss_extension_radio_split_freq_title"
app:summary="@string/kiss_extension_radio_split_freq_summary"
app:defaultValue="false">
</SwitchPreference>
<EditTextPreference
app:key="kiss_extension_radio_frequency_tx"
app:title="@string/kiss_extensions_radio_frequency_title_tx"
app:useSimpleSummaryProvider="true"
app:summary="@string/kiss_extensions_radio_frequency_summary_tx"
app:dependency="kiss_extension_radio_split_freq"
app:defaultValue="433775000">
</EditTextPreference>
<ListPreference
app:key="kiss_extension_radio_power"
@ -32,43 +39,104 @@
</ListPreference>
<ListPreference
app:key="kiss_extension_radio_sf"
app:title="@string/kiss_extensions_radio_sf_title"
app:key="kiss_extension_radio_mod"
app:title="@string/kiss_extensions_radio_mod_title"
app:entries="@array/radio_mod_entries"
app:entryValues="@array/radio_mod_values"
app:summary="%s"
app:entries="@array/lora_spreading_factors"
app:entryValues="@array/lora_spreading_factors"
app:defaultValue="7">
app:defaultValue="0">
</ListPreference>
<ListPreference
app:key="kiss_extension_radio_cr"
app:title="@string/kiss_extensions_radio_cr_title"
app:summary="%s"
app:entries="@array/lora_coding_rates"
app:entryValues="@array/lora_coding_rates"
app:defaultValue="6">
</ListPreference>
<PreferenceCategory
app:key="kiss_extensions_radio_category_lora"
app:title="@string/kiss_extensions_radio_category_lora_title">
<EditTextPreference
app:key="kiss_extension_radio_sync"
app:title="@string/kiss_extensions_radio_sync_title"
app:summary="@string/kiss_extensions_radio_sync_summary"
app:useSimpleSummaryProvider="true"
app:defaultValue="34">
</EditTextPreference>
<ListPreference
app:key="kiss_extension_radio_bandwidth"
app:title="@string/kiss_extensions_radio_bandwidth_title"
app:entries="@array/lora_bandwidths"
app:entryValues="@array/lora_bandwidths"
app:defaultValue="125000"
app:summary="%s">
</ListPreference>
<CheckBoxPreference
app:key="kiss_extension_radio_crc"
app:title="@string/kiss_extensions_radio_crc_title"
app:summary="@string/kiss_extensions_radio_crc_summary"
app:defaultValue="true">
</CheckBoxPreference>
<ListPreference
app:key="kiss_extension_radio_sf"
app:title="@string/kiss_extensions_radio_sf_title"
app:summary="%s"
app:entries="@array/lora_spreading_factors"
app:entryValues="@array/lora_spreading_factors"
app:defaultValue="7">
</ListPreference>
<Preference
app:key="kiss_extension_reboot"
app:title="@string/kiss_extension_reboot_title"
app:summary="@string/kiss_extension_reboot_summary">
</Preference>
<ListPreference
app:key="kiss_extension_radio_cr"
app:title="@string/kiss_extensions_radio_cr_title"
app:summary="%s"
app:entries="@array/lora_coding_rates"
app:entryValues="@array/lora_coding_rates"
app:defaultValue="6">
</ListPreference>
<EditTextPreference
app:key="kiss_extension_radio_sync"
app:title="@string/kiss_extensions_radio_sync_title"
app:summary="@string/kiss_extensions_radio_sync_summary"
app:useSimpleSummaryProvider="true"
app:defaultValue="34">
</EditTextPreference>
<CheckBoxPreference
app:key="kiss_extension_radio_crc"
app:title="@string/kiss_extensions_radio_crc_title"
app:summary="@string/kiss_extensions_radio_crc_summary"
app:defaultValue="true">
</CheckBoxPreference>
</PreferenceCategory>
<PreferenceCategory
app:key="kiss_extensions_radio_category_fsk"
app:title="@string/kiss_extensions_radio_category_fsk_title">
<EditTextPreference
app:key="kiss_extension_radio_fsk_bit_rate"
app:title="@string/kiss_extension_radio_fsk_bit_rate_title"
app:useSimpleSummaryProvider="true"
app:summary="@string/kiss_extension_radio_fsk_bit_rate_summary"
app:defaultValue="4800">
</EditTextPreference>
<EditTextPreference
app:key="kiss_extension_radio_fsk_freq_dev"
app:title="@string/kiss_extension_radio_fsk_freq_dev_title"
app:useSimpleSummaryProvider="true"
app:summary="@string/kiss_extension_radio_fsk_freq_dev_summary"
app:defaultValue="1200">
</EditTextPreference>
<ListPreference
app:key="kiss_extension_radio_fsk_rx_bw"
app:title="@string/kiss_extension_radio_fsk_rx_bw_title"
app:entries="@array/fsk_rx_bw_entries"
app:entryValues="@array/fsk_rx_bw_values"
app:summary="%s"
app:defaultValue="9700">
</ListPreference>
</PreferenceCategory>
<PreferenceCategory
app:key="kiss_extensions_radio_category_other"
app:title="@string/kiss_extensions_radio_category_other_title">
<Preference
app:key="kiss_extension_reboot"
app:title="@string/kiss_extension_reboot_title"
app:summary="@string/kiss_extension_reboot_summary">
</Preference>
</PreferenceCategory>
</PreferenceCategory>
</PreferenceScreen>