From: Jérémie D. <Ba...@us...> - 2010-02-11 16:09:06
|
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 c382ce049a0f6289d3b02d9db51b97ef788ef00f (commit) from 9a1b10ff61b5e18787f09759fe14c1d2aefb7d09 (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 c382ce049a0f6289d3b02d9db51b97ef788ef00f Author: Jérémie Dimino <je...@di...> Date: Thu Feb 11 17:08:25 2010 +0100 missing files common/types.{ml,mli} and driver/bus.conf ----------------------------------------------------------------------- Changes: diff --git a/PC_Mainboard/common/types.ml b/PC_Mainboard/common/types.ml new file mode 100644 index 0000000..cb42817 --- /dev/null +++ b/PC_Mainboard/common/types.ml @@ -0,0 +1,36 @@ +(* + * types.ml + * -------- + * Copyright : (c) 2010, Jeremie Dimino <je...@di...> + * Licence : BSD3 + * + * This file is a part of [kro]bot. + *) + +open OBus_pervasives + +type move_result = [ `OK | `Stopped ] + +let obus_move_result = + OBus_type.mapping obus_int [(`OK, 0); (`Stopped, 1)] + +type motor = [ `Left | `Right | `Both ] + +let obus_motor = OBus_type.mapping obus_int + [(`Left, -1); + (`Both, 0); + (`Right, 1)] + +type stop_mode = [ `Off | `Abrupt | `Smooth ] + +let obus_stop_mode = OBus_type.mapping obus_int + [(`Off, 0); + (`Abrupt, 1); + (`Smooth, 2)] + +type card_state = [ `Running | `Opening | `Closed ] + +let obus_card_state = OBus_type.mapping obus_int + [(`Running, 0); + (`Opening, 1); + (`Closed, 2)] diff --git a/PC_Mainboard/common/types.mli b/PC_Mainboard/common/types.mli new file mode 100644 index 0000000..35eed37 --- /dev/null +++ b/PC_Mainboard/common/types.mli @@ -0,0 +1,29 @@ +(* + * types.mli + * --------- + * Copyright : (c) 2010, Jeremie Dimino <je...@di...> + * Licence : BSD3 + * + * This file is a part of [kro]bot. + *) + +(** Common types with their obus type combinators *) + +(** This types are used by the driver and the client-side krobot + library. + + Putting in a module shared by the client and the server prevents + typos in conversions. *) + +type move_result = [ `OK | `Stopped ] with obus(basic) + (** Result of a movement started by [Krobot.move] or + [Krobot.turn] *) + +type motor = [ `Left | `Right | `Both ] with obus(basic) + (** Motors *) + +type stop_mode = [ `Off | `Abrupt | `Smooth ] with obus(basic) + (** Mode for stopping motors *) + +type card_state = [ `Running | `Opening | `Closed ] with obus(basic) + (** State of a card *) diff --git a/PC_Mainboard/driver/bus.conf b/PC_Mainboard/driver/bus.conf new file mode 100644 index 0000000..9808b8e --- /dev/null +++ b/PC_Mainboard/driver/bus.conf @@ -0,0 +1,30 @@ +<!-- Configuration for the dbus daemon --> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <keep_umask/> + + <!-- Krobot dbus daemon address --> + <listen>unix:abstract=krobot</listen> + + <!-- Allow everything --> + <policy context="default"> + <allow send_destination="*" eavesdrop="true"/> + <allow eavesdrop="true"/> + <allow own="*"/> + </policy> + + <!-- Raise limits --> + <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_message_size">1000000000</limit> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit> + <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> +</busconfig> hooks/post-receive -- krobot |