[chirp_devel] [PATCH] Use FM instead of NFM in North American bandplan. Fixes #4497

[Tom Hayward]

# HG changeset patch
# User Tom Hayward <tom at tomh.us>
# Date 1486411785 28800
#      Mon Feb 06 12:09:45 2017 -0800
# Node ID 185a329c38c825b71230e278a9261debaa00d1e2
# Parent  0b106b40782e7eefd2faadeac8484f976217aecb
Use FM instead of NFM in North American bandplan. Fixes #4497

diff -r 0b106b40782e -r 185a329c38c8 chirp/bandplan_na.py
--- a/chirp/bandplan_na.py	Mon Feb 06 12:06:24 2017 -0800
+++ b/chirp/bandplan_na.py	Mon Feb 06 12:09:45 2017 -0800
@@ -82,9 +82,9 @@
   bandplan.Band((29000000, 29200000), "AM", mode="AM"),
   bandplan.Band((29300000, 29510000), "Satellite Downlinks"),
   bandplan.Band((29520000, 29590000), "Repeater Inputs",
-                step_khz=10, mode="NFM"),
+                step_khz=10, mode="FM"),
   bandplan.Band((29610000, 29700000), "Repeater Outputs",
-                step_khz=10, mode="NFM", input_offset=-890000),
+                step_khz=10, mode="FM", input_offset=-890000),
 )
 
 BANDS_6M = (
@@ -103,10 +103,10 @@
                 input_offset=-500000),
   bandplan.Band((51620000, 51680000), "Digital repeater outputs",
                 input_offset=-500000),
-  bandplan.Band((52020000, 52040000), "FM simplex", mode="NFM"),
+  bandplan.Band((52020000, 52040000), "FM simplex", mode="FM"),
   bandplan.Band((52500000, 52980000), "Repeater outputs B",
-                input_offset=-500000, step_khz=20, mode="NFM"),
-  bandplan.Band((53000000, 53100000), "FM simplex", mode="NFM"),
+                input_offset=-500000, step_khz=20, mode="FM"),
+  bandplan.Band((53000000, 53100000), "FM simplex", mode="FM"),
   bandplan.Band((53100000, 53400000), "Radio remote control", step_khz=100),
   bandplan.Band((53500000, 53980000), "Repeater outputs C",
                 input_offset=-500000),
@@ -125,13 +125,13 @@
                 mode="USB"),
   bandplan.Band((144275000, 144300000), "Propagation beacons", mode="CW"),
   bandplan.Band((144300000, 144500000), "OSCAR subband"),
-  bandplan.Band((144600000, 144900000), "FM repeater inputs", mode="NFM"),
+  bandplan.Band((144600000, 144900000), "FM repeater inputs", mode="FM"),
   bandplan.Band((144900000, 145100000), "Weak signal and FM simplex",
-                mode="NFM", step_khz=10),
+                mode="FM", step_khz=10),
   bandplan.Band((145100000, 145200000), "Linear translator outputs",
                 input_offset=-600000),
   bandplan.Band((145200000, 145500000), "FM repeater outputs",
-                input_offset=-600000, mode="NFM",),
+                input_offset=-600000, mode="FM",),
   bandplan.Band((145500000, 145800000), "Misc and experimental modes"),
   bandplan.Band((145800000, 146000000), "OSCAR subband"),
   bandplan.Band((146400000, 146580000), "Simplex"),
@@ -149,12 +149,12 @@
   bandplan.Band((222050000, 222060000), "Propagation beacons"),
   bandplan.Band((222100000, 222150000), "Weak-signal CW & SSB"),
   bandplan.Band((222150000, 222250000), "Local coordinator's option"),
-  bandplan.Band((223400000, 223520000), "FM simplex", mode="NFM"),
+  bandplan.Band((223400000, 223520000), "FM simplex", mode="FM"),
   bandplan.Band((223520000, 223640000), "Digital, packet"),
   bandplan.Band((223640000, 223700000), "Links, control"),
   bandplan.Band((223710000, 223850000), "Local coordinator's option"),
   bandplan.Band((223850000, 224980000), "Repeater outputs only",
-                mode="NFM", input_offset=-1600000),
+                mode="FM", input_offset=-1600000),
 )
 
 BANDS_70CM = (