Changeset 908 for trunk

Timestamp:

05/28/08 10:36:38 (7 months ago)

Author:

james

Message:

patch #159 from Johno Crawford

Files:

• trunk/modules/system.tcl (modified) (5 diffs)

trunk/modules/system.tcl

@@ -145 +145 @@
 # check if every channel we can see is idle enough for us to go away
 proc bMotion_random_away {} {
-        global bMotionLastEvent bMotionChannels bMotionInfo 
+        global bMotionLastEvent bMotionChannels bMotionInfo
 
         set timeNow [clock seconds]
@@ -171 +171 @@
                 }
         }
-        bMotion_putloglev 1 * "bMotion: most recent: $mostRecent .. timenow $timeNow .. gap [expr $bMotionInfo(maxIdleGap) * 10]"
-
-        set idleEnough 1
-
-        if {($timeNow - $mostRecent) < ([expr $bMotionInfo(maxIdleGap) * 10])} {
-                set idleEnough 0
-        }
-
-        if {!$idleEnough} {
+
+        set gapTime [expr { int($bMotionInfo(maxIdleGap) * 10) }]
+        bMotion_putloglev 1 * "bMotion: most recent: $mostRecent .. timenow $timeNow .. gap $gapTime"
+
+        if {($timeNow - $mostRecent) < $gapTime} {
                 return 0
         }
@@ -191 +187 @@
                 putlog "bMotion: All channels are idle, going away"
                 bMotionSetRandomAway
-                return 0
-        }
+                return 1
+        }
+
+        return 0
 }
 
@@ -225 +223 @@
 
         if [bMotion_random_away] {
-                # we went away, so stop here
+        # we went away, so stop here
                 return
         }
 
         if {$bMotionInfo(away) == 1} {
-                #away and busy again, return
+        #away and busy again, return
                 bMotionSetRandomBack
         }
@@ -246 +244 @@
                 if [bMotion_is_active_enough $channel] {
                         if [bMotion_is_active_enough $channel $active_idle_sec] {
-                                #channel is fairly busy
-                                if [bMotionSaySomethingRandom $channel 1] {
-                                        lappend saidChannels "$channel/active"
-                                } else {
-                                        lappend silentChannels $channel
-                                }
+                        #channel is fairly busy
+                        if [bMotionSaySomethingRandom $channel 1] {
+                        lappend saidChannels "$channel/active"
                         } else {
-                                #use a more idle randomstuff
-                                if [bMotionSaySomethingRandom $channel 0] {
-                                        lappend saidChannels $channel
-                                } else {
-                                        lappend silentChannels $channel
-                                }
+                        lappend silentChannels $channel
+                        }
+                        } else {
+                        #use a more idle randomstuff
+                        if [bMotionSaySomethingRandom $channel 0] {
+                        lappend saidChannels $channel
+                        } else {
+                        lappend silentChannels $channel
+                        }
                         }
                 } else {