diff --git a/database b/database index 558121b77..87b0bc90b 100644 Binary files a/database and b/database differ diff --git a/resources/database/vscp-hashtypeevents.sqlite3 b/resources/database/vscp-hashtypeevents.sqlite3 index 558121b77..87b0bc90b 100644 Binary files a/resources/database/vscp-hashtypeevents.sqlite3 and b/resources/database/vscp-hashtypeevents.sqlite3 differ diff --git a/src/vscp/common/mdf.cpp b/src/vscp/common/mdf.cpp index 69de68951..fd744c324 100644 --- a/src/vscp/common/mdf.cpp +++ b/src/vscp/common/mdf.cpp @@ -2548,7 +2548,7 @@ CMDF::save_json(const std::string &path) if ((cnt = pManufacturer->getPhoneObjCount())) { fout << "," << std::endl; fout << "\"telephone\": [" << std::endl; - int i = 0; + size_t i = 0; while (i < cnt) { CMDF_Item *pitem = pManufacturer->getPhoneObj(i); if (nullptr != pitem) { @@ -2571,7 +2571,7 @@ CMDF::save_json(const std::string &path) if ((cnt = pManufacturer->getFaxObjCount())) { fout << "," << std::endl; fout << "\"fax\": [" << std::endl; - int i = 0; + size_t i = 0; while (i < cnt) { CMDF_Item *pitem = pManufacturer->getFaxObj(i); if (nullptr != pitem) { @@ -2594,7 +2594,7 @@ CMDF::save_json(const std::string &path) if ((cnt = pManufacturer->getEmailObjCount())) { fout << "," << std::endl; fout << "\"email\": [" << std::endl; - int i = 0; + size_t i = 0; while (i < cnt) { CMDF_Item *pitem = pManufacturer->getEmailObj(i); if (nullptr != pitem) { diff --git a/src/vscp/common/vscp-class.h b/src/vscp/common/vscp-class.h index f64cce113..755bd76fb 100644 --- a/src/vscp/common/vscp-class.h +++ b/src/vscp/common/vscp-class.h @@ -47,7 +47,7 @@ !!!!!!!!!!!!!!!!!!!! W A R N I N G !!!!!!!!!!!!!!!!!!!! This file is auto-generated see https://github.com/grodansparadis/vscp-classes - Generated: 2024-08-23 16:27:25.870870 + Generated: 2024-11-01 12:00:41.110852 */ #ifndef VSCP_CLASS_H diff --git a/src/vscp/common/vscp-hashclass.h b/src/vscp/common/vscp-hashclass.h index d82c6921a..088767853 100644 --- a/src/vscp/common/vscp-hashclass.h +++ b/src/vscp/common/vscp-hashclass.h @@ -2,7 +2,7 @@ !!!!!!!!!!!!!!!!!!!! W A R N I N G !!!!!!!!!!!!!!!!!!!! This file is auto-generated see https://github.com/grodansparadis/vscp-classes - Generated: 2024-08-23 16:27:26.833436 + Generated: 2024-11-01 12:00:42.106112 */ m_hashClass[ 0 ] = _("CLASS1_PROTOCOL"); diff --git a/src/vscp/common/vscp-hashtype.h b/src/vscp/common/vscp-hashtype.h index d651a13f8..abc3340dc 100644 --- a/src/vscp/common/vscp-hashtype.h +++ b/src/vscp/common/vscp-hashtype.h @@ -2,7 +2,7 @@ !!!!!!!!!!!!!!!!!!!! W A R N I N G !!!!!!!!!!!!!!!!!!!! This file is auto-generated see https://github.com/grodansparadis/vscp-classes - Generated: 2024-08-23 16:27:27.315130 + Generated: 2024-11-01 12:00:42.593785 */ @@ -2120,6 +2120,8 @@ m_hashType[ MAKE_CLASSTYPE_LONG(1024,34) ] = _("VSCP2_TYPE_PROTOCOL_GET_MATRIX_INFO_RESPONSE"); m_hashType[ MAKE_CLASSTYPE_LONG(1024,36) ] = _("VSCP2_TYPE_PROTOCOL_GET_EMBEDDED_MDF_RESPONSE"); m_hashType[ MAKE_CLASSTYPE_LONG(1024,41) ] = _("VSCP2_TYPE_PROTOCOL_GET_EVENT_INTEREST_RESPONSE"); + m_hashType[ MAKE_CLASSTYPE_LONG(1024,43) ] = _("VSCP2_TYPE_PROTOCOL_READ_REGISTER_DIRECT"); + m_hashType[ MAKE_CLASSTYPE_LONG(1024,44) ] = _("VSCP2_TYPE_PROTOCOL_READ_REGISTER_DIRECT"); // CLASS2.CONTROL = 1025 - Level II Control m_hashType[ MAKE_CLASSTYPE_LONG(1025,0) ] = _("VSCP2_TYPE_CONTROL_GENERAL"); diff --git a/src/vscp/common/vscp-type.h b/src/vscp/common/vscp-type.h index 45d408e19..a24f6e15a 100644 --- a/src/vscp/common/vscp-type.h +++ b/src/vscp/common/vscp-type.h @@ -48,7 +48,7 @@ !!!!!!!!!!!!!!!!!!!! W A R N I N G !!!!!!!!!!!!!!!!!!!! This file is auto-generated see https://github.com/grodansparadis/vscp-classes - Generated: 2024-08-23 16:27:26.321269 + Generated: 2024-11-01 12:00:41.598489 */ #ifndef VSCP_TYPE_H @@ -919,6 +919,8 @@ #define VSCP2_TYPE_PROTOCOL_GET_MATRIX_INFO_RESPONSE 34 /* Level II get DM info response */ #define VSCP2_TYPE_PROTOCOL_GET_EMBEDDED_MDF_RESPONSE 36 /* Level II get embedded MDF response */ #define VSCP2_TYPE_PROTOCOL_GET_EVENT_INTEREST_RESPONSE 41 /* Level II events of interest response */ +#define VSCP2_TYPE_PROTOCOL_READ_REGISTER_DIRECT 43 /* Read a Level II register from the 32-bit register space direct */ +#define VSCP2_TYPE_PROTOCOL_READ_REGISTER_DIRECT 44 /* Write a Level II register to the 32-bit register space direct */ /* CLASS2.CONTROL = 1025 - Level II Control */ #define VSCP2_TYPE_CONTROL_GENERAL 0 /* General event */ diff --git a/src/vscp/common/vscphelper.cpp b/src/vscp/common/vscphelper.cpp index 639edfa5e..7a820db91 100644 --- a/src/vscp/common/vscphelper.cpp +++ b/src/vscp/common/vscphelper.cpp @@ -7324,7 +7324,7 @@ readHexChar(char input) size_t vscp_hexStr2ByteArray(uint8_t *array, size_t size, const char *hexstr) { - int cnt = 0; + size_t cnt = 0; const char *phex = hexstr; while (*(phex + 2 * cnt) && *(phex + 2 * cnt + 1) && (cnt < size)) {