From 5da9cf0bf2dea016dc2f2521d92f927b0230858f Mon Sep 17 00:00:00 2001 From: Bruce Yang Date: Mon, 16 Dec 2019 01:20:13 -0500 Subject: [PATCH] Update callsign_info.py Fix Group B (was identical to Group A) Add detail about some unavailable calls --- resources/callsign_info.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/resources/callsign_info.py b/resources/callsign_info.py index 047f1df..0366421 100644 --- a/resources/callsign_info.py +++ b/resources/callsign_info.py @@ -20,13 +20,11 @@ us_calls = OrderedDict([('**Group A** (Extra Only)', ('**Any:** K, N, W (1x2)\n' '**Alaska:** AL, KL, NL, WL (2x1)\n' '**Caribbean:** KP, NP, WP (2x1)\n' '**Pacific:** AH, KH, NH, WH (2x1)')), - ('**Group B** (Advanced and Extra Only)', ('**Any:** K, N, W (1x2)\n' - ' AA-AL, KA-KZ, NA-NZ, WA-WZ (2x1)\n' - ' AA-AL (2x2)\n' + ('**Group B** (Advanced and Extra Only)', ('**Any:** KA-KZ, NA-NZ, WA-WZ (2x2)\n' '*Except*\n' - '**Alaska:** AL, KL, NL, WL (2x1)\n' - '**Caribbean:** KP, NP, WP (2x1)\n' - '**Pacific:** AH, KH, NH, WH (2x1)')), + '**Alaska:** AL (2x2)\n' + '**Caribbean:** KP (2x2)\n' + '**Pacific:** AH (2x2)')), ('**Group C** (Technician, General, Advanced, Extra Only)', ('**Any Region:** K, N, W (1x3)\n' '*Except*\n' '**Alaska:** KL, NL, WL (2x2)\n' @@ -48,10 +46,10 @@ us_calls = OrderedDict([('**Group A** (Extra Only)', ('**Any:** K, N, W (1x2)\n' 'now Republic of the Marshall Islands (V73)\n' '- Any suffix SOS or QRA-QUZ\n' '- Any 2x3 with X as the first suffix letter\n' - '- Any 2x3 with AF, KF, NF, or WF prefix and suffix EMA\n' - '- Any 2x3 with AA-AL, NA-NZ, WC, WK, WM, WR, or WT prefix\n' + '- Any 2x3 with AF, KF, NF, or WF prefix and suffix EMA: FEMA\n' + '- Any 2x3 with AA-AL, NA-NZ, WC, WK, WM, WR, or WT prefix: "Group X"\n' '- Any 2x1, 2x2, or 2x3 with KP, NP, WP prefix and 0, 6, 7, 8, 9 number\n' - '- Any 1x1 callsign'))]) + '- Any 1x1 callsign: Special Event'))]) # format: country: (title, description, text) options = {'us': (us_calls_title, us_calls_desc, us_calls)}