mirror of
https://github.com/kk7ds/chirp.git
synced 2024-09-21 10:37:15 +00:00
vx8: Remove invalid NFM option
It has been reported (and confirmed locally and in the manual) that the radio's "half deviation" setting is global for the entire radio and not per-memory like the current mapping suggests. I think the recording of that was actually a mistake, confused by the yaesu-esque "auto" mode option. So, this removes NFM from the supported modes since the radio can't actually do it per-memory. Fixes: #11275
This commit is contained in:
parent
0e7baccd34
commit
4b2f399dc4
@ -151,7 +151,7 @@ struct {
|
||||
#seekto 0x328A;
|
||||
struct {
|
||||
u8 unknown1a:2,
|
||||
half_deviation:1,
|
||||
half_deviation:1, // This is not really right, maybe auto?
|
||||
unknown1b:5;
|
||||
u8 mode:2,
|
||||
duplex:2,
|
||||
@ -337,7 +337,7 @@ u8 checksum;
|
||||
|
||||
TMODES = ["", "Tone", "TSQL", "DTCS"]
|
||||
DUPLEX = ["", "-", "+", "split"]
|
||||
MODES = ["FM", "AM", "WFM", "NFM"]
|
||||
MODES = ["FM", "AM", "WFM"]
|
||||
STEPS = [5.0, 6.25, 8.33, 9.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0,
|
||||
100.0, 200.0]
|
||||
SKIPS = ["", "S", "P"]
|
||||
@ -656,9 +656,6 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio):
|
||||
mem.duplex = DUPLEX[_mem.duplex]
|
||||
if mem.duplex == "split":
|
||||
mem.offset = chirp_common.fix_rounded_step(mem.offset)
|
||||
if _mem.mode == "FM" and _mem.half_deviation == 1:
|
||||
mem.mode = "NFM"
|
||||
else:
|
||||
mem.mode = MODES[_mem.mode]
|
||||
mem.dtcs = chirp_common.DTCS_CODES[_mem.dcs]
|
||||
mem.tuning_step = STEPS[_mem.tune_step]
|
||||
@ -705,10 +702,6 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio):
|
||||
_mem.tone = chirp_common.TONES.index(mem.rtone)
|
||||
_mem.tone_mode = TMODES.index(mem.tmode)
|
||||
_mem.duplex = DUPLEX.index(mem.duplex)
|
||||
if mem.mode == "NFM":
|
||||
_mem.mode = 0 # Yaesu's NFM, i.e. regular FM
|
||||
_mem.half_deviation = 1 # but half bandwidth
|
||||
else:
|
||||
_mem.mode = MODES.index(mem.mode)
|
||||
_mem.half_deviation = 0
|
||||
_mem.mode = MODES.index(mem.mode)
|
||||
|
Loading…
Reference in New Issue
Block a user