mirror
/
pico-tracker
kopia lustrzana https://github.com/bristol-seds/pico-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed RSID skipping last tone, turn on radio one tone early for first tone

geofence_dev
Richard Meadows 2015-03-16 00:09:24 +00:00
rodzic eebed918e9
commit 86c6b2cf0e
2 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
firmware/src/rsid.c
Wyświetl plik

@ -165,9 +165,7 @@ uint8_t rsid_tick(void)
rsid_tone(rsid[rsid_index]); rsid_tone(rsid[rsid_index]);
rsid_index++; rsid_index++;
if (rsid_index < RSID_NSYMBOLS) { return 1;
return 1;
}
} }
return 0; return 0;

10
firmware/src/telemetry.c
Wyświetl plik

@ -254,15 +254,17 @@ void telemetry_tick(void) {
if (!radio_on) { if (!radio_on) {
/* RSID: We PWM frequencies with the external pin */ /* RSID: We PWM frequencies with the external pin */
si_trx_on(SI_MODEM_MOD_TYPE_2FSK, 1);
telemetry_gpio1_pwm_init(); telemetry_gpio1_pwm_init();
si_trx_on(SI_MODEM_MOD_TYPE_2FSK, 1);
radio_on = 1; radio_on = 1;
return;
} }
/* Do Tx */ /* Do Tx */
if (!rsid_tick()) { if (!rsid_tick()) {
/* Force transmission finished */ /* Transmission finished */
telemetry_index++; telemetry_index++;
si_trx_off(); radio_on = 0; si_trx_off(); radio_on = 0;
telemetry_gpio1_pwm_deinit(); telemetry_gpio1_pwm_deinit();
@ -302,14 +304,14 @@ void telemetry_tick(void) {
float timer0_tick_init(float frequency) float timer0_tick_init(float frequency)
{ {
/* Calculate the wrap value for the given frequency */ /* Calculate the wrap value for the given frequency */
float gclk_frequency = (float)system_gclk_chan_get_hz(0); float gclk_frequency = (float)system_gclk_gen_get_hz(1);
uint32_t count = (uint32_t)(gclk_frequency / frequency); uint32_t count = (uint32_t)(gclk_frequency / frequency);
/* Configure Timer 0 */ /* Configure Timer 0 */
bool t0_capture_channel_enables[] = {false, false}; bool t0_capture_channel_enables[] = {false, false};
uint32_t t0_compare_channel_values[] = {count, 0x0000}; uint32_t t0_compare_channel_values[] = {count, 0x0000};
tc_init(TC0, tc_init(TC0,
GCLK_GENERATOR_0, GCLK_GENERATOR_1,
TC_COUNTER_SIZE_32BIT, TC_COUNTER_SIZE_32BIT,
TC_CLOCK_PRESCALER_DIV1, TC_CLOCK_PRESCALER_DIV1,
TC_WAVE_GENERATION_MATCH_FREQ, TC_WAVE_GENERATION_MATCH_FREQ,