Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/eurobot

Conflicts:
	src/types/robottype.idl

diff --git a/src/types/config.pl b/src/types/config.pl
index 0c20728b7c7ae9b25710504166e4239b999d9c95..e6672bbc2b8b9d677a0d9f50f9431e02bc4dabc0 100755 (executable)
--- a/src/types/config.pl
+++ b/src/types/config.pl
@@ -16,6 +16,9 @@ $callback_name                                = "callback";
 $callback_arg                          = "arg";
 $orte_domain                           = "orte_domain";
 
+$refresh_period                                = 3;
+$expiration_time                       = 10;
+
 $publication_persistence               = "3";
 $publication_strength                  = "1";
 $publication_callback_enabled          = undef;

diff --git a/src/types/roboortegen.pl b/src/types/roboortegen.pl
index b10eec2da208b26b7dbac20403d27f2510f03c2c..52107e0933040212fb853a1832939bcee25c0d44 100755 (executable)
--- a/src/types/roboortegen.pl
+++ b/src/types/roboortegen.pl
@@ -398,15 +398,18 @@ print OUTFILE << "(END)";
 ROBOORTE_INIT()
 {
 \tint rv = 0;
-\t
+\tORTEDomainProp prop;
 \tORTEInit();
 
 \tif ($data_arg_name->strength < 0)
 \t\t$data_arg_name->strength = $publication_strength;
 
 \tORTEVerbositySetOptions("ALL.0");
+\tORTEDomainPropDefaultGet(&prop);
+\tNTPTIME_BUILD(prop.baseProp.refreshPeriod, $refresh_period);
+\tNTPTIME_BUILD(prop.baseProp.expirationTime, $expiration_time);
 \t$data_arg_name->$orte_domain = ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,
-\t                                     NULL, NULL, ORTE_FALSE);
+\t                                     &prop, NULL, ORTE_FALSE);
 \tif (!$data_arg_name->$orte_domain) {
 \t\tprintf("ORTEDomainAppCreate failed!\\n");
 \t\trv = -1;

diff --git a/src/types/robottype.idl b/src/types/robottype.idl
index 3ab5cb24a7a231043533b66f5ecbd8236a74155c..ba57e4ff0cc41f23ecd0e35007516a9a8a4b60ef 100644 (file)
--- a/src/types/robottype.idl
+++ b/src/types/robottype.idl
@@ -142,7 +142,7 @@ struct fsm_state {
 };
 
 struct camera_control {
-    octet on;
+    boolean on;
     octet game_color;
 };