RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

print () clean-ups

This commit is contained in:
Daniel Pavel 2012-12-12 21:43:55 +02:00
parent 1c4d3d5f13
commit f4b92ee690
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/solaar.py
View File

@ -71,7 +71,7 @@ def _run(args):
# initializes the receiver listener # initializes the receiver listener
def check_for_listener(notify=False): def check_for_listener(notify=False):
# print ("check_for_listener %s" % notify) # print ("check_for_listener", notify)
global listener global listener
listener = None listener = None

36
app/solaar_cli.py
View File

@ -50,7 +50,7 @@ def _find_device(receiver, name):
if number in range(1, 1 + receiver.max_devices): if number in range(1, 1 + receiver.max_devices):
dev = receiver[number] dev = receiver[number]
if dev is None: if dev is None:
_fail("no paired device with number %d" % number) _fail("no paired device with number", number)
return dev return dev
if len(name) < 3: if len(name) < 3:
@ -80,12 +80,12 @@ def _print_receiver(receiver, verbose=False):
return return
print ("-: Unifying Receiver") print ("-: Unifying Receiver")
print (" Device path : %s" % receiver.path) print (" Device path :", receiver.path)
print (" Serial : %s" % receiver.serial) print (" Serial :", receiver.serial)
for f in receiver.firmware: for f in receiver.firmware:
print (" %-11s: %s" % (f.kind, f.version)) print (" %-11s: %s" % (f.kind, f.version))
print (" Has %d paired device(s)." % paired_count) print (" Has", paired_count, "paired device(s).")
notification_flags = receiver.request(0x8100) notification_flags = receiver.request(0x8100)
if notification_flags: if notification_flags:
@ -101,32 +101,32 @@ def _print_receiver(receiver, verbose=False):
activity = receiver.request(0x83B3) activity = receiver.request(0x83B3)
if activity: if activity:
activity = [(d, ord(activity[d - 1:d])) for d in range(1, receiver.max_devices)] activity = [(d, ord(activity[d - 1:d])) for d in range(1, receiver.max_devices)]
print(" Device activity counters: %s" % ', '.join(('%d=%d' % (d, a)) for d, a in activity if a > 0)) print (" Device activity counters:", ', '.join(('%d=%d' % (d, a)) for d, a in activity if a > 0))
def _print_device(dev, verbose=False): def _print_device(dev, verbose=False):
p = dev.protocol p = dev.protocol
state = '' if p > 0 else ' inactive' state = '' if p > 0 else 'inactive'
if not verbose: if not verbose:
print ("%d: %s [%s:%s]%s" % (dev.number, dev.name, dev.codename, dev.serial, state)) print ("%d: %s [%s:%s]" % (dev.number, dev.name, dev.codename, dev.serial), state)
return return
print ("%d: %s" % (dev.number, dev.name)) print ("%d: %s" % (dev.number, dev.name))
print (" Codename : %s" % dev.codename) print (" Codename :", dev.codename)
print (" Kind : %s" % dev.kind) print (" Kind :", dev.kind)
if p == 0: if p == 0:
print (" Protocol : unknown (device is inactive)") print (" Protocol : unknown (device is inactive)")
else: else:
print (" Protocol : HID++ %1.1f" % p) print (" Protocol : HID++ %1.1f" % p)
print (" Polling rate : %d ms" % dev.polling_rate) print (" Polling rate :", dev.polling_rate, "ms")
print (" Wireless PID : %s" % dev.wpid) print (" Wireless PID :", dev.wpid)
print (" Serial number: %s" % dev.serial) print (" Serial number:", dev.serial)
for fw in dev.firmware: for fw in dev.firmware:
print (" %-11s: %s" % (fw.kind, (fw.name + ' ' + fw.version).strip())) print (" %-11s:" % fw.kind, (fw.name + ' ' + fw.version).strip())
if dev.power_switch_location: if dev.power_switch_location:
print (" The power switch is located on the %s" % dev.power_switch_location) print (" The power switch is located on the", dev.power_switch_location)
from logitech.unifying_receiver import hidpp10, hidpp20 from logitech.unifying_receiver import hidpp10, hidpp20
if p > 0: if p > 0:
@ -137,13 +137,13 @@ def _print_device(dev, verbose=False):
flags = dev.request(0x0000, feature.bytes(2)) flags = dev.request(0x0000, feature.bytes(2))
flags = 0 if flags is None else ord(flags[1:2]) flags = 0 if flags is None else ord(flags[1:2])
flags = hidpp20.FEATURE_FLAG.flag_names(flags) flags = hidpp20.FEATURE_FLAG.flag_names(flags)
print (" %2d: %-20s {%04X} %s" % (index, feature, feature, flags)) print (" %2d: %-20s {%04X} %s" % (index, feature, feature, ', '.join(flags)))
if dev.keys: if dev.keys:
print (" Has %d reprogrammable keys:" % len(dev.keys)) print (" Has %d reprogrammable keys:" % len(dev.keys))
for k in dev.keys: for k in dev.keys:
flags = hidpp20.KEY_FLAG.flag_names(k.flags) flags = hidpp20.KEY_FLAG.flag_names(k.flags)
print (" %2d: %-20s => %-20s %s" % (k.index, k.key, k.task, flags)) print (" %2d: %-20s => %-20s %s" % (k.index, k.key, k.task, ', '.join(flags)))
if p > 0: if p > 0:
battery = hidpp20.get_battery(dev) battery = hidpp20.get_battery(dev)
@ -151,7 +151,7 @@ def _print_device(dev, verbose=False):
battery = hidpp10.get_battery(dev) battery = hidpp10.get_battery(dev)
if battery: if battery:
charge, status = battery charge, status = battery
print (" Battery is %d%% charged, %s" % (charge, status)) print (" Battery is %d%% charged," % charge, status)
else: else:
print (" Battery status unavailable.") print (" Battery status unavailable.")
else: else:
@ -327,7 +327,7 @@ def config_device(receiver, args):
result = setting.write(value) result = setting.write(value)
if result is None: if result is None:
_fail("failed to set '%s' to '%s'" % (setting.name, value)) _fail("failed to set '%s' = '%s' [%s]" % (setting.name, value, repr(value)))
print ("%s = %s" % (setting.name, result)) print ("%s = %s" % (setting.name, result))
# #

4
lib/hidapi/hidconsole.py
View File

@ -115,7 +115,7 @@ def _open(device, hidpp):
if not device: if not device:
sys.exit("!! Device path required.") sys.exit("!! Device path required.")
print (".. Opening device %s" % device) print (".. Opening device", device)
handle = hidapi.open_path(device) handle = hidapi.open_path(device)
if not handle: if not handle:
sys.exit("!! Failed to open %s, aborting." % device) sys.exit("!! Failed to open %s, aborting." % device)
@ -200,7 +200,7 @@ if __name__ == '__main__':
except Exception as e: except Exception as e:
print ('%s: %s' % (type(e).__name__, e)) print ('%s: %s' % (type(e).__name__, e))
print (".. Closing handle %s" % repr(handle)) print (".. Closing handle", repr(handle))
hidapi.close(handle) hidapi.close(handle)
if interactive: if interactive:
readline.write_history_file(args.history) readline.write_history_file(args.history)