# HG changeset patch
# User drewp@bigasterisk.com
# Date 1581663503 28800
# Node ID 098ea942aefe3836013dee457e6a9c1bfbe85fdd
# Parent  e505b6c9fe9de184534261e827e520af47b31096
merge rules.n3 again
Ignore-this: f2cfb9e027e888551ebb1cd569f75f3e

diff -r e505b6c9fe9d -r 098ea942aefe service/reasoning/rules.n3
--- a/service/reasoning/rules.n3	Thu Feb 13 10:26:38 2020 -0800
+++ b/service/reasoning/rules.n3	Thu Feb 13 22:58:23 2020 -0800
@@ -34,28 +34,28 @@
 { env: :localHour 22 } => { env: :localHour :awakeTime } .
 { env: :localHour 23 } => { env: :localHour :awakeTime } .
 
-# #{
-# #  # this won't update right, currently, since I don't let the exact
-# #  # idle time into the rules recalculator. This threshold should be
-# #  # applied upstream.
-# # 
-# #  dash:xidle :idleTimeMinutes ?idle .
-# #  # broken with new  fuxi- needs review:    ?idle math:lessThan 30 .
-# #} => {
-# #  :drew :at :desk .
-# #  # the plan here is that as soon as we can show that I'm not at my
-# #  # desk (cell phone wifi, asleep, etc), power the screen off
-# #} .
-# #
-# #@prefix shuttle: <http://bigasterisk.com/room/livingRoom/shuttlepro/> .
-# #@prefix mpd: <http://bigasterisk.com/host/slash/mpd> .
-# #
-# #{ ?button :state :press . ?button :playsMusic ?song } => { mpd: :startMusic ?song } .
-# ## the rest of this modeling is still a mess. Handled completely by special case in reasoning.py
-# #{ shuttle:button12 :state :press         } => { mpd: :playState :pause } .
-# #{ shuttle:dial :change :clockwise        } => { mpd: :audioState :volumeStepUp } .
-# #{ shuttle:dial :change :counterclockwise } => { mpd: :audioState :volumeStepDown } .
-# #
+#{
+#  # this won't update right, currently, since I don't let the exact
+#  # idle time into the rules recalculator. This threshold should be
+#  # applied upstream.
+# 
+#  dash:xidle :idleTimeMinutes ?idle .
+#  # broken with new  fuxi- needs review:    ?idle math:lessThan 30 .
+#} => {
+#  :drew :at :desk .
+#  # the plan here is that as soon as we can show that I'm not at my
+#  # desk (cell phone wifi, asleep, etc), power the screen off
+#} .
+#
+#@prefix shuttle: <http://bigasterisk.com/room/livingRoom/shuttlepro/> .
+#@prefix mpd: <http://bigasterisk.com/host/slash/mpd> .
+#
+#{ ?button :state :press . ?button :playsMusic ?song } => { mpd: :startMusic ?song } .
+## the rest of this modeling is still a mess. Handled completely by special case in reasoning.py
+#{ shuttle:button12 :state :press         } => { mpd: :playState :pause } .
+#{ shuttle:dial :change :clockwise        } => { mpd: :audioState :volumeStepUp } .
+#{ shuttle:dial :change :counterclockwise } => { mpd: :audioState :volumeStepDown } .
+#
 
 
 { sensor:motionStorage :seesRecently :motion . } => {
@@ -201,7 +201,3 @@
   :frontWindow :line3 "Open" .
 } .
 
-# { :switch1 :buttonState :pressed .
-# } => {
-#   :switch1 :demo :received .
-# } .