X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=r3-webstatus-spaceapi%2Fmain.go;h=114777e323ddff0d4e4fe7276aa96d76c9573a44;hb=7867988775a7b6ec1604a863b665e46ac91e70ac;hp=28c094bf07ff378f514825910d93016150364a50;hpb=b30fa8619ab41857c9c15aa939e05f2e406b8192;p=svn42.git

diff --git a/r3-webstatus-spaceapi/main.go b/r3-webstatus-spaceapi/main.go
index 28c094b..114777e 100644
--- a/r3-webstatus-spaceapi/main.go
+++ b/r3-webstatus-spaceapi/main.go
@@ -9,6 +9,7 @@ import (
 	"net/url"
 	"regexp"
 	"time"
+    "strconv"
 )
 
 type SpaceState struct {
@@ -72,24 +73,22 @@ func parseSocketInputLine(line string) {
 
 	if match_presence != nil {
 		statusstate.present = (match_presence[1] == "yes")
+        spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("Torwaechter", "Front Door", match_presence[2] == "closed"))
 		publishStateToWeb()
 	} else if match_button != nil {
 		statusstate.buttonpress_until = time.Now().Unix() + 3600
 		spaceapidata.AddSpaceEvent("PanicButton", "check-in", "The button has been pressed")
 		publishStateToWeb()
 	} else if match_temp != nil {
-		spaceapidata.UpdateSensorData("temp", "Ceiling", match_temp[1]+"C")
-		//newtemp, err = strconv.ParseFloat((match_temp[1]), 32)
-		//if err == nil {
-		//	spaceapidata.UpdateSensorData("temp", "Ceiling", strconv.FormatFloat(newtemp, 'f', 2, 32)+"C")
-		//	spacestate.temperature = newtemp
-		//}
+		newtemp, err := strconv.ParseFloat((match_temp[1]), 32)
+		if err == nil {
+            spaceapidata.MergeInSensor(spaceapi.MakeTempCSensor("Temp0","Ceiling",newtemp))
+		}
 	} else if match_photo != nil {
-		spaceapidata.UpdateSensorData("light", "Front", match_photo[1])
-		//newphoto, err = strconv.ParseInt(match_photo[1], 10, 32)
-		//if err == nil {
-		//	spacestate.lightlevel = newphoto
-		//}
+		newphoto, err := strconv.ParseInt(match_photo[1], 10, 32)
+		if err == nil {
+			spaceapidata.MergeInSensor(spaceapi.MakeIlluminationSensor("Photodiode","Ceiling","1024V/5V",newphoto))
+		}
 	}
 }
 
@@ -118,7 +117,7 @@ ReOpenSocket:
 func main() {
 	spaceapidata.AddSpaceFeed("calendar", "application/rss+xml", "http://grical.realraum.at/s/?query=!realraum&view=rss")
 	spaceapidata.AddSpaceFeed("google+", "text/html", "https://plus.google.com/113737596421797426873")
-	spaceapidata.AddSpaceContactInfo("+43780700888524", "irc://irc.oftc.net/#realraum", "realraum@realraum.at", "realraum@realraum.at", "realraum@realraum.at")
+	spaceapidata.AddSpaceContactInfo("+43780700888524", "irc://irc.oftc.net/#realraum", "realraum@realraum.at", "realraum@realraum.at", "realraum@realraum.at", "vorstand@realraum.at")
 	eventqueue := make(chan string)
 	ticker := time.NewTicker(time.Duration(15) * time.Minute)
 	go readFromUSocket("/var/run/tuer/presence.socket", eventqueue)