Merge remote-tracking branch 'origin/zhangzhuo'

This commit is contained in:
2021-12-16 15:52:25 +08:00
17 changed files with 404 additions and 52 deletions

View File

@ -13,7 +13,7 @@ namespace ZZ_MISCDEF
typedef unsigned char ZZ_U8;
typedef unsigned short int ZZ_U16;
typedef unsigned long int ZZ_U32;
typedef long int ZZ_S32;
typedef long int ZZ_S32;
namespace IRIS
@ -311,4 +311,12 @@ namespace ZZ_MISCDEF
}ATPDataHeader;
}
//misc detector
namespace MISC_DETECTOR
{
typedef struct tagHumitureDeviceInfo
{
QString qstrInterfaceName;
}HumitureDeviceInfo;
}
};