new config

master
ademant 2019-08-21 10:22:54 +02:00
parent 0e1bdacf4e
commit f51c22dbb4
2 changed files with 10 additions and 24 deletions

View File

@ -13,9 +13,9 @@
"sensebox_id": "5cf60a0907460b001b8881fd", "sensebox_id": "5cf60a0907460b001b8881fd",
"push_count": 20, "push_count": 20,
"sensors": { "sensors": {
"temperature": "5cf60a0907460b001b888200", "111": "5cf60a0907460b001b888200",
"humidity": "5cf60a0907460b001b8881ff", "112": "5cf60a0907460b001b8881ff",
"pressure": "5cf60a0907460b001b8881fe" "113": "5cf60a0907460b001b8881fe"
} }
}, },
"sqlserver": "sqlserver":
@ -74,19 +74,15 @@
"1A1":{"varname":"pm25","sensor":"sds011","i2c":0}, "1A1":{"varname":"pm25","sensor":"sds011","i2c":0},
"1A2":{"varname":"pm10","sensor":"sds011","i2c":0} "1A2":{"varname":"pm10","sensor":"sds011","i2c":0}
}}, }},
"bme280": "bme280":{"enable": 1, "port": 1,"address": "0x77","id":["111","112","113"]},
{"enable": 1, "port": 1,"address": "0x77"},
"tristar": "tristar":
{"enable": 1, "port": "/dev/serial/by-id/usb-Prolific_Technology_Inc._USB-Serial_Controller_D-if00-port0","baud": 9600,"timeout": 1}, {"enable": 1, "port": "/dev/serial/by-id/usb-Prolific_Technology_Inc._USB-Serial_Controller_D-if00-port0","baud": 9600,"timeout": 1,"id":["170","171","172","173","174","175","176","177","178","179","17A","17B","17C","17D","17E","17F","180","181"]},
"vedirect": "vedirect":
{"enable": 0, "port": "/dev/serial/by-id/usb-VictronEnergy_BV_VE_Direct_cable_VE1SSBVT-if00-port0"}, {"enable": 0, "port": "/dev/serial/by-id/usb-VictronEnergy_BV_VE_Direct_cable_VE1SSBVT-if00-port0","id":["192","194","195","196"]},
"mcp9808": {"enable": 1}, "mcp9808": {"enable": 1,"id":["131"]},
"tsl2591": "tsl2591":{"enable": 1, "port": 1,"address": "0x29","id":["141"]},
{"enable": 1, "port": 1,"address": "0x29"}, "veml6070":{"enable": 1, "port": 1,"id":["151"]},
"veml6070": "ads1x15":{"enable": 1,"gain": 1,"id":["160","161","162","163","164","165","166","167"],
{"enable": 1, "port": 1},
"ads1x15":
{"enable": 1,"gain": 1,
"adc":{ "adc":{
"a":{"type":1115,"address": "0x49","busnum": 1}, "a":{"type":1115,"address": "0x49","busnum": 1},
"b":{"type":1115,"address": "0x48","busnum": 1} "b":{"type":1115,"address": "0x48","busnum": 1}

View File

@ -25,16 +25,6 @@ for n in parameter:
cpu_meas=meas_data(var_name="temperature",ring_length=parameter['ring_length'],device=parameter['device'],sensor="CPU",store_dir="/home/pi/log",digits=4,check_last=parameter['check_last']) cpu_meas=meas_data(var_name="temperature",ring_length=parameter['ring_length'],device=parameter['device'],sensor="CPU",store_dir="/home/pi/log",digits=4,check_last=parameter['check_last'])
cpu_meas.set_sql(host="localhost",port=8080,min_wait=parameter['wait']) cpu_meas.set_sql(host="localhost",port=8080,min_wait=parameter['wait'])
cpu_meas.set_rsa("25A4CF79414F10FD") cpu_meas.set_rsa("25A4CF79414F10FD")
#requests.post("http://localhost:8080/data/"+str(cpu_meas.json_out['hash']),json=cpu_meas.json_out)
#if "sqlserver" in log_conf:
# hostname="banana"
# if "host" in log_conf['sqlserver']:
# hostname=log_conf['sqlserver']['host']
# port=24049
# if "port" in log_conf['sqlserver']:
# port=int(log_conf['sqlserver']['port'])
# cpu_meas.set_sql(host=hostname,port=port)
bmqtt=False bmqtt=False
if "mqtt" in log_conf: if "mqtt" in log_conf: