Skip to content

Commit

Permalink
Added new level II classes
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Nov 1, 2024
1 parent b91d641 commit 8bb0c01
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
Binary file modified database
Binary file not shown.
Binary file modified resources/database/vscp-hashtypeevents.sqlite3
Binary file not shown.
6 changes: 3 additions & 3 deletions src/vscp/common/mdf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/common/vscp-class.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/common/vscp-hashclass.h
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 3 additions & 1 deletion src/vscp/common/vscp-hashtype.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/


Expand Down Expand Up @@ -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");
Expand Down
4 changes: 3 additions & 1 deletion src/vscp/common/vscp-type.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/common/vscphelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 8bb0c01

Please sign in to comment.