williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typos: acknowledgement -> acknowledgment signalling -> signaling

Browse Source
This commit is contained in:
Andreas Eversberg
2016-07-24 10:26:01 +02:00
parent c273bbc5ff
commit 6a5af9aeac
18 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/amps/amps.c
View File

@@ -510,21 +510,21 @@ static void amps_release(transaction_t *trans, uint8_t cause)
}
/*
* receive signalling
* receive signaling
*/
void amps_rx_signalling_tone(amps_t *amps, int tone, double quality)
void amps_rx_signaling_tone(amps_t *amps, int tone, double quality)
{
transaction_t *trans = amps->trans_list;
if (trans == NULL) {
PDEBUG(DAMPS, DEBUG_ERROR, "Signalling Tone without transaction, please fix!\n");
PDEBUG(DAMPS, DEBUG_ERROR, "Signaling Tone without transaction, please fix!\n");
return;
}
if (tone)
PDEBUG(DAMPS, DEBUG_INFO, "Detected Signalling Tone with quality=%.0f.\n", quality * 100.0);
PDEBUG(DAMPS, DEBUG_INFO, "Detected Signaling Tone with quality=%.0f.\n", quality * 100.0);
else
PDEBUG(DAMPS, DEBUG_INFO, "Lost Signalling Tone signal\n");
PDEBUG(DAMPS, DEBUG_INFO, "Lost Signaling Tone signal\n");
switch (trans->state) {
case TRANS_CALL:
@@ -559,7 +559,7 @@ void amps_rx_signalling_tone(amps_t *amps, int tone, double quality)
}
break;
default:
PDEBUG(DAMPS, DEBUG_ERROR, "Signalling Tone without active call, please fix!\n");
PDEBUG(DAMPS, DEBUG_ERROR, "Signaling Tone without active call, please fix!\n");
}
}
@@ -625,7 +625,7 @@ void amps_rx_recc(amps_t *amps, uint8_t scm, uint32_t esn, uint32_t min1, uint16
transaction_t *trans;
const char *callerid = amps_min2number(min1, min2);
/* check if we are busy, so we ignore all signalling */
/* check if we are busy, so we ignore all signaling */
if (amps->state == STATE_BUSY) {
PDEBUG(DAMPS, DEBUG_NOTICE, "Ignoring RECC messages from phone while using this channel for voice.\n");
return;

2
src/amps/amps.h
View File

@@ -160,7 +160,7 @@ const char *amps_min2number(uint32_t min1, uint16_t min2);
const char *amps_scm(uint8_t scm);
int amps_create(int channel, enum amps_chan_type chan_type, const char *sounddev, int samplerate, int cross_channels, double rx_gain, int pre_emphasis, int de_emphasis, const char *write_wave, const char *read_wave, amps_si *si, uint16_t sid, uint8_t sat, int polarity, int loopback);
void amps_destroy(sender_t *sender);
void amps_rx_signalling_tone(amps_t *amps, int tone, double quality);
void amps_rx_signaling_tone(amps_t *amps, int tone, double quality);
void amps_rx_sat(amps_t *amps, int tone, double quality);
void amps_rx_recc(amps_t *amps, uint8_t scm, uint32_t esn, uint32_t min1, uint16_t min2, uint8_t msg_type, uint8_t ordq, uint8_t order, const char *dialing);
transaction_t *amps_tx_frame_focc(amps_t *amps);

24
src/amps/dsp.c
View File

@@ -78,14 +78,14 @@
#define COMPANDOR_0DB 45000 /* works quite well */
#define BITRATE 10000
#define SIG_TONE_CROSSINGS 2000 /* 2000 crossings are 100ms @ 10 KHz */
#define SIG_TONE_MINBITS 950 /* minimum bit durations to detect signalling tone (1000 is perfect for 100 ms) */
#define SIG_TONE_MINBITS 950 /* minimum bit durations to detect signaling tone (1000 is perfect for 100 ms) */
#define SIG_TONE_MAXBITS 1050 /* as above, maximum bits */
#define SAT_DURATION 0.100 /* duration of SAT signal measurement */
#define SAT_QUALITY 0.85 /* quality needed to detect sat */
#define SAT_DETECT_COUNT 3 /* number of measures to detect SAT signal (specs say 250ms) */
#define SAT_LOST_COUNT 3 /* number of measures to loose SAT signal (specs say 250ms) */
#define SIG_DETECT_COUNT 3 /* number of measures to detect Signalling Tone */
#define SIG_LOST_COUNT 2 /* number of measures to loose Signalling Tone */
#define SIG_DETECT_COUNT 3 /* number of measures to detect Signaling Tone */
#define SIG_LOST_COUNT 2 /* number of measures to loose Signaling Tone */
#define CUT_OFF_HIGHPASS 300.0 /* cut off frequency for high pass filter to remove dc level from sound card / sample */
#define BEST_QUALITY 0.68 /* Best possible RX quality */
@@ -96,7 +96,7 @@ static double sat_freq[5] = {
6000.0,
6030.0,
5800.0, /* noise level to check against */
10000.0, /* signalling tone */
10000.0, /* signaling tone */
};
static int dsp_sine_sat[256];
@@ -652,7 +652,7 @@ void sender_receive_frame(amps_t *amps, int16_t *samples, int length)
}
/* decode signalling tone */
/* decode signaling tone */
/* compare supervisory signal against noise floor on 5800 Hz */
static void sat_decode(amps_t *amps, int16_t *samples, int length)
{
@@ -661,7 +661,7 @@ static void sat_decode(amps_t *amps, int16_t *samples, int length)
coeff[0] = amps->sat_coeff[amps->sat];
coeff[1] = amps->sat_coeff[3]; /* noise floor detection */
coeff[2] = amps->sat_coeff[4]; /* signalling tone */
coeff[2] = amps->sat_coeff[4]; /* signaling tone */
audio_goertzel(samples, length, 0, coeff, result, 3);
quality[0] = (result[0] - result[1]) / result[0];
@@ -673,7 +673,7 @@ static void sat_decode(amps_t *amps, int16_t *samples, int length)
PDEBUG(DDSP, DEBUG_NOTICE, "SAT level %.2f%% quality %.0f%%\n", result[0] * 32767.0 / SAT_DEVIATION / 0.63662 * 100.0, quality[0] * 100.0);
if (amps->sender.loopback || debuglevel == DEBUG_DEBUG) {
PDEBUG(DDSP, debuglevel, "Signalling Tone level %.2f%% quality %.0f%%\n", result[2] * 32767.0 / FSK_DEVIATION / 0.63662 * 100.0, quality[1] * 100.0);
PDEBUG(DDSP, debuglevel, "Signaling Tone level %.2f%% quality %.0f%%\n", result[2] * 32767.0 / FSK_DEVIATION / 0.63662 * 100.0, quality[1] * 100.0);
}
if (quality[0] > SAT_QUALITY) {
if (amps->sat_detected == 0) {
@@ -704,8 +704,8 @@ static void sat_decode(amps_t *amps, int16_t *samples, int length)
if (amps->sig_detect_count == SIG_DETECT_COUNT) {
amps->sig_detected = 1;
amps->sig_detect_count = 0;
PDEBUG(DDSP, DEBUG_DEBUG, "Signalling Tone detected with level=%.0f%%, quality=%.0f%%.\n", result[2] / 0.63662 * 100.0, quality[1] * 100.0);
amps_rx_signalling_tone(amps, 1, quality[1]);
PDEBUG(DDSP, DEBUG_DEBUG, "Signaling Tone detected with level=%.0f%%, quality=%.0f%%.\n", result[2] / 0.63662 * 100.0, quality[1] * 100.0);
amps_rx_signaling_tone(amps, 1, quality[1]);
}
} else
amps->sig_detect_count = 0;
@@ -715,15 +715,15 @@ static void sat_decode(amps_t *amps, int16_t *samples, int length)
if (amps->sig_detect_count == SIG_LOST_COUNT) {
amps->sig_detected = 0;
amps->sig_detect_count = 0;
PDEBUG(DDSP, DEBUG_DEBUG, "Signalling Tone lost.\n");
amps_rx_signalling_tone(amps, 0, 0.0);
PDEBUG(DDSP, DEBUG_DEBUG, "Signaling Tone lost.\n");
amps_rx_signaling_tone(amps, 0, 0.0);
}
} else
amps->sig_detect_count = 0;
}
}
/* decode signalling/audio */
/* decode signaling/audio */
/* Count SIG_TONE_CROSSINGS of zero crossings, then check if the elapsed bit
* time is between SIG_TONE_MINBITS and SIG_TONE_MAXBITS. If it is, the
* frequency is close to the singalling tone, so it is detected

2
src/amps/main.c
View File

@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "*******************************************************************************\n");
fprintf(stderr, "I strongly suggest to let me do pre- and de-emphasis (options -E -e)!\n");
fprintf(stderr, "Use a transmitter/receiver without emphasis and let me do that!\n");
fprintf(stderr, "Because carrier FSK signalling does not use emphasis, I like to control\n");
fprintf(stderr, "Because carrier FSK signaling does not use emphasis, I like to control\n");
fprintf(stderr, "emphasis by myself for best results.\n");
fprintf(stderr, "*******************************************************************************\n");
}

4
src/amps/transaction.h
View File

@@ -9,8 +9,8 @@ enum amps_trans_state {
TRANS_CALL_MO_ASSIGN_SEND, /* assigning channel, sending assignment */
TRANS_CALL_MT_ASSIGN, /* assigning channel, waiting to send */
TRANS_CALL_MT_ASSIGN_SEND, /* assigning channel, sending assignment */
TRANS_CALL_MT_ALERT, /* ringing the phone, sending alert order until signalling tone is received */
TRANS_CALL_MT_ALERT_SEND, /* ringing the phone, signalling tone is received */
TRANS_CALL_MT_ALERT, /* ringing the phone, sending alert order until signaling tone is received */
TRANS_CALL_MT_ALERT_SEND, /* ringing the phone, signaling tone is received */
TRANS_CALL_REJECT, /* rejecting channel, waiting to send */
TRANS_CALL_REJECT_SEND, /* rejecting channel, sending reject */
TRANS_CALL, /* active call */