aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2016-11-13 06:39:14 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2016-11-13 06:39:14 +0100
commit34954b50de2641311c752cb1491e954ade7b81c9 (patch)
tree5b27c7bcb067c6137926e60ede1253d76d35751a
parent2a4abc62b24f0af31e171508dd648690a9b0667a (diff)
B-Netz: Rename special start digit for coin box phone type
-rw-r--r--src/bnetz/bnetz.c10
-rw-r--r--src/bnetz/bnetz.h2
-rw-r--r--src/bnetz/telegramm.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c
index 73e9d8e..1082a46 100644
--- a/src/bnetz/bnetz.c
+++ b/src/bnetz/bnetz.c
@@ -415,7 +415,7 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm, double level, d
bnetz->dial_type = DIAL_TYPE_METER;
break;
case 'U':
- bnetz->dial_type = DIAL_TYPE_UNKNOWN;
+ bnetz->dial_type = DIAL_TYPE_METER_MUENZ;
break;
default:
PDEBUG(DBNETZ, DEBUG_NOTICE, "Received digit that is not a start digit ('Funkwahl'), aborting.\n");
@@ -466,21 +466,21 @@ void bnetz_receive_telegramm(bnetz_t *bnetz, uint16_t telegramm, double level, d
switch (digit) {
case 's':
if (bnetz->dial_type != DIAL_TYPE_NOMETER) {
- PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (no metering), aborting.\n");
+ PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (no metering support), aborting.\n");
bnetz_go_idle(bnetz);
return;
}
break;
case 'S':
if (bnetz->dial_type != DIAL_TYPE_METER) {
- PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering), aborting.\n");
+ PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering support), aborting.\n");
bnetz_go_idle(bnetz);
return;
}
break;
case 'U':
- if (bnetz->dial_type != DIAL_TYPE_UNKNOWN) {
- PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (unknwon type), aborting.\n");
+ if (bnetz->dial_type != DIAL_TYPE_METER_MUENZ) {
+ PDEBUG(DBNETZ, DEBUG_NOTICE, "Second received start message('Funkwahl') does not match first one (metering support, payphone), aborting.\n");
bnetz_go_idle(bnetz);
return;
}
diff --git a/src/bnetz/bnetz.h b/src/bnetz/bnetz.h
index a6cbec1..ab2bbc0 100644
--- a/src/bnetz/bnetz.h
+++ b/src/bnetz/bnetz.h
@@ -35,7 +35,7 @@ enum dial_mode {
enum dial_type {
DIAL_TYPE_NOMETER,
DIAL_TYPE_METER,
- DIAL_TYPE_UNKNOWN,
+ DIAL_TYPE_METER_MUENZ,
};
/* current state of paging mobile station */
diff --git a/src/bnetz/telegramm.c b/src/bnetz/telegramm.c
index 1c87c32..5e76fc5 100644
--- a/src/bnetz/telegramm.c
+++ b/src/bnetz/telegramm.c
@@ -38,7 +38,7 @@ static struct impulstelegramm impulstelegramme[] = {
/* Signale */
{ 's', "0111001000100010", 0x0000, "Funkwahl ohne Gebuehrenuebermittlung" },
{ 'S', "0111000100100100", 0x0000, "Funkwahl mit Gebuehrenuebermittlung" },
- { 'U', "0111000010101000", 0x0000, "Funkwahl (unbekannte Variante)" },
+ { 'U', "0111000010101000", 0x0000, "Funkwahl mit Gebuehrenuebermittlung (Muenzfernsprecher)" },
{ 'e', "0111010000100001", 0x0000, "Funkwahlende" },
{ 't', "0111010101010101", 0x0000, "Trennsignal/Schlusssignal" },
/* Kanalbefehl B1 */