Add clock function to call interface

Implementations will have a clock to play tones, if no clock is
available from a transceiver.
This commit is contained in:
Andreas Eversberg 2020-01-12 07:54:25 +01:00
parent 0cfcf67157
commit f132059edf
15 changed files with 45 additions and 28 deletions

View File

@ -1076,6 +1076,8 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
/* Timeout handling */
void transaction_timeout(struct timer *timer)
{

View File

@ -540,5 +540,7 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
void dump_info(void) {}

View File

@ -862,5 +862,7 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
void dump_info(void) {}

View File

@ -560,6 +560,8 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
int call_down_setup(int callref, const char __attribute__((unused)) *caller_id, enum number_type __attribute__((unused)) caller_type, const char *dialing)
{
sender_t *sender;

View File

@ -265,13 +265,6 @@ void sender_receive(sender_t *sender, sample_t *samples, int length, double __at
if (euro->rx)
tone_decode(euro, down, count);
/* whenever a chunk of anouncement audio should be played toward caller */
euro->chunk_count += count;
if (euro->chunk_count >= 160) {
euro->chunk_count -= 160;
euro_clock_chunk(sender);
}
}
/* Generate tone of paging digits. */

View File

@ -525,13 +525,13 @@ static void call_play_beep(euro_call_t *call)
}
/* loop through all calls and play the announcement */
void euro_clock_chunk(sender_t *sender)
void call_down_clock(void)
{
sender_t *sender;
euro_t *euro;
euro_call_t *call;
if (sender == sender_head) {
/* use first tranceiver clock to clock calls without a transceiver */
/* clock all calls without a transceiver */
for (call = ooo_call_list; call; call = call->next) {
/* no callref */
if (!call->callref)
@ -542,7 +542,9 @@ void euro_clock_chunk(sender_t *sender)
else
call_play_announcement(call);
}
}
/* clock all calls that have a transceiver */
for (sender = sender_head; sender; sender = sender->next) {
euro = (euro_t *) sender;
for (call = euro->call_list; call; call = call->next) {
/* no callref */
@ -552,6 +554,7 @@ void euro_clock_chunk(sender_t *sender)
call_play_announcement(call);
}
}
}
/* Timeout handling */
static void call_timeout(struct timer *timer)

View File

@ -67,7 +67,6 @@ typedef struct eurosignal {
double tx_time; /* current elapsed time of tone */
char tx_digits[7]; /* current ID beeing transmitted */
int tx_digit_index; /* current digit beein transmitted */
int chunk_count; /* current elapsed sample of 20ms audio chunk */
fm_demod_t rx_demod; /* demodulator for frequency */
iir_filter_t rx_lp; /* low pass to filter the frequency result */
int rx_digit_count; /* count the tone until detected */
@ -87,5 +86,4 @@ int euro_create(const char *kanal, const char *audiodev, int use_sdr, int sample
void euro_destroy(sender_t *sender);
void euro_get_id(euro_t *euro, char *id);
void euro_receive_id(euro_t *euro, char *id);
void euro_clock_chunk(sender_t *sender);

View File

@ -1322,5 +1322,7 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
void dump_info(void) {}

View File

@ -632,5 +632,7 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
void dump_info(void) {}

View File

@ -586,6 +586,8 @@ void call_clock(void)
uint8_t buf[sizeof(struct gsm_data_frame) + 160 * sizeof(int16_t)];
struct gsm_data_frame *data = (struct gsm_data_frame *)buf;
call_down_clock();
while(process) {
if (process->pattern != PATTERN_NONE) {
data->msg_type = ANALOG_8000HZ;

View File

@ -36,5 +36,6 @@ void call_up_audio(int callref, sample_t *samples, int count);
void call_down_audio(int callref, sample_t *samples, int count);
/* clock to transmit to */
void call_clock(void);
void call_clock(void); /* from main loop */
void call_down_clock(void); /* towards mobile implementation */

View File

@ -1905,6 +1905,8 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
/*
* SMS layer messages
*/

View File

@ -1582,5 +1582,7 @@ void call_down_audio(int callref, sample_t *samples, int count)
}
}
void call_down_clock(void) {}
void dump_info(void) {}

View File

@ -253,5 +253,7 @@ int main(void)
return 0;
}
void call_down_clock(void) {}
void print_image(void) {}

View File

@ -162,5 +162,7 @@ int main(void)
return 0;
}
void call_down_clock(void) {}
void print_image(void) {}