|
From: Jérémie D. <Ba...@us...> - 2010-04-23 15:42:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via 53011d40f475d331129d27c4494e551dffac308a (commit)
from 4e1406903f99434b59ebcadf6236dc6d65f0932c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53011d40f475d331129d27c4494e551dffac308a
Author: Jérémie Dimino <dim@gaia.(none)>
Date: Fri Apr 23 17:40:35 2010 +0200
use Obus_property.updates for monitoring robot properties
-----------------------------------------------------------------------
Changes:
diff --git a/info/control/clients/controller.ml b/info/control/clients/controller.ml
index 72c8bbd..cf5792f 100644
--- a/info/control/clients/controller.ml
+++ b/info/control/clients/controller.ml
@@ -452,18 +452,19 @@ lwt () =
notify box;
notify logs;
notify services;
-
- lwt () = OBus_bus.add_match bus (OBus_match.rule ~typ:`Signal ~member:"ProppertiesChanged" ()) in
- let _ =
- Lwt_sequence.add_l
- (function
- | { OBus_message.typ = OBus_message.Signal(_, _, "PropertiesChanged") } as msg ->
- push ();
- Some msg
- | msg ->
- Some msg)
- (OBus_connection.incoming_filters bus)
+ let notify_property property =
+ Lwt_event.always_notify
+ (fun _ -> push ())
+ (OBus_property.updates property)
in
+ notify_property (Krobot.compass krobot);
+ notify_property (Krobot.logic_sensors krobot);
+ notify_property (Krobot.range_finders krobot);
+ notify_property (Krobot.inhibit_forward_until krobot);
+ notify_property (Krobot.inhibit_backward_until krobot);
+ notify_property (Krobot.Card.state krobot `Interface);
+ notify_property (Krobot.Card.state krobot `Sensor);
+ notify_property (Krobot.Card.state krobot `Motor);
List.iter
(fun card ->
hooks/post-receive
--
krobot
|