Chaospott/powerpi
43
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some minor changes

Browse Source
This commit is contained in:
telegnom 2015-04-05 13:17:50 +02:00
parent b4de30f825
commit 101f78be57
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pi/power.py
View File

@ -13,13 +13,13 @@ def trans():
queuelast = time.time() queuelast = time.time()
while True: while True:
queuedata = powerqueue.get() queuedata = powerqueue.get()
queuetime = queuedata[0] queuetime = int(queuedata[0])
queueval = str(queuedata[1]) queueval = str(queuedata[1])
if ((queuetime - queuelast) >= 5): if ((queuetime - queuelast) >= 5):
payload = "val:" + str(queuetime) + ";" + queueval payload = {"val": str(queuetime) + ";" + str(queueval)}
if sys.stdout.isatty(): if sys.stdout.isatty():
print("request https://strom.ccc-ffm.de:2342/gettest.php => "+payload) print("request https://strom.ccc-ffm.de:2342/get.php => "+repr(payload))
r = requests.post("https://strom.ccc-ffm.de:2342/gettest.php", data=payload, verify=False, auth=('CCC', 'Freundschaft')) r = requests.post("https://strom.ccc-ffm.de:2342/get.php", data=payload, verify=False, auth=('CCC', 'Freundschaft'))
if sys.stdout.isatty(): if sys.stdout.isatty():
print(r) print(r)
queuelast = queuetime queuelast = queuetime

24
server/get.php
View File

@ -1,14 +1,14 @@
<?php <?php
if (preg_match("/^[0-9]{10}\.[0-9]{0,2};[0-9]{1,5}\.[0-9]{0,20}$/", $_POST['val'])) { if (preg_match("/^[0-9]{10}\;[0-9]{1,5}\.?[0-9]{0,20}/", $_POST['val'])) {
$val = explode(";", $_POST['val']); $val = explode(";", $_POST['val']);
$updator = new RRDUpdater("power.rrd"); $updator = new RRDUpdater("power.rrd");
$updator->update(array("power" => $val[1]), $val[0]); $updator->update(array("power" => $val[1]), $val[0]);
$fileh = fopen("power.log", "w+"); $fileh = fopen("power.log", "w+");
fwrite($fileh, $_POST['val']); fwrite($fileh, $_POST['val']);
fclose($fileh); fclose($fileh);
echo "0"; echo "0";
} else { } else {
echo "1"; echo "1";
} }
?> ?>