Controller target
This commit is contained in:
parent
75629ec087
commit
563d6a4e07
3 changed files with 112 additions and 113 deletions
14
g5kwatt.py
14
g5kwatt.py
|
|
@ -36,7 +36,7 @@ def fetch(site, node, start, stop, user, psw):
|
|||
"w_avg": ws / (stop - start)
|
||||
}
|
||||
|
||||
def insert_wh_into_logfile(path, site, node, user, psw):
|
||||
def insert_wh_into_logfile(path, site, user, psw):
|
||||
# Read
|
||||
logfile = open(path, "r")
|
||||
lines = logfile.readlines()
|
||||
|
|
@ -44,9 +44,6 @@ def insert_wh_into_logfile(path, site, node, user, psw):
|
|||
|
||||
# Parse
|
||||
colnames = lines[0].removesuffix("\n").split(" ")
|
||||
col_start = colnames.index("start")
|
||||
col_start = colnames.index("stop")
|
||||
col_start = colnames.index("Wh")
|
||||
|
||||
logs = []
|
||||
records = {}
|
||||
|
|
@ -72,7 +69,7 @@ def insert_wh_into_logfile(path, site, node, user, psw):
|
|||
# Modify
|
||||
if col == "Wh" and (log[col] == "-" or log[col] == "0") and not abort:
|
||||
try:
|
||||
measure = fetch(site, node, float(log["start"]), float(log["stop"]), user, psw)
|
||||
measure = fetch(site, log["target"], float(log["start"]), float(log["stop"]), user, psw)
|
||||
log[col] = str(measure["Wh"])
|
||||
except Exception as e:
|
||||
print("Abort:", e)
|
||||
|
|
@ -102,16 +99,15 @@ def get_psw():
|
|||
def main():
|
||||
if len(sys.argv) < 5:
|
||||
print("Usage:")
|
||||
print("python g5watt.py <user> <site> <node> <logfile_path>")
|
||||
print("python g5watt.py <user> <site> <logfile_path>")
|
||||
exit(0)
|
||||
|
||||
user = sys.argv[1]
|
||||
site = sys.argv[2]
|
||||
node = sys.argv[3]
|
||||
path = sys.argv[4]
|
||||
path = sys.argv[3]
|
||||
|
||||
psw = get_psw()
|
||||
insert_wh_into_logfile(path, site, node, user, psw)
|
||||
insert_wh_into_logfile(path, site, user, psw)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue