mirror of
https://github.com/kevinveenbirkenbach/erinaco.git
synced 2024-11-23 14:31:04 +01:00
In between commit - don't know what I did, it's to long ago ;)
This commit is contained in:
parent
2c90bc7db6
commit
aaefa64556
@ -60,14 +60,14 @@ def doIt(order):
|
|||||||
'h': lambda: help(),
|
'h': lambda: help(),
|
||||||
'q': lambda: autopilot(),
|
'q': lambda: autopilot(),
|
||||||
'x': lambda: core.turnDegree(int(input("Grad:"))),
|
'x': lambda: core.turnDegree(int(input("Grad:"))),
|
||||||
'w': lambda: core.runCm(int(input("cm:"))),
|
'r': lambda: core.runCm(int(input("cm:"))),
|
||||||
}
|
}
|
||||||
func = switcher.get(order, lambda: print("Der gewuenschte Befehl steht nicht zur Verfuegung"))
|
func = switcher.get(order, lambda: print("Der gewuenschte Befehl steht nicht zur Verfuegung"))
|
||||||
return func();
|
return func();
|
||||||
print("Herzlich Willkommen im manuellen Controll-Interface!\n")
|
print("Herzlich Willkommen im manuellen Controll-Interface!\n")
|
||||||
try:
|
try:
|
||||||
while True:
|
while True:
|
||||||
core.setSensorValues()
|
#core.setSensorValues()
|
||||||
modus=getch.getch();
|
modus=getch.getch();
|
||||||
print("Erinaco>>{0}".format(modus))
|
print("Erinaco>>{0}".format(modus))
|
||||||
doIt(modus);
|
doIt(modus);
|
||||||
|
@ -1,7 +1,21 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# @param string $1 Client-Ip
|
||||||
|
# @author kf
|
||||||
|
# @since 2017-10-22
|
||||||
|
#
|
||||||
# Streamt ein Video auf Vaio
|
# Streamt ein Video auf Vaio
|
||||||
#/opt/vc/bin/raspivid --hflip --vflip -t 0 -o - | nc 192.168.178.30 5001
|
#/opt/vc/bin/raspivid --hflip --vflip -t 0 -o - | nc 192.168.178.30 5001
|
||||||
|
#
|
||||||
# Auf Vaio muss
|
# Auf Vaio muss
|
||||||
# nc -l -p 5001 | mplayer -fps 31 -cache 1024 -
|
# nc -l -p 5001 | mplayer -fps 31 -cache 1024 -
|
||||||
# ausgefuehert werden
|
# ausgefuehert werden
|
||||||
/opt/vc/bin/raspivid -w 640 -h 480 --hflip --vflip -t 0 -o - | nc 192.168.178.30 5001
|
|
||||||
|
clientname="$1.fritz.box"
|
||||||
|
# main
|
||||||
|
if [ "$#" -gt "0" ]
|
||||||
|
then
|
||||||
|
sudo /opt/vc/bin/raspivid -w 640 -h 480 --hflip --vflip -t 0 -o - | nc $1 5001
|
||||||
|
else
|
||||||
|
head -n 11 camera.sh
|
||||||
|
echo "Es wurden nicht alle benoetigten Parameter uebergeben"
|
||||||
|
fi
|
||||||
|
16
vero.py
16
vero.py
@ -22,16 +22,16 @@ class Vero(object):
|
|||||||
self.timestampValue=0;
|
self.timestampValue=0;
|
||||||
def printValues(self):
|
def printValues(self):
|
||||||
#self.dht.setValues();
|
#self.dht.setValues();
|
||||||
print("PIR: {0}".format(self.pirValue));
|
print("PIR: {0}".format(self.pir.getValue()));
|
||||||
#print("Temperatur: {0}".format(self.dht.getTemperatur()));
|
#print("Temperatur: {0}".format(self.dht.getTemperatur()));
|
||||||
#print("Luftfeuchtigkeit: {0}".format(self.dht.getLuftfeuchtigkeit()));
|
#print("Luftfeuchtigkeit: {0}".format(self.dht.getLuftfeuchtigkeit()));
|
||||||
print("Ultraschall-Links: {0}cm".format(self.ultraschallLinksValue));
|
print("Ultraschall-Links: {0}cm".format(self.ultraschallLinks.getValue()));
|
||||||
print("Ultraschall-Mitte: {0}cm".format(self.ultraschallMitteValue));
|
print("Ultraschall-Mitte: {0}cm".format(self.ultraschallMitte.getValue()));
|
||||||
print("Ultraschall-Rechts: {0}cm".format(self.ultraschallRechtsValue));
|
print("Ultraschall-Rechts: {0}cm".format(self.ultraschallRechts.getValue()));
|
||||||
print("Infarot Links: {0}".format(self.infarotLinksValue));
|
print("Infarot Links: {0}".format(self.infarotLinks.getValue()));
|
||||||
print("Infarot Mitte-Links: {0}".format(self.infarotMitteLinksValue));
|
print("Infarot Mitte-Links: {0}".format(self.infarotMitteLinks.getValue()));
|
||||||
print("Infarot Mitte-Rechts: {0}".format(self.infarotMitteRechtsValue));
|
print("Infarot Mitte-Rechts: {0}".format(self.infarotMitteRechts.getValue()));
|
||||||
print("Infarot Rechts: {0}".format(self.infarotRechtsValue));
|
print("Infarot Rechts: {0}".format(self.infarotRechts.getValue()));
|
||||||
def saveToDB(self): #Speichert die Werte in der Datenbank
|
def saveToDB(self): #Speichert die Werte in der Datenbank
|
||||||
pass
|
pass
|
||||||
def setSensorValues(self):
|
def setSensorValues(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user