From 78aae1cb6cddb369bfea848222a0ff12708a09e7 Mon Sep 17 00:00:00 2001 From: Cole Deck Date: Wed, 30 Dec 2020 19:02:03 -0600 Subject: [PATCH] Fix formatting and comments --- pwm.py | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/pwm.py b/pwm.py index f0e4e76..6df9edc 100755 --- a/pwm.py +++ b/pwm.py @@ -2,6 +2,8 @@ import run_cmd import argparse import time + +# Variables to determine bounds MAXFAN = 6 MINSPEED = 35 MAXSPEED = 100 @@ -10,35 +12,32 @@ MAXTEMP = 65 parser = argparse.ArgumentParser(description='Read information about and control fans on ASRock boards with IPMI.', prog='asrock-pwm-ipmi') parser.add_argument('fanplusspeed', nargs='*', metavar='FAN:SPEED', - help='Fan to change the speed of, and the speed, separated by \':\'. Set to 0 for auto.') -#parser.add_argument('SPEED', type=int, nargs='+', -# help='Speed to set FAN to') + help='Fan to change the speed of, and the speed, separated by \':\'. Set to 0 for auto.') parser.add_argument('-i', '--info', action="store_true", default=False, - help='Read fan information') + help='Read fan information') parser.add_argument('-a', '--auto', action="store_true", default=False, - help='Service to control fans based on temperature') + help='Service to control fans based on temperature') parser.add_argument('-q', '--quiet', action="store_true", default=False, - help='Hide output') + help='Hide output') args = parser.parse_args() -#print(args.info) + #print(args) -#print(args.fanplusspeed) + fanChanged = False def iterateFans(info): for fanopt in info: - if str(fanopt.split(":"))[2:-2] == fanopt or int(fanopt.split(":")[0]) < 1 or int(fanopt.split(":")[0]) > MAXFAN: - print("Improper format!") - continue - fan, speed = fanopt.split(":") - run_cmd.setSpeed(int(fan), int(speed)) - fanChanged = True - if args.quiet is False: - if int(speed) == 0: - print("Set speed of FAN" + fan + " to Auto.") - else: - print("Set speed of FAN" + fan + " to " + speed + "%.") - + if str(fanopt.split(":"))[2:-2] == fanopt or int(fanopt.split(":")[0]) < 1 or int(fanopt.split(":")[0]) > MAXFAN: + print("Improper format!") + continue + fan, speed = fanopt.split(":") + run_cmd.setSpeed(int(fan), int(speed)) + fanChanged = True + if args.quiet is False: + if int(speed) == 0: + print("Set speed of FAN" + fan + " to Auto.") + else: + print("Set speed of FAN" + fan + " to " + speed + "%.") while args.auto is True: temp = run_cmd.getTemp() @@ -48,14 +47,14 @@ while args.auto is True: speeds.append(str(i) + ":1") elif temp > MAXTEMP: for i in range(2, 7): - speeds.append(str(i) + ":100") + speeds.append(str(i) + ":100") else: base = temp - MINTEMP max = MAXTEMP - MINTEMP scaled = base / max speed = int(scaled * (MAXSPEED - MINSPEED) + MINSPEED) for i in range(2, 7): - speeds.append(str(i) + ":" + str(speed)) + speeds.append(str(i) + ":" + str(speed)) iterateFans(speeds) if args.info is False and len(args.fanplusspeed) == 0: @@ -69,4 +68,4 @@ if args.info is True: time.sleep(5) print("\nRetrieving fan speeds...\n") for line in run_cmd.getFanInfo(): - print(line) + print(line) \ No newline at end of file