Reverted ODA changes

This commit is contained in:
Sjef Verhoeven PE5PVB
2025-01-28 21:08:30 +01:00
parent f6c439c57e
commit bf7d3844d5

View File

@@ -95,10 +95,10 @@ static const uint16_t oda_app_ids[] {
0x0000, 0x0093, 0x0BCB, 0x0C24, 0x0CC1, 0x0D45, 0x0D8B, 0x0E2C, 0x0E31, 0x0F87, 0x0000, 0x0093, 0x0BCB, 0x0C24, 0x0CC1, 0x0D45, 0x0D8B, 0x0E2C, 0x0E31, 0x0F87,
0x125F, 0x1BDA, 0x1C5E, 0x1C68, 0x1CB1, 0x1D47, 0x1DC2, 0x1DC5, 0x1E8F, 0x4400, 0x125F, 0x1BDA, 0x1C5E, 0x1C68, 0x1CB1, 0x1D47, 0x1DC2, 0x1DC5, 0x1E8F, 0x4400,
0x4AA1, 0x4AB7, 0x4BA2, 0x4BD7, 0x4BD8, 0x4C59, 0x4D87, 0x4D95, 0x4D9A, 0x50DD, 0x4AA1, 0x4AB7, 0x4BA2, 0x4BD7, 0x4BD8, 0x4C59, 0x4D87, 0x4D95, 0x4D9A, 0x50DD,
0x5757, 0x6363, 0x6365, 0x6552, 0x6A7A, 0x7373, 0xA112, 0xA911, 0xABCE, 0xABCF, 0x5757, 0x6363, 0x6365, 0x6552, 0x6A7A, 0x7373, 0xA112, 0xA911, 0xABCF, 0xC350,
0xBE22, 0xC350, 0xC3A1, 0xC3B0, 0xC3C3, 0xC4D4, 0xC549, 0xC563, 0xC6A7, 0xC737, 0xC3A1, 0xC3B0, 0xC3C3, 0xC4D4, 0xC549, 0xC563, 0xC6A7, 0xC737, 0xCB73, 0xCB97,
0xCB73, 0xCB97, 0xCC21, 0xCD19, 0xCD46, 0xCD47, 0xCD9E, 0xCE6B, 0xE123, 0xE1C1, 0xCC21, 0xCD46, 0xCD47, 0xCD9E, 0xCE6B, 0xE123, 0xE1C1, 0xE319, 0xE411, 0xE440,
0xE319, 0xE411, 0xE440, 0xE4A6, 0xE5D7, 0xE911, 0xFF70, 0xFF7F, 0xFF80, 0xFF81 0xE4A6, 0xE5D7, 0xE911, 0xFF7F, 0xFF80
}; };
static const char* const ECCtext[] { static const char* const ECCtext[] {
@@ -468,60 +468,57 @@ static const char* const oda_app_names[] {
"Cross referencing DAB within RDS", "Cross referencing DAB within RDS",
"Leisure & Practical Info for Drivers", "Leisure & Practical Info for Drivers",
"ELECTRABEL-DSM 7", "ELECTRABEL-DSM 7",
"WiPla Broadcast Control Signal", "Wireless Playground broadcast control signal",
"RDS-TMC: ALERT-C / EN ISO 14819-1 (for testing use, only)", "RDS-TMC: ALERT-C / EN ISO 14819-1",
"ELECTRABEL-DSM 18", "ELECTRABEL-DSM 18",
"ELECTRABEL-DSM 3", "ELECTRABEL-DSM 3",
"ELECTRABEL-DSM 13", "ELECTRABEL-DSM 13",
"ELECTRABEL-DSM 2", "ELECTRABEL-DSM 2",
"I-FM-RDS for Fixed and Mobile devices", "I-FM-RDS for fixed and mobile devices",
"ELECTRABEL-DSM 1", "ELECTRABEL-DSM 1",
"ELECTRABEL-DSM 20", "ELECTRABEL-DSM 20",
"ITIS In-vehicle database", "ITIS In-vehicle data base",
"ELECTRABEL-DSM 10", "ELECTRABEL-DSM 10",
"ELECTRABEL-DSM 4", "ELECTRABEL-DSM 4",
"CITIBUS 4", "CITIBUS 4",
"Encrypted TTI using ALERT-Plus only (for testing use, only)", "Encrypted TTI using ALERT-Plus",
"ELECTRABEL-DSM 17", "ELECTRABEL-DSM 17",
"RDS-Light", "RDS-Light",
"RASANT", "RASANT",
"ELECTRABEL-DSM 9", "ELECTRABEL-DSM 9",
"ELECTRABEL-DSM 5", "ELECTRABEL-DSM 5",
"RadioText Plus / RT+ for group 2A RT", "RadioText+ (RT+)",
"RadioText Plus / RT+ for eRT", "RadioText Plus / RT+for eRT",
"CITIBUS 2", "CITIBUS 2",
"Radio Commerce System (RCS)", "Radio Commerce System (RCS)",
"ELECTRABEL-DSM 16", "ELECTRABEL-DSM 16",
"ELECTRABEL-DSM 11", "ELECTRABEL-DSM 11",
"To warn people in case of disasters or emergency", "To warn people in case of disasters or emergency",
"Personal weather station", "Personal weather station",
"Hybradio RDS-Net (for testing use, only)", "Hybradio RDS-Net(for testing use, only)",
"RDS2 9 bit AF lists ODA", "RDS2 9 bit AF lists ODA",
"Enhanced RadioText / eRT", "Enhanced RadioText (eRT)",
"Warning receiver", "Warning receiver",
"Enhanced early warning system", "Enhanced early warning system",
"NL _ Alert system", "NL _ Alert system",
"Data FM Selective Multipoint Messaging", "Data FM Selective Multipoint Messaging",
"Fleximax"
"RF Power Monitoring", "RF Power Monitoring",
"Push-Ad" "NRSC Song Title and Artist",
"NRSC Song title and artist",
"Personal Radio Service", "Personal Radio Service",
"iTunes tagging", "iTunes Tagging",
"Traffic Plus", "NAVTEQ Traffic Plus",
"eEAS", "eEAS",
"Smart Grid Broadcast Channel", "Smart Grid Broadcast Channel",
"ID Logic", "ID Logic",
"Veil Enabled Interactive Device", "Veil Enabled Interactive Device",
"UMC - Utility Message Channel", "Utility Message Channel (UMC)",
"CITIBUS 1", "CITIBUS 1",
"ELECTRABEL-DSM 14", "ELECTRABEL-DSM 14",
"CITIBUS 3", "CITIBUS 3",
"TokenMe",
"RDS-TMC: ALERT-C", "RDS-TMC: ALERT-C",
"RDS-TMC: ALERT-C", "RDS-TMC: ALERT-C",
"ELECTRABEL-DSM 8", "ELECTRABEL-DSM 8",
"Encrypted TTI using ALERT-Plus only (for service use, only)", "Encrypted TTI using ALERT-Plus",
"APS Gateway", "APS Gateway",
"Action code", "Action code",
"ELECTRABEL-DSM 12", "ELECTRABEL-DSM 12",
@@ -530,10 +527,8 @@ static const char* const oda_app_names[] {
"ELECTRABEL-DSM 19", "ELECTRABEL-DSM 19",
"ELECTRABEL-DSM 6", "ELECTRABEL-DSM 6",
"EAS open protocol", "EAS open protocol",
"Internet connection",
"RFT: Station logo", "RFT: Station logo",
"RFT: Slideshow", "RFT+ (work title)"
"RFT: Journaline (work title)"
}; };
struct DABFrequencyLabel { struct DABFrequencyLabel {