Skip to content

Commit

Permalink
Update grpc-device with latest VISA attributes for PXI and TCPIP (#1018)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmondrik authored Oct 27, 2023
1 parent 854e4fc commit 2c87b79
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 108 deletions.
11 changes: 11 additions & 0 deletions generated/visa/visa.proto
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ enum VisaAttribute {
VISA_ATTRIBUTE_TCPIP_DEVICE_NAME = -1073806951;
VISA_ATTRIBUTE_USB_SERIAL_NUM = -1073806944;
VISA_ATTRIBUTE_PXI_SLOTPATH = -1073806841;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT_ISSUER_NAME = -1073806736;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT_SUBJECT_NAME = -1073806735;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT_EXPIRATION_DATE = -1073806734;
VISA_ATTRIBUTE_TCPIP_SASL_MECHANISM = -1073806732;
VISA_ATTRIBUTE_TCPIP_TLS_CIPHER_SUITE = -1073806731;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT = -1073806730;
VISA_ATTRIBUTE_OPER_NAME = -1073790910;
VISA_ATTRIBUTE_RECV_TCPIP_ADDR = -1073790568;
VISA_ATTRIBUTE_USB_RECV_INTR_DATA = -1073790543;
Expand Down Expand Up @@ -250,10 +256,15 @@ enum VisaAttribute {
VISA_ATTRIBUTE_PXI_DSTAR_BUS = 1073676868;
VISA_ATTRIBUTE_PXI_DSTAR_SET = 1073676869;
VISA_ATTRIBUTE_PXI_ALLOW_WRITE_COMBINE = 1073676870;
VISA_ATTRIBUTE_PXI_SLOT_WIDTH = 1073676871;
VISA_ATTRIBUTE_PXI_SLOT_OFFSET = 1073676872;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT_IS_PERPETUAL = 1073676915;
VISA_ATTRIBUTE_TCPIP_SERVER_CERT_SIZE = 1073676919;
VISA_ATTRIBUTE_TCPIP_HISLIP_OVERLAP_EN = 1073677056;
VISA_ATTRIBUTE_TCPIP_HISLIP_VERSION = 1073677057;
VISA_ATTRIBUTE_TCPIP_HISLIP_MAX_MESSAGE_KB = 1073677058;
VISA_ATTRIBUTE_TCPIP_IS_HISLIP = 1073677059;
VISA_ATTRIBUTE_TCPIP_HISLIP_ENCRYPTION_EN = 1073677060;
VISA_ATTRIBUTE_JOB_ID = 1073692678;
VISA_ATTRIBUTE_EVENT_TYPE = 1073692688;
VISA_ATTRIBUTE_SIGP_STATUS_ID = 1073692689;
Expand Down
11 changes: 11 additions & 0 deletions generated/visa/visa_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ namespace visa_grpc {
case VI_ATTR_PXI_MEM_TYPE_BAR3:
case VI_ATTR_PXI_MEM_TYPE_BAR4:
case VI_ATTR_PXI_MEM_TYPE_BAR5:
case VI_ATTR_PXI_SLOT_OFFSET:
case VI_ATTR_PXI_SLOT_WIDTH:
case VI_ATTR_RD_BUF_OPER_MODE:
case VI_ATTR_RSRC_MANF_ID:
case VI_ATTR_SIGP_STATUS_ID:
Expand Down Expand Up @@ -161,6 +163,7 @@ namespace visa_grpc {
case VI_ATTR_RSRC_SPEC_VERSION:
case VI_ATTR_TCPIP_HISLIP_MAX_MESSAGE_KB:
case VI_ATTR_TCPIP_HISLIP_VERSION:
case VI_ATTR_TCPIP_SERVER_CERT_SIZE:
case VI_ATTR_TMO_VALUE:
case VI_ATTR_VXI_TRIG_STATUS:
case VI_ATTR_VXI_TRIG_SUPPORT:
Expand Down Expand Up @@ -206,10 +209,12 @@ namespace visa_grpc {
case VI_ATTR_PXI_IS_EXPRESS:
case VI_ATTR_SEND_END_EN:
case VI_ATTR_SUPPRESS_END_EN:
case VI_ATTR_TCPIP_HISLIP_ENCRYPTION_EN:
case VI_ATTR_TCPIP_HISLIP_OVERLAP_EN:
case VI_ATTR_TCPIP_IS_HISLIP:
case VI_ATTR_TCPIP_KEEPALIVE:
case VI_ATTR_TCPIP_NODELAY:
case VI_ATTR_TCPIP_SERVER_CERT_IS_PERPETUAL:
case VI_ATTR_TERMCHAR_EN:
return AttributeValueData::kValueBool;

Expand All @@ -225,10 +230,16 @@ namespace visa_grpc {
case VI_ATTR_TCPIP_ADDR:
case VI_ATTR_TCPIP_DEVICE_NAME:
case VI_ATTR_TCPIP_HOSTNAME:
case VI_ATTR_TCPIP_SASL_MECHANISM:
case VI_ATTR_TCPIP_SERVER_CERT_EXPIRATION_DATE:
case VI_ATTR_TCPIP_SERVER_CERT_ISSUER_NAME:
case VI_ATTR_TCPIP_SERVER_CERT_SUBJECT_NAME:
case VI_ATTR_TCPIP_TLS_CIPHER_SUITE:
case VI_ATTR_USB_SERIAL_NUM:
return AttributeValueData::kValueString;

case VI_ATTR_BUFFER:
case VI_ATTR_TCPIP_SERVER_CERT:
case VI_ATTR_USB_RECV_INTR_DATA:
return AttributeValueData::kValueBytes;

Expand Down
Loading

0 comments on commit 2c87b79

Please sign in to comment.