ademant
/
rasolar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change more logger

master
ademant 2019-11-18 19:16:37 +01:00
parent 099547373d
commit 64a377bba8
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log_sds.py
View File

@ -30,7 +30,7 @@ except:
log_conf=json.load(cf)
cf.close()
parameter={"device":socket.gethostname(),"mean_count":2,"deviceid":"FF","ring_length":30,"wait":0.1,"cycle":20,"check_last":2,"gpg_keyid":"","usbport":"/dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0","meascount":5,"meassleep":30,"digits":5,"store_dir":"/home/pi/log/","multiplicator":1000}
parameter={"device":socket.gethostname(),"mean_count":2,"deviceid":"FF","ring_length":30,"wait":0.1,"cycle":20,"check_last":2,"gpg_keyid":"","usbport":"/dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0","meascount":5,"meassleep":30,"digits":5,"store_dir":"/home/pi/log/","multiplicator":1000,"check_last_shrinking":0.9}
for n in parameter:
if n in log_conf:
parameter[n]=log_conf[n]

3
log_tristar.py
View File

@ -29,7 +29,7 @@ cf.close()
channel_names=[]
channel_info={}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sensor":sensor,"sigma":3}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"check_last_shrinking":0.9,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sensor":sensor,"sigma":3}
for n in parameter:
if n in log_conf:
parameter[n]=log_conf[n]
@ -93,6 +93,7 @@ if sensor in log_conf:
for i in ["volt_scale","amp_scale","volt_bat","volt_bat_sens","volt_arr","amp_bat","amp_arr","temp_heatsink","temp_bat","ah_res","ah_tot","kwh_res","kwh_tot","watt_in","watt_out","hour_tot","state","volt_sweep_mp","volt_sweep_oc"]:
parch=parameter
parch["var_name"]=i
parch["multiplicator"]=mult[i]
channel_info[i]={"meas_data": meas_data(parch)}
if bmqtt and ("mqtt" in log_conf[sensor]):
channel_info[i]['meas_data'].set_mqtt(broker=mbroker,port=mport)

3
log_vedirect.py
View File

@ -30,7 +30,7 @@ cf.close()
channel_names=[]
channel_info={}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sigma":3,"sensor":sensor}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"check_last_shrinking":0.9,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sigma":3,"sensor":sensor}
for n in parameter:
if n in log_conf:
parameter[n]=log_conf[n]
@ -85,6 +85,7 @@ if sensor in log_conf:
for i in varnames:
parch=parameter
parch["var_name"]=i
parch["multiplicator"]=mult[i]
channel_info[i]={"meas_data": meas_data(parch)}
if bmqtt and ("mqtt" in log_conf[sensor]):
channel_info[i]['meas_data'].set_mqtt(broker=mbroker,port=mport)

3
log_w1.py
View File

@ -30,7 +30,7 @@ cf.close()
channel_names=[]
channel_info={}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sensor":"w1"}
parameter={"device":socket.gethostname(),"deviceid":"FF","mean_count":5,"ring_length":10,"wait":0.5,"cycle":10,"check_last":5,"check_last_shrinking":0.9,"gpg_keyid":"","digits":3,"store_dir":"/home/pi/log/","multiplicator":1000,"sensor":"w1"}
for n in parameter:
if n in log_conf:
parameter[n]=log_conf[n]
@ -77,6 +77,7 @@ if sensor in log_conf:
except:
print("could not assign W1")
else:
parameter["sensor"]="w1/"+x
channel_info[x]={"meas_data": meas_data(parvar)}
if bmqtt and ("mqtt" in log_conf[sensor]):
channel_info[x]['meas_data'].set_mqtt(broker=mbroker,port=mport)

2
meas_data.py
View File

@ -18,7 +18,7 @@ except:
else:
has_mqtt=True
from uuid import getnode
_STRINGREMOVE=str.maketrans(dict.fromkeys("/:;\\{}(){]%&"))
_STRINGREMOVE=str.maketrans(dict.fromkeys(":;\\{}(){]%&"))
class meas_data:
def __init__(self,var_config=[]):