From 2e2cf204e288d7c78fa2f6061f33c9738ecca655 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 27 Dec 2015 22:24:11 +0100 Subject: [PATCH] increased default bus acquisition retries from 2 to 3 --- src/ebusd/main.cpp | 4 ++-- src/ebusd/main.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index e337870f..9ef74dca 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -73,7 +73,7 @@ static struct options opt = { 0xFF, // address false, // answer 9400, // acquireTimeout - 2, // acquireRetries + 3, // acquireRetries 2, // sendRetries SLAVE_RECV_TIMEOUT, // receiveTimeout 0, // masterCount @@ -143,7 +143,7 @@ static const struct argp_option argpoptions[] = { {"address", 'a', "ADDR", 0, "Use ADDR as own bus address [FF]", 0 }, {"answer", O_ANSWER, NULL, 0, "Actively answer to requests from other masters", 0 }, {"acquiretimeout", O_ACQTIM, "USEC", 0, "Stop bus acquisition after USEC us [9400]", 0 }, - {"acquireretries", O_ACQRET, "COUNT", 0, "Retry bus acquisition COUNT times [2]", 0 }, + {"acquireretries", O_ACQRET, "COUNT", 0, "Retry bus acquisition COUNT times [3]", 0 }, {"sendretries", O_SNDRET, "COUNT", 0, "Repeat failed sends COUNT times [2]", 0 }, {"receivetimeout", O_RCVTIM, "USEC", 0, "Expect a slave to answer within USEC us [15000]", 0 }, {"numbermasters", O_MASCNT, "COUNT", 0, "Expect COUNT masters on the bus, 0 for auto detection [0]", 0 }, diff --git a/src/ebusd/main.h b/src/ebusd/main.h index 3e80a921..5fd6cd97 100644 --- a/src/ebusd/main.h +++ b/src/ebusd/main.h @@ -41,7 +41,7 @@ struct options unsigned char address; //!< own bus address [FF] bool answer; //!< answer to requests from other masters int acquireTimeout; //!< bus acquisition timeout in us [9400] - int acquireRetries; //!< number of retries for bus acquisition [2] + int acquireRetries; //!< number of retries for bus acquisition [3] int sendRetries; //!< number of retries for failed sends [2] int receiveTimeout; //!< timeout for receiving answer from slave in us [15000] int masterCount; //!< expected number of masters for arbitration [5]