From 10c79812198bf1ace6fdc01f1ffc5293e51806f3 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 8 Mar 2015 14:28:28 +0100 Subject: [PATCH] fir for previous commit, nicer comments --- src/lib/ebus/message.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp index bbf4e137..289d018c 100644 --- a/src/lib/ebus/message.cpp +++ b/src/lib/ebus/message.cpp @@ -104,24 +104,24 @@ result_t Message::create(vector::iterator& it, const vector::ite if (it == end) return RESULT_ERR_EOF; size_t len = strlen(str); - if (len == 0) { // default: active get + if (len == 0) { // default: active read defaultName = "r"; - } else if (strncasecmp(str, "R", 1) == 0) { // active get + } else if (strncasecmp(str, "R", 1) == 0) { // active read char last = str[len-1]; - if (last >= '0' && last <= '9') { // poll priority (=active get) + if (last >= '0' && last <= '9') { // poll priority (=active read) pollPriority = (unsigned char)(last - '0'); defaultName = string(str).substr(0, len - 1); // cut off priority digit } else defaultName = str; } - else if (strncasecmp(str, "W", 1) == 0) { // active set + else if (strncasecmp(str, "W", 1) == 0) { // active write isWrite = true; defaultName = str; } - else { // any other: passive set/get + else { // any other: passive read/write isPassive = true; - isWrite = strcasecmp(str+len-1, "W") == 0; // if type ends with "w" it is treated as passive set + isWrite = strcasecmp(str+len-1, "W") == 0; // if type ends with "w" it is treated as passive write defaultName = str; } @@ -273,7 +273,7 @@ result_t Message::create(vector::iterator& it, const vector::ite sprintf(num, ".%d", index); useClass = useClass + num; } - messages.push_back(new Message(useClass, name, isWrite, isPassive, comment, srcAddress, dstAddress, id, data, pollPriority, index==0)); + messages.push_back(new Message(useClass, name, isWrite, isPassive, comment, srcAddress, dstAddress, id, data, index==0, pollPriority)); } return RESULT_OK; }