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

amps: Fix typos in logs.

Browse Source
This commit is contained in:
Howard M. Harte
2024-09-07 12:38:15 -07:00
committed by Andreas Eversberg
parent b5aae98b6c
commit 8f91ed1f64
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amps/amps.c
View File

@@ -555,10 +555,10 @@ int amps_create(const char *kanal, enum amps_chan_type chan_type, const char *de
/* check if channel type matches channel number */ /* check if channel type matches channel number */
ct = amps_channel2type(atoi(kanal)); ct = amps_channel2type(atoi(kanal));
if (ct == CHAN_TYPE_CC && chan_type != CHAN_TYPE_PC && chan_type != CHAN_TYPE_CC_PC && chan_type != CHAN_TYPE_CC_PC_VC) { if (ct == CHAN_TYPE_CC && chan_type != CHAN_TYPE_PC && chan_type != CHAN_TYPE_CC_PC && chan_type != CHAN_TYPE_CC_PC_VC) {
LOGP(DAMPS, LOGL_NOTICE, "Channel number %s 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", kanal, chan_type_long_name(chan_type)); LOGP(DAMPS, LOGL_NOTICE, "Channel number %s belongs to a control channel, but your channel type '%s' requires it to be on a voice channel number. Some phones may reject this, but all my phones don't.\n", kanal, chan_type_long_name(chan_type));
} }
if (ct == CHAN_TYPE_VC && chan_type != CHAN_TYPE_VC) { if (ct == CHAN_TYPE_VC && chan_type != CHAN_TYPE_VC) {
LOGP(DAMPS, LOGL_ERROR, "Channel number %s belongs to a voice channel, but your channel type '%s' requires to be on a control channel number. Please use correct channel.\n", kanal, chan_type_long_name(chan_type)); LOGP(DAMPS, LOGL_ERROR, "Channel number %s belongs to a voice channel, but your channel type '%s' requires it to be on a control channel number. Please use correct channel.\n", kanal, chan_type_long_name(chan_type));
return -EINVAL; return -EINVAL;
} }
/* only even channels */ /* only even channels */

2
src/amps/dsp.c
View File

@@ -964,7 +964,7 @@ void amps_set_dsp_mode(amps_t *amps, enum dsp_mode mode, int frame_length)
if (mode == DSP_MODE_AUDIO_RX_AUDIO_TX && amps->dsp_mode != mode) if (mode == DSP_MODE_AUDIO_RX_AUDIO_TX && amps->dsp_mode != mode)
jitter_reset(&amps->sender.dejitter); jitter_reset(&amps->sender.dejitter);
LOGP_CHAN(DDSP, LOGL_DEBUG, "Reset FSK frame transmitter, due to setting dsp mode.\n"); LOGP_CHAN(DDSP, LOGL_DEBUG, "Reset FSK frame transmitter, due to setting DSP mode.\n");
amps->dsp_mode = mode; amps->dsp_mode = mode;
if (frame_length) if (frame_length)

2
src/amps/frame.c
View File

@@ -3512,7 +3512,7 @@ int amps_encode_frame_focc(amps_t *amps, char *bits)
if (++amps->tx_focc_frame_count >= amps->si.overhead_repeat) if (++amps->tx_focc_frame_count >= amps->si.overhead_repeat)
amps->tx_focc_frame_count = 0; amps->tx_focc_frame_count = 0;
if (debug) if (debug)
LOGP_CHAN(DFRAME, LOGL_INFO, "Subsequent system/filler frames are not show, to prevent flooding the output.\n"); LOGP_CHAN(DFRAME, LOGL_INFO, "Subsequent system/filler frames are not shown, to prevent flooding the output.\n");
amps->tx_focc_debugged = 1; amps->tx_focc_debugged = 1;
send: send:

2
src/cnetz/telegramm.c
View File

@@ -1622,7 +1622,7 @@ const char *cnetz_encode_telegramm(cnetz_t *cnetz)
cnetz->sched_lr_debugged = 1; cnetz->sched_lr_debugged = 1;
if (opcode == OPCODE_MLR_M && !cnetz->sched_mlr_debugged) { if (opcode == OPCODE_MLR_M && !cnetz->sched_mlr_debugged) {
cnetz->sched_mlr_debugged = 1; cnetz->sched_mlr_debugged = 1;
LOGP(DFRAME, LOGL_INFO, "Subsequent IDLE frames are not show, to prevent flooding the output.\n"); LOGP(DFRAME, LOGL_INFO, "Subsequent IDLE frames are not shown, to prevent flooding the output.\n");
} }
return bits; return bits;

16
src/libsdr/sdr.c
View File

@@ -304,7 +304,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
This is correct, since there is no bandwidth This is correct, since there is no bandwidth
below new center frequency. below new center frequency.
*/ */
LOGP(DSDR, LOGL_INFO, "We shift center frequency %.0f KHz down (half bandwidth), to prevent channel from overlap with DC level.\n", bandwidth / 2.0 / 1e3); LOGP(DSDR, LOGL_INFO, "We shift center frequency %.0f KHz down (half bandwidth), to prevent channel from overlapping with DC level.\n", bandwidth / 2.0 / 1e3);
} else { } else {
/* find two channels that are aside the center */ /* find two channels that are aside the center */
double low_dist = 0, high_dist = 0, dist; double low_dist = 0, high_dist = 0, dist;
@@ -342,7 +342,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
tx_center_frequency = tx_center_frequency =
((sdr->chan[low_c].tx_frequency) + ((sdr->chan[low_c].tx_frequency) +
(sdr->chan[high_c].tx_frequency)) / 2.0; (sdr->chan[high_c].tx_frequency)) / 2.0;
LOGP(DSDR, LOGL_INFO, "We move center freqeuency between the two channels in the middle, to prevent them from overlap with DC level.\n"); LOGP(DSDR, LOGL_INFO, "We move center frequency between the two channels in the middle, to prevent them from overlapping with DC level.\n");
} }
} }
@@ -354,7 +354,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
low_side = (tx_center_frequency - tx_low_frequency) + bandwidth / 2.0; low_side = (tx_center_frequency - tx_low_frequency) + bandwidth / 2.0;
high_side = (tx_high_frequency - tx_center_frequency) + bandwidth / 2.0; high_side = (tx_high_frequency - tx_center_frequency) + bandwidth / 2.0;
range = ((low_side > high_side) ? low_side : high_side) * 2.0; range = ((low_side > high_side) ? low_side : high_side) * 2.0;
LOGP(DSDR, LOGL_INFO, "Total bandwidth (two side bands) for all TX Frequencies: %.0f Hz\n", range); LOGP(DSDR, LOGL_INFO, "Total bandwidth (two sidebands) for all TX Frequencies: %.0f Hz\n", range);
if (range > samplerate * USABLE_BANDWIDTH) { if (range > samplerate * USABLE_BANDWIDTH) {
LOGP(DSDR, LOGL_NOTICE, "*******************************************************************************\n"); LOGP(DSDR, LOGL_NOTICE, "*******************************************************************************\n");
LOGP(DSDR, LOGL_NOTICE, "The required bandwidth of %.0f Hz exceeds %.0f%% of the sample rate.\n", range, USABLE_BANDWIDTH * 100.0); LOGP(DSDR, LOGL_NOTICE, "The required bandwidth of %.0f Hz exceeds %.0f%% of the sample rate.\n", range, USABLE_BANDWIDTH * 100.0);
@@ -430,7 +430,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
This is correct, since there is no bandwidth This is correct, since there is no bandwidth
below new center frequency. below new center frequency.
*/ */
LOGP(DSDR, LOGL_INFO, "We shift center frequency %.0f KHz down (half bandwidth), to prevent channel from overlap with DC level.\n", bandwidth / 2.0 / 1e3); LOGP(DSDR, LOGL_INFO, "We shift center frequency %.0f KHz down (half bandwidth), to prevent channel from overlapping with DC level.\n", bandwidth / 2.0 / 1e3);
} else { } else {
/* find two channels that are aside the center */ /* find two channels that are aside the center */
double low_dist, high_dist, dist; double low_dist, high_dist, dist;
@@ -454,7 +454,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
rx_center_frequency = rx_center_frequency =
((sdr->chan[low_c].rx_frequency) + ((sdr->chan[low_c].rx_frequency) +
(sdr->chan[high_c].rx_frequency)) / 2.0; (sdr->chan[high_c].rx_frequency)) / 2.0;
LOGP(DSDR, LOGL_INFO, "We move center freqeuency between the two channels in the middle, to prevent them from overlap with DC level.\n"); LOGP(DSDR, LOGL_INFO, "We move center frequency between the two channels in the middle, to prevent them from overlapping with DC level.\n");
} }
} }
@@ -466,7 +466,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
low_side = (rx_center_frequency - rx_low_frequency) + bandwidth / 2.0; low_side = (rx_center_frequency - rx_low_frequency) + bandwidth / 2.0;
high_side = (rx_high_frequency - rx_center_frequency) + bandwidth / 2.0; high_side = (rx_high_frequency - rx_center_frequency) + bandwidth / 2.0;
range = ((low_side > high_side) ? low_side : high_side) * 2.0; range = ((low_side > high_side) ? low_side : high_side) * 2.0;
LOGP(DSDR, LOGL_INFO, "Total bandwidth (two side bands) for all RX Frequencies: %.0f Hz\n", range); LOGP(DSDR, LOGL_INFO, "Total bandwidth (two sidebands) for all RX Frequencies: %.0f Hz\n", range);
if (range > samplerate * USABLE_BANDWIDTH) { if (range > samplerate * USABLE_BANDWIDTH) {
LOGP(DSDR, LOGL_NOTICE, "*******************************************************************************\n"); LOGP(DSDR, LOGL_NOTICE, "*******************************************************************************\n");
LOGP(DSDR, LOGL_NOTICE, "The required bandwidth of %.0f Hz exceeds %.0f%% of the sample rate.\n", range, USABLE_BANDWIDTH * 100.0); LOGP(DSDR, LOGL_NOTICE, "The required bandwidth of %.0f Hz exceeds %.0f%% of the sample rate.\n", range, USABLE_BANDWIDTH * 100.0);
@@ -484,7 +484,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
if (am[c]) if (am[c])
rc = am_demod_init(&sdr->chan[c].am_demod, samplerate, rx_offset, bandwidth / 2.0, 1.0 / modulation_index); /* bandwidth is only one side band */ rc = am_demod_init(&sdr->chan[c].am_demod, samplerate, rx_offset, bandwidth / 2.0, 1.0 / modulation_index); /* bandwidth is only one side band */
else else
rc = fm_demod_init(&sdr->chan[c].fm_demod, samplerate, rx_offset, bandwidth); /* bandwidth are deviation and both side bands */ rc = fm_demod_init(&sdr->chan[c].fm_demod, samplerate, rx_offset, bandwidth); /* bandwidth are deviation and both sidebands */
if (rc < 0) if (rc < 0)
goto error; goto error;
} }
@@ -522,7 +522,7 @@ void *sdr_open(int __attribute__((__unused__)) direction, const char __attribute
display_iq_init(samplerate); display_iq_init(samplerate);
display_spectrum_init(samplerate, rx_center_frequency); display_spectrum_init(samplerate, rx_center_frequency);
LOGP(DSDR, LOGL_INFO, "Using local oscillator offseet: %.0f Hz\n", sdr_config->lo_offset); LOGP(DSDR, LOGL_INFO, "Using local oscillator offset: %.0f Hz\n", sdr_config->lo_offset);
#ifdef HAVE_UHD #ifdef HAVE_UHD
if (sdr_config->uhd) { if (sdr_config->uhd) {

2
src/nmt/nmt.c
View File

@@ -1790,7 +1790,7 @@ const char *nmt_get_frame(nmt_t *nmt)
if (debug) if (debug)
LOGP_CHAN(DNMT, LOGL_DEBUG, "Sending frame %s.\n", nmt_frame_name(frame.mt)); LOGP_CHAN(DNMT, LOGL_DEBUG, "Sending frame %s.\n", nmt_frame_name(frame.mt));
if (debug && nmt->tx_last_frame_idle) if (debug && nmt->tx_last_frame_idle)
LOGP_CHAN(DNMT, LOGL_DEBUG, "Subsequent IDLE frames are not show, to prevent flooding the output.\n"); LOGP_CHAN(DNMT, LOGL_DEBUG, "Subsequent IDLE frames are not shown, to prevent flooding the output.\n");
return bits; return bits;
} }

2
src/r2000/r2000.c
View File

@@ -1227,7 +1227,7 @@ const char *r2000_get_frame(r2000_t *r2000)
if (debug) if (debug)
LOGP_CHAN(DR2000, LOGL_DEBUG, "Sending frame %s.\n", r2000_frame_name(frame.message, REL_TO_SM)); LOGP_CHAN(DR2000, LOGL_DEBUG, "Sending frame %s.\n", r2000_frame_name(frame.message, REL_TO_SM));
if (debug && r2000->tx_last_frame_idle) if (debug && r2000->tx_last_frame_idle)
LOGP_CHAN(DR2000, LOGL_DEBUG, "Subsequent IDLE frames are not show, to prevent flooding the output.\n"); LOGP_CHAN(DR2000, LOGL_DEBUG, "Subsequent IDLE frames are not shown, to prevent flooding the output.\n");
return bits; return bits;
} }