ham-ref/chirp
1
0
Fork 0
mirror of https://github.com/kk7ds/chirp synced 2026-08-13 17:51:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken chirpc setter commands

Browse source 
Setter commands using custom actions were broken in a number of
ways. Update custom action classes to make them work.
Fixes #9423
This commit is contained in:
Martin Cooper 2021-10-05 19:14:44 -07:00
parent f5ff086769
commit 5e838824d3
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
chirpc
View file

@ -44,29 +44,30 @@ def fail_missing_mmap():
class ToneAction(argparse.Action):
def __call__(self, parser, namespace, value, option_string=None):
if value in chirp_common.TONES:
raise argparse.ArgumentError("Invalid tone valeu: %.1f" % value)
def __call__(self, parser, namespace, values, option_string=None):
value = values[0]
if value not in chirp_common.TONES:
raise argparse.ArgumentError(
self, "Invalid tone value: %.1f" % value)
setattr(namespace, self.dest, value)
class DTCSAction(argparse.Action):
def __call__(self, parser, namespace, value, option_string=None):
try:
value = int(value, 10)
except ValueError:
raise argparse.ArgumentError("Invalid DTCS value: %s" % value)
def __call__(self, parser, namespace, values, option_string=None):
value = values[0]
if value not in chirp_common.DTCS_CODES:
raise argparse.ArgumentError("Invalid DTCS value: %03i" % value)
raise argparse.ArgumentError(
self, "Invalid DTCS value: %03i" % value)
setattr(namespace, self.dest, value)
class DTCSPolarityAction(argparse.Action):
def __call__(self, parser, namespace, value, option_string=None):
def __call__(self, parser, namespace, values, option_string=None):
value = values[0]
if value not in ["NN", "RN", "NR", "RR"]:
raise optparse.OptionValueError("Invaid DTCS polarity: %s" % value)
setattr(parser.values, option.dest, value)
raise argparse.ArgumentError(
self, "Invaid DTCS polarity: %s" % value)
setattr(namespace, self.dest, value)
def parse_memory_number(radio, args):