C-Netz: Minor fixes

3 files changed, 18 insertions, 18 deletions

diff --git a/src/cnetz/cnetz.c b/src/cnetz/cnetz.c
index c97af0d..9cea24c 100644
--- a/src/cnetz/cnetz.c
+++ b/src/cnetz/cnetz.c
@@ -126,7 +126,7 @@
  * The encoder generates a precise clocked signal using correction value given
  * by command line. For multichannel, the second sound card's channel (slave) is
  * synced to the first one (master), if calculation of signal phase might drift
- * due to routing errors.
+ * due to rounding errors.
  *
  * The decoder is synced to the phone, whenever it receives a valid frame.
  *
@@ -1169,7 +1169,7 @@ void cnetz_receive_telegramm_ogk(cnetz_t *cnetz, telegramm_t *telegramm, int blo
 		else
 			PDEBUG_CHAN(DCNETZ, DEBUG_INFO, "Received Attachment 'Einbuchen' message from Subscriber '%s' with %s card's security code %d\n", rufnummer, (telegramm->chipkarten_futelg_bit) ? "chip":"magnet", telegramm->sicherungs_code);
 		if (telegramm->erweitertes_frequenzbandbit)
-			PDEBUG(DCNETZ, DEBUG_INFO, " -> Phone support extended frequency band\n");
+			PDEBUG(DCNETZ, DEBUG_INFO, " -> Phone supports extended frequency band\n");
 		if (cnetz->state != CNETZ_IDLE) {
 			PDEBUG(DCNETZ, DEBUG_NOTICE, "Ignoring Attachment from subscriber '%s', because we are busy becoming SpK.\n", rufnummer);
 			break;
@@ -1190,7 +1190,7 @@ void cnetz_receive_telegramm_ogk(cnetz_t *cnetz, telegramm_t *telegramm, int blo
 		else
 			PDEBUG_CHAN(DCNETZ, DEBUG_INFO, "Received Roaming 'Umbuchen' message from Subscriber '%s' with %s card's security code %d\n", rufnummer, (telegramm->chipkarten_futelg_bit) ? "chip":"magnet", telegramm->sicherungs_code);
 		if (telegramm->erweitertes_frequenzbandbit)
-			PDEBUG(DCNETZ, DEBUG_INFO, " -> Phone support extended frequency band\n");
+			PDEBUG(DCNETZ, DEBUG_INFO, " -> Phone supports extended frequency band\n");
 		if (cnetz->state != CNETZ_IDLE) {
 			PDEBUG(DCNETZ, DEBUG_NOTICE, "Ignoring Roaming from subscriber '%s', because we are busy becoming SpK.\n", rufnummer);
 			break;
diff --git a/src/cnetz/dsp.c b/src/cnetz/dsp.c
index ecf26a4..9a07d4d 100644
--- a/src/cnetz/dsp.c
+++ b/src/cnetz/dsp.c
@@ -118,20 +118,20 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], en
 	}
 
 	if (clock_speed[0] > 1000 || clock_speed[0] < -1000 || clock_speed[1] > 1000 || clock_speed[1] < -1000) {
-		PDEBUG(DDSP, DEBUG_ERROR, "Clock speed %.1f,%.1f ppm out of range! Plese use range between +-1000 ppm!\n", clock_speed[0], clock_speed[1]);
+		PDEBUG_CHAN(DDSP, DEBUG_ERROR, "Clock speed %.1f,%.1f ppm out of range! Plese use range between +-1000 ppm!\n", clock_speed[0], clock_speed[1]);
 		return -EINVAL;
 	}
-	PDEBUG(DDSP, DEBUG_INFO, "Using clock speed of %.1f ppm (RX) and %.1f ppm (TX) to correct sound card's clock.\n", clock_speed[0], clock_speed[1]);
+	PDEBUG_CHAN(DDSP, DEBUG_INFO, "Using clock speed of %.1f ppm (RX) and %.1f ppm (TX) to correct sound card's clock.\n", clock_speed[0], clock_speed[1]);
 
 	cnetz->fsk_bitduration = (double)cnetz->sender.samplerate / ((double)BITRATE / (1.0 + clock_speed[1] / 1000000.0));
 	cnetz->fsk_tx_bitstep = 1.0 / cnetz->fsk_bitduration;
-	PDEBUG(DDSP, DEBUG_DEBUG, "Use %.4f samples for one bit duration @ %d.\n", cnetz->fsk_bitduration, cnetz->sender.samplerate);
+	PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Use %.4f samples for one bit duration @ %d.\n", cnetz->fsk_bitduration, cnetz->sender.samplerate);
 
 	size = cnetz->fsk_bitduration * (double)BLOCK_BITS * 16.0; /* 16 blocks for distributed frames */
 	cnetz->fsk_tx_buffer_size = size * 1.1; /* more to compensate clock speed */
 	cnetz->fsk_tx_buffer = calloc(sizeof(sample_t), cnetz->fsk_tx_buffer_size);
 	if (!cnetz->fsk_tx_buffer) {
-		PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
+		PDEBUG_CHAN(DDSP, DEBUG_ERROR, "No memory!\n");
 		rc = -ENOMEM;
 		goto error;
 	}
@@ -146,7 +146,7 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], en
 	/* create speech buffer */
 	cnetz->dsp_speech_buffer = calloc(sizeof(sample_t), (int)(cnetz->fsk_bitduration * 70.0)); /* more to compensate clock speed. we just need it to fill 62 bits (60 bits, including pause bits). */
 	if (!cnetz->dsp_speech_buffer) {
-		PDEBUG(DDSP, DEBUG_ERROR, "No memory!\n");
+		PDEBUG_CHAN(DDSP, DEBUG_ERROR, "No memory!\n");
 		rc = -ENOMEM;
 		goto error;
 	}
@@ -180,7 +180,7 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], en
 #ifdef TEST_SCRAMBLE
 	rc = jitter_create(&scrambler_test_jb, cnetz->sender.samplerate / 5);
 	if (rc < 0) {
-		PDEBUG(DDSP, DEBUG_ERROR, "Failed to init jitter buffer for scrambler test!\n");
+		PDEBUG_CHAN(DDSP, DEBUG_ERROR, "Failed to init jitter buffer for scrambler test!\n");
 		exit(0);
 	}
 	scrambler_setup(&scrambler_test_scrambler1, cnetz->sender.samplerate);
@@ -685,11 +685,11 @@ again:
 				if (cnetz->sched_r_m == 0) {
 					/* set last time slot, so we know to which time slot the message from mobile station belongs to */
 					cnetz->sched_last_ts = cnetz->sched_ts;
-					PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Rufblock' at timeslot %d\n", cnetz->sched_ts);
 					bits = cnetz_encode_telegramm(cnetz);
+					PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Rufblock' at timeslot %d\n", cnetz->sched_ts);
 				} else {
-					PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Meldeblock' at timeslot %d\n", cnetz->sched_ts);
 					bits = cnetz_encode_telegramm(cnetz);
+					PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Meldeblock' at timeslot %d\n", cnetz->sched_ts);
 				}
 				fsk_block_encode(cnetz, bits, 1);
 			} else {
@@ -697,14 +697,14 @@ again:
 			}
 			break;
 		case DSP_MODE_SPK_K:
-			PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Konzentrierte Signalisierung'\n");
 			bits = cnetz_encode_telegramm(cnetz);
 			fsk_block_encode(cnetz, bits, 0);
+			PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Konzentrierte Signalisierung' at timeslot %d.%d\n", cnetz->sched_ts, cnetz->sched_r_m * 5);
 			break;
 		case DSP_MODE_SPK_V:
-			PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Verteilte Signalisierung'\n");
 			bits = cnetz_encode_telegramm(cnetz);
 			fsk_distributed_encode(cnetz, bits);
+			PDEBUG_CHAN(DDSP, DEBUG_DEBUG, "Transmitting 'Verteilte Signalisierung' starting at timeslot %d\n", cnetz->sched_ts);
 			break;
 		case DSP_MODE_OFF:
 		default:
diff --git a/src/cnetz/telegramm.c b/src/cnetz/telegramm.c
index 1a21369..c3d5176 100644
--- a/src/cnetz/telegramm.c
+++ b/src/cnetz/telegramm.c
@@ -1485,16 +1485,16 @@ void cnetz_decode_telegramm(cnetz_t *cnetz, const char *bits, double level, doub
 		return;
 	}
 
-	disassemble_telegramm(&telegramm, bits, si.authentifikationsbit);
-	opcode = telegramm.opcode;
-	telegramm.level = level;
-	telegramm.sync_time = sync_time;
-
 	if (bit_errors)
 		PDEBUG_CHAN(DDSP, DEBUG_INFO, "RX Level: %.0f%% Standard deviation: %.0f%% Sync Time: %.2f (TS %.2f) Bit errors: %d %s\n", fabs(level) / cnetz->fsk_deviation * 100.0, stddev / fabs(level) * 100.0, 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%% Standard deviation: %.0f%% Sync Time: %.2f (TS %.2f) %s\n", fabs(level) / cnetz->fsk_deviation * 100.0, stddev / fabs(level) * 100.0, sync_time, sync_time / 396.0, (level < 0) ? "NEGATIVE (phone's mode)" : "POSITIVE (base station's mode)");
 
+	disassemble_telegramm(&telegramm, bits, si.authentifikationsbit);
+	opcode = telegramm.opcode;
+	telegramm.level = level;
+	telegramm.sync_time = sync_time;
+
 	if (cnetz->sender.loopback) {
 		PDEBUG(DFRAME, DEBUG_NOTICE, "Received Telegramm in loopback test mode (opcode %d = %s)\n", opcode, definition_opcode[opcode].message_name);
 		cnetz_sync_frame(cnetz, sync_time, -1);