aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-01-08 12:10:29 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-02-18 21:00:55 +0100
commita5fd375237cd7d4f9a1d60608c50720b3498f72d (patch)
tree5a271342ec9b29e40efd2f3664ee6176b4eaf03f
parentbf0abd627d42a6603cd8c98442539eb7c779615c (diff)
Fixed typos
-rw-r--r--src/amps/amps.c8
-rw-r--r--src/amps/dsp.c2
-rw-r--r--src/amps/main.c2
-rw-r--r--src/bnetz/main.c2
-rw-r--r--src/cnetz/telegramm.c4
-rw-r--r--src/common/main_common.c4
-rw-r--r--src/nmt/main.c2
7 files changed, 12 insertions, 12 deletions
diff --git a/src/amps/amps.c b/src/amps/amps.c
index fd8b03a..1923a30 100644
--- a/src/amps/amps.c
+++ b/src/amps/amps.c
@@ -410,7 +410,7 @@ int amps_create(int channel, enum amps_chan_type chan_type, const char *audiodev
/* check if channel type matches channel number */
ct = amps_channel2type(channel);
if (ct == CHAN_TYPE_CC && chan_type != CHAN_TYPE_PC && chan_type != CHAN_TYPE_CC_PC && chan_type != CHAN_TYPE_CC_PC_VC) {
- PDEBUG(DAMPS, DEBUG_ERROR, "Channel number %d belongs to a control channel, but your channel type '%s' requires to be on a voice channel number. Some phone may reject this.\n", channel, chan_type_long_name(chan_type));
+ PDEBUG(DAMPS, DEBUG_NOTICE, "Channel number %d belongs to a control channel, but your channel type '%s' requires to be on a voice channel number. Some phone may reject this, but all my phones don't.\n", channel, chan_type_long_name(chan_type));
}
if (ct == CHAN_TYPE_VC && chan_type != CHAN_TYPE_VC) {
PDEBUG(DAMPS, DEBUG_ERROR, "Channel number %d belongs to a voice channel, but your channel type '%s' requires to be on a control channel number. Please use correct channel.\n", channel, chan_type_long_name(chan_type));
@@ -430,7 +430,7 @@ int amps_create(int channel, enum amps_chan_type chan_type, const char *audiodev
/* check if we use combined voice channel hack */
if (chan_type == CHAN_TYPE_CC_PC_VC) {
- PDEBUG(DAMPS, DEBUG_NOTICE, "You selected '%s'. This is a hack, but the only way to use control channel and voice channel on one transceiver. Some phones may reject this.\n", chan_type_long_name(chan_type));
+ PDEBUG(DAMPS, DEBUG_NOTICE, "You selected '%s'. This is a hack, but the only way to use control channel and voice channel on one transceiver. Some phones may reject this, but all my phones don't.\n", chan_type_long_name(chan_type));
}
amps = calloc(1, sizeof(amps_t));
@@ -1046,7 +1046,7 @@ again:
case TRANS_CALL_MT_ASSIGN_SEND:
vc = assign_voice_channel(trans);
if (vc) {
- PDEBUG_CHAN(DAMPS, DEBUG_INFO, "Assignment complete, next: sending altering on VC\n");
+ PDEBUG_CHAN(DAMPS, DEBUG_INFO, "Assignment complete, next: sending alerting on VC\n");
trans->chan = 0;
trans->msg_type = 0;
trans->ordq = 0;
@@ -1088,7 +1088,7 @@ again:
amps_go_idle(amps);
goto again;
case TRANS_CALL_MT_ALERT:
- PDEBUG_CHAN(DAMPS, DEBUG_INFO, "Sending altering\n");
+ PDEBUG_CHAN(DAMPS, DEBUG_INFO, "Sending alerting\n");
return trans;
default:
return NULL;
diff --git a/src/amps/dsp.c b/src/amps/dsp.c
index 4b7e08b..7fcabcc 100644
--- a/src/amps/dsp.c
+++ b/src/amps/dsp.c
@@ -350,7 +350,7 @@ static int fsk_encode(amps_t *amps, char bit)
} while (phase < 256.0);
phase -= 256.0;
}
- /* ramp up */
+ /* ramp down */
do {
*spl++ = ramp_down[(int)phase];
phase += bitstep;
diff --git a/src/amps/main.c b/src/amps/main.c
index da4a37f..b95b9b5 100644
--- a/src/amps/main.c
+++ b/src/amps/main.c
@@ -47,7 +47,7 @@ int tolerant = 0;
void print_help(const char *arg0)
{
- print_help_common(arg0, "-p -d -F yes | no [-S sid=<sid>]");
+ print_help_common(arg0, "-p -d -F yes | no [-S sid=<sid>] ");
/* - - */
printf(" -T --channel-type <channel type> | list\n");
printf(" Give channel type, use 'list' to get a list. (default = '%s')\n", chan_type_short_name(chan_type[0]));
diff --git a/src/bnetz/main.c b/src/bnetz/main.c
index a2381fd..a7f668c 100644
--- a/src/bnetz/main.c
+++ b/src/bnetz/main.c
@@ -42,7 +42,7 @@ double lossdetect = 0;
void print_help(const char *arg0)
{
- print_help_common(arg0, "[-G <gfs>]");
+ print_help_common(arg0, "[-G <gfs>] ");
/* - - */
printf(" -G --gfs <gruppenfreisignal> | <lat>,<lon>\n");
printf(" Gruppenfreisignal\" 1..9 | 19 | 10..18 (default = '%d')\n", gfs);
diff --git a/src/cnetz/telegramm.c b/src/cnetz/telegramm.c
index a8e5aa6..09b4461 100644
--- a/src/cnetz/telegramm.c
+++ b/src/cnetz/telegramm.c
@@ -1491,9 +1491,9 @@ void cnetz_decode_telegramm(cnetz_t *cnetz, const char *bits, double level, doub
telegramm.jitter = jitter;
if (bit_errors)
- PDEBUG_CHAN(DDSP, DEBUG_INFO, "RX Level: %.0f%% Jitter: %.2f Sync Time: %.2f (TS %.2f) Bit errors: %d %s\n", fabs(level) * 32767.0 / cnetz->fsk_deviation * 100.0, jitter, sync_time, sync_time / 396.0, bit_errors, (level < 0) ? "NEGATIVE" : "POSITIVE");
+ PDEBUG_CHAN(DDSP, DEBUG_INFO, "RX Level: %.0f%% Jitter: %.2f Sync Time: %.2f (TS %.2f) Bit errors: %d %s\n", fabs(level) * 32767.0 / cnetz->fsk_deviation * 100.0, jitter, sync_time, sync_time / 396.0, bit_errors, (level < 0) ? "NEGATIVE (phone's mode)" : "POSITIVE (base station's mode)");
else
- PDEBUG_CHAN(DDSP, DEBUG_INFO, "RX Level: %.0f%% Jitter: %.2f Sync Time: %.2f (TS %.2f) %s\n", fabs(level) * 32767.0 / cnetz->fsk_deviation * 100.0, jitter, sync_time, sync_time / 396.0, (level < 0) ? "NEGATIVE" : "POSITIVE");
+ PDEBUG_CHAN(DDSP, DEBUG_INFO, "RX Level: %.0f%% Jitter: %.2f Sync Time: %.2f (TS %.2f) %s\n", fabs(level) * 32767.0 / cnetz->fsk_deviation * 100.0, jitter, sync_time, sync_time / 396.0, (level < 0) ? "NEGATIVE (phone's mode)" : "POSITIVE (base station's mode)");
if (cnetz->sender.loopback) {
PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm in loopback test mode (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
diff --git a/src/common/main_common.c b/src/common/main_common.c
index 7a38bc4..2aa5b40 100644
--- a/src/common/main_common.c
+++ b/src/common/main_common.c
@@ -250,7 +250,7 @@ void opt_switch_common(int c, char *arg0, int *skip_args)
case 'p':
if (!uses_emphasis) {
no_emph:
- fprintf(stderr, "A-Netz does not use emphasis, please do not enable pre- or de-emphasis! Disable emphasis on transceiver, if possible.\n");
+ fprintf(stderr, "This network does not use emphasis, please do not enable pre- or de-emphasis! Disable emphasis on transceiver, if possible.\n");
exit(0);
}
do_pre_emphasis = 1;
@@ -265,7 +265,7 @@ void opt_switch_common(int c, char *arg0, int *skip_args)
case 'g':
gain_db = atof(optarg);
if (gain_db < 0.0) {
- fprintf(stderr, "Given gain is below 0. Tto reduce RX signal, use sound card's mixer (or resistor net)!\n");
+ fprintf(stderr, "Given gain is below 0. To reduce RX signal, use sound card's mixer (or resistor net)!\n");
exit(0);
}
rx_gain = pow(10, gain_db / 20.0);
diff --git a/src/nmt/main.c b/src/nmt/main.c
index 36a88ae..440be26 100644
--- a/src/nmt/main.c
+++ b/src/nmt/main.c
@@ -54,7 +54,7 @@ int send_callerid = 0;
void print_help(const char *arg0)
{
- print_help_common(arg0, "-Y <traffic area> | list [-I 1] [-0 1]");
+ print_help_common(arg0, "-Y <traffic area> | list [-I 1] [-0 1] ");
/* - - */
printf(" -T --channel-type <channel type> | list\n");
printf(" Give channel type, use 'list' to get a list. (default = '%s')\n", chan_type_short_name(chan_type[0]));