mirror of
https://github.com/eclipse/upm.git
synced 2025-07-01 17:31:13 +03:00
ANDROID: CMake/src changes to build on android-24
* Updated pom file generation: Generate pom files after all sensor library targets have been created - allows for dependencies * Changes for compiling on Android * Check for mraa build options: Look at symbols in mraa library to determine UPM build options (example: mraa_iio_init, mraa_firmata_init) * Add per target summary for C/C++/java/nodejs/python * Added hierarchy to fti include directory... old: #include "upm_voltage.h" new: #include "fti/upm_voltage.h" * Removed unimplemented methods from mpu9150 library and java example * Add utilities-c target for all c examples. Most of the C examples rely on the upm_delay methods. Add a dependency on the utilities-c target for all c examples. * Updated the examples/CMakeLists.txt to add dependencies passed via TARGETS to the target name parsed from the example name. Also updated the interface example names to start with 'interfaces'. * Updated src/examples/CMakeLists.txt to ALWAYS remove examples from the example_src_list (moved this from end of function to beginning). Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@ -285,7 +285,7 @@ BACNETMSTP* BACNETMSTP::instance()
|
||||
return m_instance;
|
||||
}
|
||||
|
||||
void BACNETMSTP::initMaster(std::string port, int baudRate,
|
||||
void BACNETMSTP::initMaster(string port, int baudRate,
|
||||
int deviceInstanceID, int macAddr, int maxMaster,
|
||||
int maxInfoFrames)
|
||||
{
|
||||
@ -305,7 +305,7 @@ void BACNETMSTP::initMaster(std::string port, int baudRate,
|
||||
if ( !(baudRate == 9600 || baudRate == 19200 || baudRate == 38400
|
||||
|| baudRate == 57600 || baudRate == 76800 || baudRate == 115200) )
|
||||
{
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": baudRate must be 9600, 19200, 38400, "
|
||||
+ " 57600, 76800, or 115200");
|
||||
}
|
||||
@ -314,26 +314,26 @@ void BACNETMSTP::initMaster(std::string port, int baudRate,
|
||||
// maxMaster must be less than or equal to 127
|
||||
if (maxMaster < 0 || maxMaster > DEFAULT_MAX_MASTER)
|
||||
{
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": maxMaster must be between 0 and "
|
||||
+ std::to_string(DEFAULT_MAX_MASTER));
|
||||
+ to_string(DEFAULT_MAX_MASTER));
|
||||
}
|
||||
|
||||
// As a master ourselves, we must have a MAC address also within the
|
||||
// constraints of maxMaster
|
||||
if (macAddr < 0 || macAddr > DEFAULT_MAX_MASTER)
|
||||
{
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": macAddr must be between 0 and "
|
||||
+ std::to_string(DEFAULT_MAX_MASTER));
|
||||
+ to_string(DEFAULT_MAX_MASTER));
|
||||
}
|
||||
|
||||
// this should be unique on the network
|
||||
if (deviceInstanceID >= BACNET_MAX_INSTANCE)
|
||||
{
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": deviceInstanceID must be less than "
|
||||
+ std::to_string(BACNET_MAX_INSTANCE)
|
||||
+ to_string(BACNET_MAX_INSTANCE)
|
||||
+ ", and must be unique on the network");
|
||||
}
|
||||
|
||||
@ -506,7 +506,7 @@ bool BACNETMSTP::dispatchRequest()
|
||||
break;
|
||||
default:
|
||||
syslog(LOG_WARNING, "%s: switch case not defined",
|
||||
std::string(__FUNCTION__).c_str());
|
||||
string(__FUNCTION__).c_str());
|
||||
}
|
||||
}
|
||||
else if (tsm_invoke_id_free(m_invokeID))
|
||||
@ -584,9 +584,9 @@ bool BACNETMSTP::readProperty(uint32_t targetDeviceInstanceID,
|
||||
// some sanity checking...
|
||||
if (objInstance >= BACNET_MAX_INSTANCE)
|
||||
{
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": objInstance must be less than "
|
||||
+ std::to_string(BACNET_MAX_INSTANCE));
|
||||
+ to_string(BACNET_MAX_INSTANCE));
|
||||
}
|
||||
|
||||
// fill in the command structure and dispatch
|
||||
@ -620,9 +620,9 @@ bool BACNETMSTP::writeProperty(uint32_t targetDeviceInstanceID,
|
||||
// some sanity checking...
|
||||
if (objInstance >= BACNET_MAX_INSTANCE)
|
||||
{
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": objInstance must be less than "
|
||||
+ std::to_string(BACNET_MAX_INSTANCE));
|
||||
+ to_string(BACNET_MAX_INSTANCE));
|
||||
}
|
||||
|
||||
// fill in the command structure and dispatch
|
||||
@ -681,9 +681,9 @@ float BACNETMSTP::getDataTypeReal(int index)
|
||||
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||
return float(getDataTypeSignedInt(index));
|
||||
default:
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to Real");
|
||||
}
|
||||
}
|
||||
@ -694,9 +694,9 @@ bool BACNETMSTP::getDataTypeBoolean(int index)
|
||||
if (getDataType(index) == BACNET_APPLICATION_TAG_BOOLEAN)
|
||||
return ((m_returnedValue.at(index).type.Boolean) ? true : false);
|
||||
else
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to Bool");
|
||||
}
|
||||
|
||||
@ -705,9 +705,9 @@ unsigned int BACNETMSTP::getDataTypeUnsignedInt(int index)
|
||||
if (getDataType(index) == BACNET_APPLICATION_TAG_UNSIGNED_INT)
|
||||
return m_returnedValue.at(index).type.Unsigned_Int;
|
||||
else
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to UnsignedInt");
|
||||
}
|
||||
|
||||
@ -716,9 +716,9 @@ int BACNETMSTP::getDataTypeSignedInt(int index)
|
||||
if (getDataType(index) == BACNET_APPLICATION_TAG_SIGNED_INT)
|
||||
return m_returnedValue.at(index).type.Signed_Int;
|
||||
else
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to SignedInt");
|
||||
}
|
||||
|
||||
@ -744,9 +744,9 @@ double BACNETMSTP::getDataTypeDouble(int index)
|
||||
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||
return double(getDataTypeSignedInt(index));
|
||||
default:
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to Double");
|
||||
}
|
||||
}
|
||||
@ -758,35 +758,35 @@ unsigned int BACNETMSTP::getDataTypeEnum(int index)
|
||||
if (getDataType(index) == BACNET_APPLICATION_TAG_ENUMERATED)
|
||||
return m_returnedValue.at(index).type.Enumerated;
|
||||
else
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to Enum");
|
||||
}
|
||||
|
||||
std::string BACNETMSTP::getDataTypeString(int index)
|
||||
string BACNETMSTP::getDataTypeString(int index)
|
||||
{
|
||||
string retval;
|
||||
string retval;
|
||||
|
||||
// Here, we can try to accomodate all the types
|
||||
switch(getDataType(index))
|
||||
{
|
||||
case BACNET_APPLICATION_TAG_REAL:
|
||||
retval = std::to_string(getDataTypeReal(index));
|
||||
retval = to_string(getDataTypeReal(index));
|
||||
break;
|
||||
|
||||
#if defined(BACAPP_DOUBLE)
|
||||
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||
retval = std::to_string(getDataTypeDouble(index));
|
||||
retval = to_string(getDataTypeDouble(index));
|
||||
break;
|
||||
#endif // BACAPP_DOUBLE
|
||||
|
||||
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||
retval = std::to_string(getDataTypeUnsignedInt(index));
|
||||
retval = to_string(getDataTypeUnsignedInt(index));
|
||||
break;
|
||||
|
||||
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||
retval = std::to_string(getDataTypeSignedInt(index));
|
||||
retval = to_string(getDataTypeSignedInt(index));
|
||||
break;
|
||||
|
||||
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||
@ -801,7 +801,7 @@ std::string BACNETMSTP::getDataTypeString(int index)
|
||||
|
||||
case BACNET_APPLICATION_TAG_OCTET_STRING:
|
||||
{
|
||||
string tmpstr((char *)octetstring_value(&m_returnedValue.at(index).type.Octet_String),
|
||||
string tmpstr((char *)octetstring_value(&m_returnedValue.at(index).type.Octet_String),
|
||||
|
||||
octetstring_length(&m_returnedValue.at(index).type.Octet_String));
|
||||
retval = string2HexString(tmpstr);
|
||||
@ -829,9 +829,9 @@ std::string BACNETMSTP::getDataTypeString(int index)
|
||||
break;
|
||||
|
||||
default:
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": data type ("
|
||||
+ std::to_string(int(getDataType(index)))
|
||||
+ to_string(int(getDataType(index)))
|
||||
+ ") is not convertible to String");
|
||||
break;
|
||||
}
|
||||
@ -891,9 +891,9 @@ BACNET_APPLICATION_DATA_VALUE BACNETMSTP::createDataString(string value)
|
||||
{
|
||||
if (value.size() > (MAX_CHARACTER_STRING_BYTES - 1))
|
||||
{
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": value must be less than or equal to "
|
||||
+ std::to_string(MAX_CHARACTER_STRING_BYTES - 1)
|
||||
+ to_string(MAX_CHARACTER_STRING_BYTES - 1)
|
||||
+ " characters long");
|
||||
}
|
||||
|
||||
|
@ -70,7 +70,7 @@ BACNETUTIL::~BACNETUTIL()
|
||||
{
|
||||
}
|
||||
|
||||
void BACNETUTIL::initMaster(std::string port, int baudRate,
|
||||
void BACNETUTIL::initMaster(string port, int baudRate,
|
||||
int deviceInstanceID, int macAddr, int maxMaster,
|
||||
int maxInfoFrames)
|
||||
{
|
||||
@ -109,7 +109,7 @@ float BACNETUTIL::getAnalogValue(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (reliability): " << getAllErrorString()
|
||||
<< endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ getAllErrorString());
|
||||
}
|
||||
|
||||
@ -121,7 +121,7 @@ float BACNETUTIL::getAnalogValue(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": Reliability check failed" << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": Reliability check failed");
|
||||
}
|
||||
}
|
||||
@ -134,7 +134,7 @@ float BACNETUTIL::getAnalogValue(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (value): " << getAllErrorString()
|
||||
<< endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -158,7 +158,7 @@ void BACNETUTIL::setAnalogValue(uint32_t objInstance,
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -201,7 +201,7 @@ float BACNETUTIL::getAnalogInput(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (reliability): "
|
||||
<< getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ getAllErrorString());
|
||||
}
|
||||
|
||||
@ -213,7 +213,7 @@ float BACNETUTIL::getAnalogInput(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": Reliability check failed" << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": Reliability check failed");
|
||||
}
|
||||
}
|
||||
@ -225,7 +225,7 @@ float BACNETUTIL::getAnalogInput(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": (value): " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -248,7 +248,7 @@ bool BACNETUTIL::getBinaryInput(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (reliability): "
|
||||
<< getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ getAllErrorString());
|
||||
}
|
||||
|
||||
@ -260,7 +260,7 @@ bool BACNETUTIL::getBinaryInput(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": Reliability check failed" << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": Reliability check failed");
|
||||
}
|
||||
}
|
||||
@ -272,7 +272,7 @@ bool BACNETUTIL::getBinaryInput(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": (value): " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -298,7 +298,7 @@ bool BACNETUTIL::getBinaryValue(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (reliability): "
|
||||
<< getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ getAllErrorString());
|
||||
}
|
||||
|
||||
@ -310,7 +310,7 @@ bool BACNETUTIL::getBinaryValue(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": Reliability check failed" << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": Reliability check failed");
|
||||
}
|
||||
}
|
||||
@ -322,7 +322,7 @@ bool BACNETUTIL::getBinaryValue(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": (value): " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -351,7 +351,7 @@ void BACNETUTIL::setBinaryValue(uint32_t objInstance,
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -398,7 +398,7 @@ unsigned int BACNETUTIL::getMultiStateValue(uint32_t objInstance)
|
||||
cerr << __FUNCTION__ << ": (reliability): "
|
||||
<< getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ getAllErrorString());
|
||||
}
|
||||
|
||||
@ -410,7 +410,7 @@ unsigned int BACNETUTIL::getMultiStateValue(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": Reliability check failed" << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": Reliability check failed");
|
||||
}
|
||||
}
|
||||
@ -423,7 +423,7 @@ unsigned int BACNETUTIL::getMultiStateValue(uint32_t objInstance)
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": (value): " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -451,7 +451,7 @@ void BACNETUTIL::updateMultiStateValueInfo(uint32_t objInstance)
|
||||
<< getAllErrorString()
|
||||
<< endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -525,10 +525,10 @@ string BACNETUTIL::lookupMultiStateValueText(uint32_t objInstance,
|
||||
|
||||
// verify that value is valid for this object
|
||||
if (value == 0 || value > m_msvInfo[objInstance].numStates)
|
||||
throw std::out_of_range(std::string(__FUNCTION__)
|
||||
throw out_of_range(string(__FUNCTION__)
|
||||
+ ": value supplied is invalid. Maximum "
|
||||
+ "allowed values are 1 to "
|
||||
+ std::to_string(m_msvInfo[objInstance].numStates)
|
||||
+ to_string(m_msvInfo[objInstance].numStates)
|
||||
+ " for this object");
|
||||
|
||||
|
||||
@ -549,7 +549,7 @@ string BACNETUTIL::lookupMultiStateValueText(uint32_t objInstance,
|
||||
}
|
||||
|
||||
// no stateList text available, so just return value as a string
|
||||
return std::to_string(value);
|
||||
return to_string(value);
|
||||
}
|
||||
|
||||
unsigned int BACNETUTIL::getMultiStateValueMaxStates(uint32_t objInstance)
|
||||
@ -576,10 +576,10 @@ void BACNETUTIL::setMultiStateValue(uint32_t objInstance,
|
||||
// Check value against the valid limits
|
||||
|
||||
if (value == 0 || value > m_msvInfo[objInstance].numStates)
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": value supplied is invalid. Maximum "
|
||||
+ "allowed values are 1 to "
|
||||
+ std::to_string(m_msvInfo[objInstance].numStates)
|
||||
+ to_string(m_msvInfo[objInstance].numStates)
|
||||
+ " for this object");
|
||||
|
||||
// Write the value
|
||||
@ -596,7 +596,7 @@ void BACNETUTIL::setMultiStateValue(uint32_t objInstance,
|
||||
if (m_debugging)
|
||||
cerr << __FUNCTION__ << ": " << getAllErrorString() << endl;
|
||||
|
||||
throw std::runtime_error(std::string(__FUNCTION__)
|
||||
throw runtime_error(string(__FUNCTION__)
|
||||
+ ": "
|
||||
+ getAllErrorString());
|
||||
}
|
||||
@ -772,7 +772,7 @@ uint8_t BACNETUTIL::getRejectReason()
|
||||
return m_instance->getRejectReason();
|
||||
}
|
||||
|
||||
std::string BACNETUTIL::getRejectString()
|
||||
string BACNETUTIL::getRejectString()
|
||||
{
|
||||
return m_instance->getRejectString();
|
||||
}
|
||||
@ -782,7 +782,7 @@ uint8_t BACNETUTIL::getAbortReason()
|
||||
return m_instance->getAbortReason();
|
||||
}
|
||||
|
||||
std::string BACNETUTIL::getAbortString()
|
||||
string BACNETUTIL::getAbortString()
|
||||
{
|
||||
return m_instance->getAbortString();
|
||||
}
|
||||
@ -797,12 +797,12 @@ BACNET_ERROR_CODE BACNETUTIL::getErrorCode()
|
||||
return m_instance->getErrorCode();
|
||||
}
|
||||
|
||||
std::string BACNETUTIL::getUPMErrorString()
|
||||
string BACNETUTIL::getUPMErrorString()
|
||||
{
|
||||
return m_instance->getUPMErrorString();
|
||||
}
|
||||
|
||||
std::string BACNETUTIL::getErrorString()
|
||||
string BACNETUTIL::getErrorString()
|
||||
{
|
||||
return m_instance->getErrorString();
|
||||
};
|
||||
@ -904,7 +904,7 @@ bool BACNETUTIL::setDeviceName(string name)
|
||||
{
|
||||
if (name.size() < 1)
|
||||
{
|
||||
throw std::invalid_argument(std::string(__FUNCTION__)
|
||||
throw invalid_argument(string(__FUNCTION__)
|
||||
+ ": name must have at least one character");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user