From 7c7aac31e9c9df988b25ff7e84d8d6c530f7387e Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Mon, 6 Feb 2012 11:32:12 +0100 Subject: [PATCH] Update time-related default values Aggregation time, check intervals, etc. By default the aggregator cannot fully aggregate calibration requests any more, only the positioning and autocalibration requests. In order to aggregate calibration requests, the aggregation timeout needs to be increased, or the number of packets of the request and the delay between each of them lowered. --- owlps-aggregator/owlps-aggregator.h | 6 +++--- owlps-listener/owlps-listener.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/owlps-aggregator/owlps-aggregator.h b/owlps-aggregator/owlps-aggregator.h index 55161e6..65d8973 100644 --- a/owlps-aggregator/owlps-aggregator.h +++ b/owlps-aggregator/owlps-aggregator.h @@ -11,10 +11,10 @@ /* Arguments & program configuration */ #define OPTIONS "Ac:C:Df:hH:i:k:K:l:o:O:p:qt:vV" // getopt string #define DEFAULT_CONFIG_FILE "/usr/local/etc/owlps/owlps-aggregator.conf" -#define DEFAULT_AGGREGATE_TIMEOUT 1500 // milliseconds +#define DEFAULT_AGGREGATE_TIMEOUT 600 // milliseconds #define DEFAULT_KEEP_TIMEOUT 3000 // milliseconds -#define DEFAULT_CHECK_INTERVAL 500 // milliseconds -#define DEFAULT_AP_KEEP_TIMEOUT 600 // seconds +#define DEFAULT_CHECK_INTERVAL 300 // milliseconds +#define DEFAULT_AP_KEEP_TIMEOUT 35 // seconds #define DEFAULT_AP_CHECK_INTERVAL 1000 // milliseconds #define POSITIONER_DEFAULT_IP "127.0.0.1" diff --git a/owlps-listener/owlps-listener.h b/owlps-listener/owlps-listener.h index 5505267..fe161a9 100644 --- a/owlps-listener/owlps-listener.h +++ b/owlps-listener/owlps-listener.h @@ -65,7 +65,7 @@ #define OPTIONS "ADf:hH:i:I:Kl:m:n:O:p:P:qr:t:T:vVw:" // getopt string #define DEFAULT_CONFIG_FILE "/usr/local/etc/owlps/owlps-listener.conf" enum {MODE_ACTIVE = 'a', MODE_PASSIVE = 'p', MODE_MIXED = 'm'} ; -#define DEFAULT_AUTOCALIBRATION_HELLO_DELAY 120 // seconds +#define DEFAULT_AUTOCALIBRATION_HELLO_DELAY 15 // seconds #define DEFAULT_AUTOCALIBRATION_DELAY 25 // milliseconds #define DEFAULT_AUTOCALIBRATION_NBPKT 20