Skip to content

W
White Rabbit Trigger Distribution
Commit 558ad6e4 authored by Dimitris Lampridis's avatar Dimitris Lampridis Committed by Dimitris Lampridis
Browse files
Options

sw: use positional arguments to format, to make code compatible with older python versions

parent 297ec658
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
software/lib/Python/PyWrtd/PyWrtd.py
View file @ 558ad6e4
......@@ -390,7 +390,7 @@ class PyWrtd():
code, msg = self.get_error()
else:
code, msg = ret, self.error_message(ret)
print('Error {}: {}'.format(hex(code% (1 << 32)), msg))
print('Error {0}: {1}'.format(hex(code% (1 << 32)), msg))
sys.exit(code)
else:
return ret
software/tools/wrtd-config.py
View file @ 558ad6e4
......@@ -29,7 +29,7 @@ def __tstamp_to_str(tstamp):
return 'Never'
else:
ret = __tstamp_normalise(tstamp)
return '{}.{:03d}.{:03d}.{:03d}+{:03d}'.format(
return '{0}.{1:03d}.{2:03d}.{3:03d}+{4:03d}'.format(
time.strftime('%F,%T', time.gmtime(ret['seconds'])),
int(ret['ns'] / 1e6),
int(ret['ns'] / 1e3) % 1000,
......@@ -51,14 +51,14 @@ def cmd_clear_log(wrtd, args):
def cmd_list_rules(wrtd, args):
count = wrtd.get_attr_int32(wrtd.WRTD_GLOBAL_REP_CAP_ID,
wrtd.WRTD_ATTR_RULE_COUNT)
print ('{} Rule{} defined{}'.format(count,
'' if (count == 1) else 's',
'.' if (count == 0) else ':'))
print ('{0} Rule{1} defined{2}'.format(count,
'' if (count == 1) else 's',
'.' if (count == 0) else ':'))
for i in range(count):
args.name = wrtd.get_rule_name(i)
if args.verbose:
print ()
print ('# {}'.format(args.name))
print ('# {0}'.format(args.name))
if args.verbose:
cmd_rule_info(wrtd, args)
......@@ -94,49 +94,49 @@ def cmd_disable_all_rules(wrtd, args):
def cmd_rule_info(wrtd, args):
print(" + Configuration")
print(" - Name..............: {}".format(args.name))
print(" - Source............: {}".format(
print(" - Name..............: {0}".format(args.name))
print(" - Source............: {0}".format(
wrtd.get_attr_string(args.name, wrtd.WRTD_ATTR_RULE_SOURCE)))
print(" - Destination.......: {}".format(
print(" - Destination.......: {0}".format(
wrtd.get_attr_string(args.name, wrtd.WRTD_ATTR_RULE_DESTINATION)))
print(" - Enabled...........: {}".format(
print(" - Enabled...........: {0}".format(
wrtd.get_attr_bool(args.name, wrtd.WRTD_ATTR_RULE_ENABLED)))
print(" - Send Late.........: {}".format(
print(" - Send Late.........: {0}".format(
wrtd.get_attr_bool(args.name, wrtd.WRTD_ATTR_RULE_SEND_LATE)))
print(" - Repeat Count......: {}".format(
print(" - Repeat Count......: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_RULE_REPEAT_COUNT)))
print(" - Delay.............: {:.3f}ns".format(__tstamp_to_ns(
print(" - Delay.............: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_RULE_DELAY))))
print(" - Holdoff...........: {:.3f}ns".format(__tstamp_to_ns(
print(" - Holdoff...........: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_RULE_HOLDOFF))))
print(" - Resync Period.....: {:.3f}ns".format(__tstamp_to_ns(
print(" - Resync Period.....: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_RULE_RESYNC_PERIOD))))
print(" - Resync Factor.....: {}".format(
print(" - Resync Factor.....: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_RULE_RESYNC_FACTOR)))
print(" + Statistics")
print(" - RX Events.........: {}".format(
print(" - RX Events.........: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_RX_EVENTS)))
print(" - Last RX...........: {}".format(__tstamp_to_str(
print(" - Last RX...........: {0}".format(__tstamp_to_str(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_STAT_RULE_RX_LAST))))
print(" - TX Events.........: {}".format(
print(" - TX Events.........: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_TX_EVENTS)))
print(" - Last TX...........: {}".format(__tstamp_to_str(
print(" - Last TX...........: {0}".format(__tstamp_to_str(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_STAT_RULE_TX_LAST))))
print(" - Lastency (min)....: {:.3f}ns".format(__tstamp_to_ns(
print(" - Lastency (min)....: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name,wrtd.WRTD_ATTR_STAT_RULE_RX_LATENCY_MIN))))
print(" - Lastency (avg)....: {:.3f}ns".format(__tstamp_to_ns(
print(" - Lastency (avg)....: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_STAT_RULE_RX_LATENCY_AVG))))
print(" - Lastency (max)....: {:.3f}ns".format(__tstamp_to_ns(
print(" - Lastency (max)....: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_STAT_RULE_RX_LATENCY_MAX))))
print(" - Missed (late).....: {}".format(
print(" - Missed (late).....: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_MISSED_LATE)))
print(" - Missed (holdoff)..: {}".format(
print(" - Missed (holdoff)..: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_MISSED_HOLDOFF)))
print(" - Missed (no sync)..: {}".format(
print(" - Missed (no sync)..: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_MISSED_NOSYNC)))
print(" - Missed (overflow).: {}".format(
print(" - Missed (overflow).: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_STAT_RULE_MISSED_OVERFLOW)))
print(" - Last Missed.......: {}".format(__tstamp_to_str(
print(" - Last Missed.......: {0}".format(__tstamp_to_str(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_STAT_RULE_MISSED_LAST))))
def cmd_reset_rule_stats(wrtd, args):
......@@ -145,14 +145,14 @@ def cmd_reset_rule_stats(wrtd, args):
def cmd_list_alarms(wrtd, args):
count = wrtd.get_attr_int32(wrtd.WRTD_GLOBAL_REP_CAP_ID,
wrtd.WRTD_ATTR_ALARM_COUNT)
print ('{} Alarm{} defined{}'.format(count,
'' if (count == 1) else 's',
'.' if (count == 0) else ':'))
print ('{0} Alarm{1} defined{2}'.format(count,
'' if (count == 1) else 's',
'.' if (count == 0) else ':'))
for i in range(count):
args.name = wrtd.get_alarm_name(i)
if args.verbose:
print ()
print ('# {}'.format(args.name))
print ('# {0}'.format(args.name))
if args.verbose:
cmd_alarm_info(wrtd, args)
......@@ -208,16 +208,16 @@ def cmd_disable_all_alarms(wrtd, args):
def cmd_alarm_info(wrtd, args):
print(" + Configuration")
print(" - Name..............: {}".format(args.name))
print(" - Enabled...........: {}".format(
print(" - Name..............: {0}".format(args.name))
print(" - Enabled...........: {0}".format(
wrtd.get_attr_bool(args.name, wrtd.WRTD_ATTR_ALARM_ENABLED)))
print(" - Trigger Time......: {}".format(__tstamp_to_str(
print(" - Trigger Time......: {0}".format(__tstamp_to_str(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_ALARM_TIME))))
print(" - Setup Time........: {}".format(__tstamp_to_str(
print(" - Setup Time........: {0}".format(__tstamp_to_str(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_ALARM_SETUP_TIME))))
print(" - Period............: {:.3f}ns".format(__tstamp_to_ns(
print(" - Period............: {0:.3f}ns".format(__tstamp_to_ns(
wrtd.get_attr_tstamp(args.name, wrtd.WRTD_ATTR_ALARM_PERIOD))))
print(" - Repeat Count......: {}".format(
print(" - Repeat Count......: {0}".format(
wrtd.get_attr_int32(args.name, wrtd.WRTD_ATTR_ALARM_REPEAT_COUNT)))
def time_interval(string):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment