Merge remote-tracking branch 'origin/master' into feature/knx

src/ebusd/main.cpp

@@ -232,7 +232,7 @@ static const struct argp_option argpoptions[] = {
   {"acquiretimeout", O_ACQTIM, "MSEC",     0, "Stop bus acquisition after MSEC ms [10]", 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, "MSEC",     0, "Expect a slave to answer within MSEC us [25]", 0 },
+  {"receivetimeout", O_RCVTIM, "MSEC",     0, "Expect a slave to answer within MSEC ms [25]", 0 },
   {"numbermasters",  O_MASCNT, "COUNT",    0, "Expect COUNT masters on the bus, 0 for auto detection [0]", 0 },
   {"generatesyn",    O_GENSYN, nullptr,    0, "Enable AUTO-SYN symbol generation", 0 },
 

src/ebusd/mainloop.cpp

@@ -291,8 +291,7 @@ void MainLoop::run() {
           }
           if (result != RESULT_OK) {
             logError(lf_main, "initial scan failed: %s", getResultCode(result));
-          }
-          if (result != RESULT_ERR_NO_SIGNAL) {
+          } else {
             reload = false;
           }
         }

src/lib/ebus/datatype.cpp

@@ -43,7 +43,7 @@ using std::setw;
 using std::endl;
 
 
-float uintToFloat(unsigned int value) {
+float uintToFloat(unsigned int value, bool negative) {
 #ifdef HAVE_DIRECT_FLOAT_FORMAT
 #  if HAVE_DIRECT_FLOAT_FORMAT == 2
   value = __builtin_bswap32(value);
@@ -890,7 +890,7 @@ result_t NumberDataType::readFromRawValue(unsigned int value,
   }
   if (m_bitCount == 32) {
     if (hasFlag(EXP)) {  // IEEE 754 binary32
-      float val = uintToFloat(value);
+      float val = uintToFloat(value, negative);
       if (val != val) {  // !isnan(val)
         if (outputFormat & OF_JSON) {
           *output << "null";

src/lib/ebus/device.cpp

@@ -134,8 +134,8 @@ Device* Device::create(const char* name, unsigned int extraLatency, bool checkDe
     free(in);
     return new NetworkDevice(name, hostOrIp, port, extraLatency, readOnly, initialSend, udp, enhanced);
   }
-  // support enh:/dev/<device>
-  return new SerialDevice(name, checkDevice, extraLatency, readOnly, initialSend, enhanced);
+  // support enh:/dev/<device>, ens:/dev/<device>, and /dev/<device>
+  return new SerialDevice(name, checkDevice, extraLatency, readOnly, initialSend, enhanced, highSpeed);
 }
 
 result_t Device::open() {

src/lib/ebus/message.h

@@ -25,7 +25,6 @@
 #include <deque>
 #include <map>
 #include <queue>
-#include <functional>
 #include "lib/ebus/data.h"
 #include "lib/ebus/result.h"
 #include "lib/ebus/symbol.h"
@@ -800,7 +799,7 @@ class ChainedMessage : public Message {
 /**
  * A function that compares the weighted poll priority of two @a Message instances.
  */
-struct compareMessagePriority : binary_function<Message*, Message*, bool> {
+struct compareMessagePriority {
   /**
    * Compare the weighted poll priority of the two @a Message instances.
    * @param x the first @a Message.