Merge branch 'master' of github.com:john30/ebusd

This commit is contained in:
john30
2016-07-24 10:50:31 +02:00
+6 -4
View File
@@ -137,7 +137,6 @@ log all notice
grab grab
info info
state state
scan full
read -c "hallo du" ich read -c "hallo du" ich
h h
h r h r
@@ -183,6 +182,7 @@ hex fe070400
hex 53070400 hex 53070400
dump dump
grab result grab result
scan full
r -c mc.5 -d g3 HeatingCurve r -c mc.5 -d g3 HeatingCurve
r -c mc.5 -d 00 HeatingCurve r -c mc.5 -d 00 HeatingCurve
r -c mc.5 -m 999999 HeatingCurve r -c mc.5 -m 999999 HeatingCurve
@@ -217,11 +217,13 @@ if [ "$status" = 0 ]; then
done done
echo "scan result:" echo "scan result:"
./src/tools/ebusctl -p 8877 scan result ./src/tools/ebusctl -p 8877 scan result
curl http://localhost:8080/data/ >/dev/null curl http://localhost:8878/data/ >/dev/null
curl "http://localhost:8080/data/?verbose=1" >/dev/null curl "http://localhost:8878/data/?verbose=1" >/dev/null
curl -T .travis.yml http://localhost:8080/data/ curl -T .travis.yml http://localhost:8878/data/
echo "commands done" echo "commands done"
fi fi
echo "ebusd log:"
cat "$PWD/ebusd.log"
sleep 5 sleep 5
kill $pid kill $pid
kill $srvpid kill $srvpid