X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fmetamovement.go;h=a24d4ed579615176f476152acc8106b8a4b5944e;hb=b07f14117f5b11ddce087d6a9177587c9438ca65;hp=e61838deb48c0d00051b083c134cd3fde0eb1cff;hpb=0120a38079b5287d7da1cdaea4d779467f366c9c;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/metamovement.go b/go/r3-eventbroker_zmq/metamovement.go
index e61838d..a24d4ed 100644
--- a/go/r3-eventbroker_zmq/metamovement.go
+++ b/go/r3-eventbroker_zmq/metamovement.go
@@ -46,22 +46,21 @@ func MetaEventRoutine_Movement(ps *pubsub.PubSub, granularity, gran_duration int
                 last_movement2 = ts
                 last_movement3 = ts
             }
-
-            if last_movement > 0 && ts - last_movement < 3600*6 && ts - last_movement > 3600*3 {
-                last_movement = 0
-                ps.Pub( r3events.SomethingReallyIsMoving{false,99,ts}, "movement")
-            }
-            if last_movement1 > 0 && ts - last_movement < 3600*6 && ts - last_movement1 > 120 {
-                last_movement1 = 0
-                ps.Pub( r3events.SomethingReallyIsMoving{false,10,ts}, "movement")
-            }
-            if last_movement2 > 0 && ts - last_movement < 3600*6 && ts - last_movement2 > 1800 {
-                last_movement2 = 0
-                ps.Pub( r3events.SomethingReallyIsMoving{false,25,ts}, "movement")
-            }
-            if last_movement3 > 0 && ts - last_movement < 3600*6 && ts - last_movement3 > 3600 {
-                last_movement3 = 0
-                ps.Pub( r3events.SomethingReallyIsMoving{false,50,ts}, "movement")
+            // this sucks.....
+            if last_movement > 0 && ts - last_movement < 3600*6 {
+                if ts - last_movement > 3600*3 {
+                    last_movement = 0
+                    ps.Pub( r3events.SomethingReallyIsMoving{false,99,ts}, "movement")
+                } else if ts - last_movement > 3600 && last_movement3 > 0 {
+                    last_movement3 = 0
+                    ps.Pub( r3events.SomethingReallyIsMoving{false,50,ts}, "movement")
+                } else if ts - last_movement > 1800 && last_movement2 > 0 {
+                    last_movement2 = 0
+                    ps.Pub( r3events.SomethingReallyIsMoving{false,20,ts}, "movement")
+                } else if ts - last_movement > 120 && last_movement1 > 0 {
+                    last_movement1 = 0
+                    ps.Pub( r3events.SomethingReallyIsMoving{false,5,ts}, "movement")
+                }
             }
     } }
 }
\ No newline at end of file