[chirp_devel] [PATCH 11/22] Fix style issues in bandplans (#2355)
Zach Welch
Sat Feb 28 22:54:48 PST 2015
# HG changeset patch
# User Zach Welch <zach at mandolincreekfarm.com>
# Fake Node ID 7d3493b9676f5135f801077a0338d405631f01e0
Fix style issues in bandplans (#2355)
diff --git a/chirp/bandplan_au.py b/chirp/bandplan_au.py
index 136ef93..9f4ba50 100644
--- a/chirp/bandplan_au.py
+++ b/chirp/bandplan_au.py
@@ -20,9 +20,10 @@ from chirp import bandplan, bandplan_iaru_r3
SHORTNAME = "australia"
DESC = {
- "name": "Australian Amateur Band Plan",
+ "name": "Australian Amateur Band Plan",
"updated": "April 2010",
- "url": "http://www.wia.org.au/members/bandplans/data/documents/Australian%20Band%20Plans%20100404.pdf",
+ "url": "http://www.wia.org.au/members/bandplans/data"
+ "/documents/Australian%20Band%20Plans%20100404.pdf",
}
BANDS_10M = (
diff --git a/chirp/bandplan_iaru_r1.py b/chirp/bandplan_iaru_r1.py
index f71be4a..e41b0ee 100644
--- a/chirp/bandplan_iaru_r1.py
+++ b/chirp/bandplan_iaru_r1.py
@@ -18,8 +18,9 @@ from chirp import bandplan
SHORTNAME = "iaru_r1"
DESC = {
- "name": "IARU Region 1 (Europe, Africa, Middle East and Northern Asia)",
- "url": "http://iaru-r1.org/index.php?option=com_content&view=article&id=175&Itemid=127",
+ "name": "IARU Region 1 (Europe, Africa, Middle East and Northern Asia)",
+ "url": "http://iaru-r1.org/index.php?option=com_content"
+ "&view=article&id=175&Itemid=127",
"updated": "General Conference Sun City 2011",
}
@@ -60,8 +61,8 @@ BANDS_40M = (
bandplan.Band((7053000, 7060000), "All modes, digimodes"),
bandplan.Band((7060000, 7100000), "All modes, SSB contest preferred",
mode="LSB"),
- bandplan.Band((7100000, 7130000), "All modes, R1 Emergency Center Of Activity",
- mode="LSB"),
+ bandplan.Band((7100000, 7130000),
+ "All modes, R1 Emergency Center Of Activity", mode="LSB"),
bandplan.Band((7130000, 7200000), "All modes, SSB contest preferred",
mode="LSB"),
bandplan.Band((7175000, 7200000), "All modes, SSB DX preferred", mode="LSB"),
@@ -82,8 +83,8 @@ BANDS_20M = (
bandplan.Band((14101000, 14112000), "All narrow band modes, digimodes"),
bandplan.Band((14125000, 14350000), "All modes, SSB contest preferred",
mode="USB"),
- bandplan.Band((14300000, 14350000), "All modes, Global Emergency center of activity",
- mode="USB"),
+ bandplan.Band((14300000, 14350000),
+ "All modes, Global Emergency center of activity", mode="USB"),
)
BANDS_17M = (
@@ -99,7 +100,8 @@ BANDS_15M = (
bandplan.Band((21000000, 21450000), "15 Meter Band"),
bandplan.Band((21000000, 21070000), "CW", mode="CW"),
bandplan.Band((21070000, 21090000), "All narrow band modes, digimodes"),
- bandplan.Band((21090000, 21110000), "All narrow band, digimodes, unattended"),
+ bandplan.Band((21090000, 21110000),
+ "All narrow band, digimodes, unattended"),
bandplan.Band((21110000, 21120000), "All modes, digimodes, unattended"),
bandplan.Band((21120000, 21149000), "All narrow band modes"),
bandplan.Band((21149000, 21151000), "IBP, exclusively for beacons",
@@ -120,7 +122,8 @@ BANDS_10M = (
bandplan.Band((28000000, 29700000), "10 Meter Band"),
bandplan.Band((28000000, 28070000), "CW", mode="CW"),
bandplan.Band((28070000, 28120000), "All narrow band modes, digimodes"),
- bandplan.Band((28120000, 28150000), "All narrow band, digimodes, unattended"),
+ bandplan.Band((28120000, 28150000),
+ "All narrow band, digimodes, unattended"),
bandplan.Band((28150000, 28190000), "All narrow band modes"),
bandplan.Band((28190000, 28199000), "Beacons", mode="CW"),
bandplan.Band((28199000, 28201000), "IBP, exclusively for beacons",
diff --git a/chirp/bandplan_na.py b/chirp/bandplan_na.py
index ba46c8c..50bbb27 100644
--- a/chirp/bandplan_na.py
+++ b/chirp/bandplan_na.py
@@ -20,7 +20,7 @@ SHORTNAME = "north_america"
DESC = {
"name": "North American Band Plan",
- "url": "http://www.arrl.org/band-plan"
+ "url": "http://www.arrl.org/band-plan"
}
BANDS_160M = (
@@ -36,25 +36,25 @@ BANDS_80M = (
bandplan.Band((3570000, 3600000), "RTTY/Data", mode="RTTY"),
bandplan.Band((3790000, 3800000), "DX window"),
)
-
+
BANDS_40M = (
bandplan.Band((7000000, 7300000), "40 Meter Band"),
bandplan.Band((7080000, 7125000), "RTTY/Data", mode="RTTY"),
)
-
+
BANDS_30M = (
bandplan.Band((10100000, 10150000), "30 Meter Band"),
bandplan.Band((10130000, 10140000), "RTTY", mode="RTTY"),
bandplan.Band((10140000, 10150000), "Packet"),
)
-
+
BANDS_20M = (
bandplan.Band((14000000, 14350000), "20 Meter Band"),
bandplan.Band((14070000, 14095000), "RTTY", mode="RTTY"),
bandplan.Band((14095000, 14099500), "Packet"),
bandplan.Band((14100500, 14112000), "Packet"),
)
-
+
BANDS_17M = (
bandplan.Band((18068000, 18168000), "17 Meter Band"),
bandplan.Band((18100000, 18105000), "RTTY", mode="RTTY"),
@@ -71,7 +71,7 @@ BANDS_12M = (
bandplan.Band((24920000, 24925000), "RTTY", mode="RTTY"),
bandplan.Band((24925000, 24930000), "Packet"),
)
-
+
BANDS_10M = (
bandplan.Band((28000000, 29700000), "10 Meter Band"),
bandplan.Band((28000000, 28070000), "CW", mode="CW"),
@@ -83,7 +83,7 @@ BANDS_10M = (
bandplan.Band((29300000, 29510000), "Satellite Downlinks"),
bandplan.Band((29520000, 29590000), "Repeater Inputs",
step_khz=10, mode="NFM"),
- bandplan.Band((29610000, 29700000), "Repeater Outputs",
+ bandplan.Band((29610000, 29700000), "Repeater Outputs",
step_khz=10, mode="NFM", input_offset=-890000),
)
@@ -177,7 +177,7 @@ BANDS_70CM = (
bandplan.Band((447000000, 450000000), "Repeater inputs and outputs "
"(local option)", input_offset=-5000000),
)
-
+
BANDS_33CM = (
bandplan.Band((902000000, 928000000), "33 Centimeter Band"),
bandplan.Band((902075000, 902100000), "CW/SSB, Weak signal"),
@@ -206,8 +206,9 @@ BANDS_23CM = (
"with 1258.000-1260.000", mode="FM"),
bandplan.Band((1248000000, 1252000000), "Digital"),
bandplan.Band((1252000000, 1258000000), "ATV Channel #2"),
- bandplan.Band((1258000000, 1260000000), "Point-to-point links paired "
- "with 1246.000-1248.000", mode="FM"),
+ bandplan.Band((1258000000, 1260000000),
+ "Point-to-point links paired with 1246.000-1248.000",
+ mode="FM"),
bandplan.Band((1240000000, 1260000000), "Regional option, FM ATV"),
bandplan.Band((1260000000, 1270000000), "Satellite uplinks, Experimental, "
"Simplex ATV"),
@@ -238,8 +239,8 @@ BANDS_13CM = (
"paired with 2393 - 2393.750"),
bandplan.Band((2303750000, 2304000000), "SSB, CW, digital weak-signal"),
bandplan.Band((2304000000, 2304100000), "Weak Signal EME Band, <3kHz"),
- bandplan.Band((2304100000, 2304300000), "SSB, CW, digital weak-signal, <3kHz"
- ),
+ bandplan.Band((2304100000, 2304300000),
+ "SSB, CW, digital weak-signal, <3kHz"),
bandplan.Band((2304300000, 2304400000), "Beacons, <3kHz"),
bandplan.Band((2304400000, 2304750000), "SSB, CW, digital weak-signal and "
"NBFM, <6kHz"),
diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist
index a2e1803..36f1013 100644
--- a/tools/cpep8.blacklist
+++ b/tools/cpep8.blacklist
@@ -5,11 +5,6 @@
./chirp/alinco.py
./chirp/anytone.py
./chirp/ap510.py
-./chirp/bandplan_au.py
-./chirp/bandplan_iaru_r1.py
-./chirp/bandplan_iaru_r2.py
-./chirp/bandplan_iaru_r3.py
-./chirp/bandplan_na.py
./chirp/baofeng_uv3r.py
./chirp/bjuv55.py
./chirp/ft1802.py
More information about the chirp_devel
mailing list