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

Zero out GPS location if there is no GPS fix. Add option to repeat transmission of each mode.

pull/11/head
Mikael Nousiainen 2021-11-30 17:42:51 +02:00
rodzic 81013ecf75
commit 9092c1a1b3
4 zmienionych plików z 55 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
src/config.h
Wyświetl plik

@ -53,9 +53,13 @@
// Which modes to transmit using the built-in Si4032 transmitter chip
#define RADIO_SI4032_TX_CW true
#define RADIO_SI4032_TX_CW_COUNT 1
#define RADIO_SI4032_TX_APRS true
#define RADIO_SI4032_TX_APRS_COUNT 2
#define RADIO_SI4032_TX_HORUS_V1 false
#define RADIO_SI4032_TX_HORUS_V1_COUNT 1
#define RADIO_SI4032_TX_HORUS_V2 true
#define RADIO_SI4032_TX_HORUS_V2_COUNT 6
// Continuous transmit mode can be enabled for *either* Horus V1 or V2, but not both. This disables all other transmission modes.
// The continuous mode transmits Horus 4FSK preamble between transmissions
@ -80,14 +84,23 @@
// Which modes to transmit using an externally connected Si5351 chip in the I²C bus
#define RADIO_SI5351_TX_CW true
#define RADIO_SI5351_TX_CW_COUNT 1
#define RADIO_SI5351_TX_HORUS_V1 false
#define RADIO_SI5351_TX_HORUS_V1_COUNT 1
#define RADIO_SI5351_TX_HORUS_V2 true
#define RADIO_SI5351_TX_HORUS_V2_COUNT 4
#define RADIO_SI5351_TX_JT9 false
#define RADIO_SI5351_TX_JT9_COUNT 1
#define RADIO_SI5351_TX_JT65 false
#define RADIO_SI5351_TX_JT65_COUNT 1
#define RADIO_SI5351_TX_JT4 false
#define RADIO_SI5351_TX_JT4_COUNT 1
#define RADIO_SI5351_TX_WSPR false
#define RADIO_SI5351_TX_WSPR_COUNT 1
#define RADIO_SI5351_TX_FSQ false
#define RADIO_SI5351_TX_FSQ_COUNT 1
#define RADIO_SI5351_TX_FT8 false
#define RADIO_SI5351_TX_FT8_COUNT 1
// Transmit frequencies for the Si5351 transmitter modes
#define RADIO_SI5351_TX_FREQUENCY_CW 3595000UL

24
src/radio.c
Wyświetl plik

@ -79,6 +79,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI4032_TX_CW,
.radio_type = RADIO_TYPE_SI4032,
.data_mode = RADIO_DATA_MODE_CW,
.transmit_count = RADIO_SI4032_TX_CW_COUNT,
.time_sync_seconds = CW_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = CW_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI4032_TX_FREQUENCY_CW,
@ -91,6 +92,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI4032_TX_APRS,
.radio_type = RADIO_TYPE_SI4032,
.data_mode = RADIO_DATA_MODE_APRS_1200,
.transmit_count = RADIO_SI4032_TX_APRS_COUNT,
.time_sync_seconds = APRS_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = APRS_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI4032_TX_FREQUENCY_APRS_1200,
@ -107,6 +109,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI4032_TX_HORUS_V1,
.radio_type = RADIO_TYPE_SI4032,
.data_mode = RADIO_DATA_MODE_HORUS_V1,
.transmit_count = RADIO_SI4032_TX_HORUS_V1_COUNT,
.time_sync_seconds = HORUS_V1_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = HORUS_V1_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI4032_TX_FREQUENCY_HORUS_V1,
@ -119,6 +122,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI4032_TX_HORUS_V2,
.radio_type = RADIO_TYPE_SI4032,
.data_mode = RADIO_DATA_MODE_HORUS_V2,
.transmit_count = RADIO_SI4032_TX_HORUS_V2_COUNT,
.time_sync_seconds = HORUS_V2_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = HORUS_V2_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI4032_TX_FREQUENCY_HORUS_V2,
@ -133,6 +137,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_CW,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_CW,
.transmit_count = RADIO_SI5351_TX_CW_COUNT,
.time_sync_seconds = CW_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = CW_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_CW,
@ -147,6 +152,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_HORUS_V1,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_HORUS_V1,
.transmit_count = RADIO_SI5351_TX_HORUS_V1_COUNT,
.time_sync_seconds = HORUS_V1_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = HORUS_V1_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_HORUS_V1,
@ -161,6 +167,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_HORUS_V2,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_HORUS_V2,
.transmit_count = RADIO_SI5351_TX_HORUS_V2_COUNT,
.time_sync_seconds = HORUS_V2_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = HORUS_V2_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_HORUS_V2,
@ -174,9 +181,10 @@ radio_transmit_entry radio_transmit_schedule[] = {
{
.enabled = RADIO_SI5351_TX_WSPR,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_WSPR,
.transmit_count = RADIO_SI5351_TX_WSPR_COUNT,
.time_sync_seconds = WSPR_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = WSPR_TIME_SYNC_OFFSET_SECONDS,
.data_mode = RADIO_DATA_MODE_WSPR,
.frequency = RADIO_SI5351_TX_FREQUENCY_WSPR,
.tx_power = RADIO_SI5351_TX_POWER,
.payload_encoder = &radio_wspr_payload_encoder,
@ -188,6 +196,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_FT8,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_FT8,
.transmit_count = RADIO_SI5351_TX_FT8_COUNT,
.time_sync_seconds = FT8_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = FT8_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_FT8,
@ -201,6 +210,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_JT9,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_JT9,
.transmit_count = RADIO_SI5351_TX_JT9_COUNT,
.time_sync_seconds = JT9_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = JT9_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_JT9,
@ -214,6 +224,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_JT4,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_JT4,
.transmit_count = RADIO_SI5351_TX_JT4_COUNT,
.time_sync_seconds = JT4_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = JT4_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_JT4,
@ -227,6 +238,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_JT65,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = RADIO_DATA_MODE_JT65,
.transmit_count = RADIO_SI5351_TX_JT65_COUNT,
.time_sync_seconds = JT65_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = JT65_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_JT65,
@ -240,6 +252,7 @@ radio_transmit_entry radio_transmit_schedule[] = {
.enabled = RADIO_SI5351_TX_FSQ,
.radio_type = RADIO_TYPE_SI5351,
.data_mode = FSQ_SUBMODE,
.transmit_count = RADIO_SI5351_TX_FSQ_COUNT,
.time_sync_seconds = FSQ_TIME_SYNC_SECONDS,
.time_sync_seconds_offset = FSQ_TIME_SYNC_OFFSET_SECONDS,
.frequency = RADIO_SI5351_TX_FREQUENCY_FSQ,
@ -593,10 +606,16 @@ static void radio_next_transmit_entry()
radio_current_transmit_entry->current_message_index =
(radio_current_transmit_entry->current_message_index + 1) % radio_current_transmit_entry->message_count;
radio_current_transmit_entry->current_transmit_index =
(radio_current_transmit_entry->current_transmit_index + 1) % radio_current_transmit_entry->transmit_count;
// Proceed to next transmit entry when transmit counter wraps
if (radio_current_transmit_entry->current_transmit_index == 0) {
do {
radio_current_transmit_entry_index = (radio_current_transmit_entry_index + 1) % radio_transmit_entry_count;
radio_current_transmit_entry = &radio_transmit_schedule[radio_current_transmit_entry_index];
} while (!radio_current_transmit_entry->enabled);
}
radio_reset_transmit_delay_counter();
}
@ -824,6 +843,9 @@ void radio_init()
if (entry->messages != NULL) {
for (entry->message_count = 0; entry->messages[entry->message_count] != NULL; entry->message_count++);
}
if (entry->transmit_count == 0) {
entry->transmit_count = 1;
}
}
radio_current_transmit_entry = &radio_transmit_schedule[radio_current_transmit_entry_index];

3
src/radio_internal.h
Wyświetl plik

@ -47,6 +47,9 @@ typedef struct _radio_transmit_entry {
uint8_t current_message_index;
uint8_t message_count;
uint8_t current_transmit_index;
uint8_t transmit_count;
payload_encoder *payload_encoder;
fsk_encoder_api *fsk_encoder_api;

12
src/telemetry.c
Wyświetl plik

@ -17,6 +17,18 @@ void telemetry_collect(telemetry_data *data)
}
ubxg6010_get_current_gps_data(&data->gps);
// Zero out position data if we don't have a valid GPS fix.
// This is done to avoid transmitting invalid position information.
if (!(data->gps.fix_ok) || data->gps.fix == 0) {
data->gps.latitude_degrees_1000000 = 0;
data->gps.longitude_degrees_1000000 = 0;
data->gps.altitude_mm = 0;
data->gps.ground_speed_cm_per_second = 0;
data->gps.heading_degrees_100000 = 0;
data->gps.climb_cm_per_second = 0;
}
locator_from_lonlat(data->gps.longitude_degrees_1000000, data->gps.latitude_degrees_1000000,
LOCATOR_PAIR_COUNT_FULL, data->locator);
}