Changeset 883 for trunk

Timestamp:

11/02/2008 18:45:21 (9 months ago)

Author:

james

Message:

fixed going to sleep output

Files:

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

trunk/modules/system.tcl

@@ -941 +941 @@
 # go to sleep
 proc bMotion_go_to_sleep { } {
-        # ok this is the plan
-        # 1. announce we feel tired
-        # 2. ???
-        # 3. sleep
+# ok this is the plan
+# 1. announce we feel tired
+# 2. ???
+# 3. sleep
         global bMotionSettings BMOTION_SLEEP bMotionChannels
         bMotion_update_chanlist
@@ -951 +951 @@
                 bMotion_putloglev 3 * "considering awake -> bedtime"
                 if {[rand 10] > 3} {
-                        # announce we're tired
+                # announce we're tired
                         set bMotionSettings(asleep) $BMOTION_SLEEP(BEDTIME)
                         putlog "bMotion: preparing to go to bed"
@@ -970 +970 @@
                 bMotion_putloglev 3 * "considering bedtime -> sleep"
                 if {[rand 10] > 3} {
-                        set bMotionSettings(asleep) $BMOTION_SLEEP(ASLEEP)
-                        putserv "AWAY :ZzZz"
-                        # go to sleep
-                        foreach chan $bMotionChannels {
-                                if [bMotion_is_active_enough $chan] {
-                                        bMotion_putloglev 3 * "sending sleeping output to $chan"
-                                        bMotionDoAction $chan "" "%VAR{go_sleeps}"
-                                }
-                        }
-                        putlog "bMotion: gone to sleep"
+                # go to sleep
                         set hour [bMotion_setting_get "wakeytime_hour"]
                         set minute [bMotion_setting_get "wakeytime_minute"]
                         set bMotionSettings(sleepy_nextchange) [bMotion_sleep_next_event "$hour:$minute"]
+                        catch {
+                                foreach chan $bMotionChannels {
+                                        if [bMotion_is_active_enough $chan] {
+                                                bMotion_putloglev 3 * "sending sleeping output to $chan"
+                                                bMotionDoAction $chan "" "%VAR{go_sleeps}"
+                                        }
+                                }
+                        }
+                        set bMotionSettings(asleep) $BMOTION_SLEEP(ASLEEP)
+                        putserv "AWAY :ZzZz"
+                        putlog "bMotion: gone to sleep"
                         return
                 } else {
@@ -1002 +1004 @@
                         set bMotionSettings(asleep) $BMOTION_SLEEP(AWAKE)
                         putserv "AWAY"
+
+                        set hour [bMotion_setting_get "bedtime_hour"]
+                        set minute [bMotion_setting_get "bedtime_minute"]
+                        set bMotionSettings(sleepy_nextchange) [bMotion_sleep_next_event "$hour:$minute"]
 
                         foreach chan $bMotionChannels {
@@ -1012 +1018 @@
                         }
                         
-                        set hour [bMotion_setting_get "bedtime_hour"]
-                        set minute [bMotion_setting_get "bedtime_minute"]
-                        set bMotionSettings(sleepy_nextchange) [bMotion_sleep_next_event "$hour:$minute"]
                         return
                 } else {