Merge remote-tracking branch '1.x/master'

Conflicts: .gear/rules TODO conf/libuniset2.spec extensions/ModbusMaster/MBExchange.cc extensions/lib/MTR.cc

Merge remote-tracking branch '1.x/master'
22b25cc4 · Pavel Vainerman · b34ace55 · 4e190cf3 · 22b25cc4
Commit 22b25cc4 authored Dec 29, 2014 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MTR.cc extensions/lib/MTR.cc +2 -2

No files found.
--- a/extensions/lib/MTR.cc
+++ b/extensions/lib/MTR.cc
@@ -457,9 +457,9 @@ MTR::MTRError update_configuration( ModbusRTUMaster* mb, ModbusRTU::ModbusAddr s
                            const std::string& mtrconfile,  int verb )
 {
    std::string m = MTR::getModelNumber(mb, slaveaddr);
-    if( m != "MTR315Transducer" )
+    if( m != "MTR315Transducer" && m != "MTR3-3Transducer" )
    {
-        cerr << "(mtr-setup): model number != 'MTR315Transducer' (read: " << m << ")" << endl;
+        cerr << "(mtr-setup): model number must be 'MTR315Transducer' or 'MTR3-3Transducer' (read: '" << m << "')" << endl;
        return mtrBadDeviceType;
    }