Skip to content

Commit

Permalink
Updating nirfmxlte to 23.0 with generated files from scrapigen (#853)
Browse files Browse the repository at this point in the history
  • Loading branch information
@WesleyTangNationalInstruments
WesleyTangNationalInstruments authored Feb 22, 2023
1 parent 047f52b commit 791a18c
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 4 deletions.
25 changes: 23 additions & 2 deletions generated/nirfmxlte/nirfmxlte.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ enum NiRFmxLTEAttribute {
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE2_MAXIMUM_TO_RANGE2_MINIMUM = 3162157;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE1_MAXIMUM_TO_RANGE2_MINIMUM = 3162158;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE2_MAXIMUM_TO_RANGE1_MINIMUM = 3162159;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MAXIMUM_PEAK_IQ_ORIGIN_OFFSET = 3162160;
NIRFMXLTE_ATTRIBUTE_MODACC_EVM_WITH_EXCLUSION_PERIOD_ENABLED = 3162162;
NIRFMXLTE_ATTRIBUTE_MODACC_SPECTRUM_INVERTED = 3162166;
NIRFMXLTE_ATTRIBUTE_MODACC_CHANNEL_ESTIMATION_TYPE = 3162167;
Expand Down Expand Up @@ -569,6 +570,11 @@ enum NiRFmxLTEAttribute {
NIRFMXLTE_ATTRIBUTE_MODACC_IQ_QUADRATURE_ERROR_CORRECTION_ENABLED = 3162236;
NIRFMXLTE_ATTRIBUTE_MODACC_IQ_TIMING_SKEW_CORRECTION_ENABLED = 3162237;
NIRFMXLTE_ATTRIBUTE_MODACC_MULTICARRIER_TIME_SYNCHRONIZATION_MODE = 3162238;
NIRFMXLTE_ATTRIBUTE_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL = 3162239;
NIRFMXLTE_ATTRIBUTE_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED = 3162240;
NIRFMXLTE_ATTRIBUTE_MODACC_TIMING_TRACKING_ENABLED = 3162241;
NIRFMXLTE_ATTRIBUTE_MODACC_PHASE_TRACKING_ENABLED = 3162242;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MAXIMUM_PEAK_FREQUENCY_ERROR = 3162243;
NIRFMXLTE_ATTRIBUTE_OBW_MEASUREMENT_ENABLED = 3170304;
NIRFMXLTE_ATTRIBUTE_OBW_NUMBER_OF_ANALYSIS_THREADS = 3170307;
NIRFMXLTE_ATTRIBUTE_OBW_SPAN = 3170308;
Expand Down Expand Up @@ -1112,8 +1118,11 @@ enum SemUplinkMaskType {
SEM_UPLINK_MASK_TYPE_CUSTOM = 5;
SEM_UPLINK_MASK_TYPE_GENERAL_CACLASSB = 6;
SEM_UPLINK_MASK_TYPE_CANCNS01 = 7;
SEM_UPLINK_MASK_TYPE_NS27 = 8;
SEM_UPLINK_MASK_TYPE_NS27_OR_NS43 = 8;
SEM_UPLINK_MASK_TYPE_NS35 = 9;
SEM_UPLINK_MASK_TYPE_NS28 = 10;
SEM_UPLINK_MASK_TYPE_CANS09 = 11;
SEM_UPLINK_MASK_TYPE_CANS10 = 12;
}

enum SemUpperOffsetMeasurementStatus {
Expand Down Expand Up @@ -1336,13 +1345,22 @@ enum NiRFmxLTEInt32AttributeValues {
NIRFMXLTE_INT32_MODACC_MULTICARRIER_FILTER_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_MODACC_MULTICARRIER_TIME_SYNCHRONIZATION_MODE_COMMON = 0;
NIRFMXLTE_INT32_MODACC_MULTICARRIER_TIME_SYNCHRONIZATION_MODE_PER_CARRIER = 1;
NIRFMXLTE_INT32_MODACC_PHASE_TRACKING_ENABLED_FALSE = 0;
NIRFMXLTE_INT32_MODACC_PHASE_TRACKING_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_SLOT = 0;
NIRFMXLTE_INT32_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_SUBFRAME = 1;
NIRFMXLTE_INT32_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_MEASUREMENT_LENGTH = 2;
NIRFMXLTE_INT32_MODACC_SPECTRAL_FLATNESS_CONDITION_NORMAL = 0;
NIRFMXLTE_INT32_MODACC_SPECTRAL_FLATNESS_CONDITION_EXTREME = 1;
NIRFMXLTE_INT32_MODACC_SPECTRUM_INVERTED_FALSE = 0;
NIRFMXLTE_INT32_MODACC_SPECTRUM_INVERTED_TRUE = 1;
NIRFMXLTE_INT32_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED_FALSE = 0;
NIRFMXLTE_INT32_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_MODACC_SYNCHRONIZATION_MODE_FRAME = 0;
NIRFMXLTE_INT32_MODACC_SYNCHRONIZATION_MODE_SLOT = 1;
NIRFMXLTE_INT32_MODACC_SYNCHRONIZATION_MODE_MARKER = 2;
NIRFMXLTE_INT32_MODACC_TIMING_TRACKING_ENABLED_FALSE = 0;
NIRFMXLTE_INT32_MODACC_TIMING_TRACKING_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_NB_IOT_UPLINK_SUBCARRIER_SPACING_15KHZ = 0;
NIRFMXLTE_INT32_NB_IOT_UPLINK_SUBCARRIER_SPACING_3_75KHZ = 1;
NIRFMXLTE_INT32_NPUSCH_DMRS_BASE_SEQUENCE_MODE_MANUAL = 0;
Expand Down Expand Up @@ -1422,8 +1440,11 @@ enum NiRFmxLTEInt32AttributeValues {
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_CUSTOM = 5;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_GENERAL_CACLASSB = 6;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_CANCNS01 = 7;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_NS27 = 8;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_NS27_OR_NS43 = 8;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_NS35 = 9;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_NS28 = 10;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_CANS09 = 11;
NIRFMXLTE_INT32_SEM_UPLINK_MASK_TYPE_CANS10 = 12;
NIRFMXLTE_INT32_SEM_UPPER_OFFSET_MEASUREMENT_STATUS_FAIL = 0;
NIRFMXLTE_INT32_SEM_UPPER_OFFSET_MEASUREMENT_STATUS_PASS = 1;
NIRFMXLTE_INT32_SLOT_PHASE_COMMON_CLOCK_SOURCE_ENABLED_FALSE = 0;
Expand Down
89 changes: 88 additions & 1 deletion imports/include/niRFmxLTE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
#define RFMXLTE_ATTR_MODACC_AVERAGING_COUNT 0x0030400b
#define RFMXLTE_ATTR_MODACC_ALL_TRACES_ENABLED 0x0030400d
#define RFMXLTE_ATTR_MODACC_NUMBER_OF_ANALYSIS_THREADS 0x0030400e
#define RFMXLTE_ATTR_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL 0x0030407f
#define RFMXLTE_ATTR_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED 0x00304080
#define RFMXLTE_ATTR_MODACC_TIMING_TRACKING_ENABLED 0x00304081
#define RFMXLTE_ATTR_MODACC_PHASE_TRACKING_ENABLED 0x00304082
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_RMS_COMPOSITE_EVM 0x0030400f
#define RFMXLTE_ATTR_MODACC_RESULTS_MAXIMUM_PEAK_COMPOSITE_EVM 0x00304010
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_RMS_COMPOSITE_MAGNITUDE_ERROR 0x0030403a
Expand All @@ -62,7 +66,9 @@
#define RFMXLTE_ATTR_MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE1_MAXIMUM_TO_RANGE2_MINIMUM 0x0030402e
#define RFMXLTE_ATTR_MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE2_MAXIMUM_TO_RANGE1_MINIMUM 0x0030402f
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_FREQUENCY_ERROR 0x00304022
#define RFMXLTE_ATTR_MODACC_RESULTS_MAXIMUM_PEAK_FREQUENCY_ERROR 0x00304083
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_IQ_ORIGIN_OFFSET 0x00304023
#define RFMXLTE_ATTR_MODACC_RESULTS_MAXIMUM_PEAK_IQ_ORIGIN_OFFSET 0x00304030
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_IQ_GAIN_IMBALANCE 0x00304024
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_QUADRATURE_ERROR 0x00304025
#define RFMXLTE_ATTR_MODACC_RESULTS_MEAN_IQ_TIMING_SKEW 0x00304026
Expand Down Expand Up @@ -538,6 +544,23 @@
#define RFMXLTE_VAL_MODACC_AVERAGING_ENABLED_FALSE 0
#define RFMXLTE_VAL_MODACC_AVERAGING_ENABLED_TRUE 1

// Values for RFMXLTE_ATTR_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL
#define RFMXLTE_VAL_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_SLOT 0
#define RFMXLTE_VAL_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_SUBFRAME 1
#define RFMXLTE_VAL_MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL_MEASUREMENT_LENGTH 2

// Values for RFMXLTE_ATTR_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED
#define RFMXLTE_VAL_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED_FALSE 0
#define RFMXLTE_VAL_MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED_TRUE 1

// Values for RFMXLTE_ATTR_MODACC_TIMING_TRACKING_ENABLED
#define RFMXLTE_VAL_MODACC_TIMING_TRACKING_ENABLED_FALSE 0
#define RFMXLTE_VAL_MODACC_TIMING_TRACKING_ENABLED_TRUE 1

// Values for RFMXLTE_ATTR_MODACC_PHASE_TRACKING_ENABLED
#define RFMXLTE_VAL_MODACC_PHASE_TRACKING_ENABLED_FALSE 0
#define RFMXLTE_VAL_MODACC_PHASE_TRACKING_ENABLED_TRUE 1

// Values for RFMXLTE_ATTR_ACP_RBW_FILTER_AUTO_BANDWIDTH
#define RFMXLTE_VAL_ACP_RBW_FILTER_AUTO_BANDWIDTH_FALSE 0
#define RFMXLTE_VAL_ACP_RBW_FILTER_AUTO_BANDWIDTH_TRUE 1
Expand Down Expand Up @@ -873,8 +896,11 @@
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_CUSTOM 5
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_GENERAL_CACLASSB 6
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_CANCNS01 7
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS27 8
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS27_OR_NS43 8
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS35 9
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS28 10
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_CANS09 11
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_CANS10 12

// Values for RFMXLTE_ATTR_SEM_DOWNLINK_MASK_TYPE
#define RFMXLTE_VAL_SEM_DOWNLINK_MASK_TYPE_ENODEB_CATEGORY_BASED 0
Expand Down Expand Up @@ -3775,6 +3801,54 @@ int32 __stdcall RFmxLTE_ModAccSetNumberOfAnalysisThreads(
int32 attrVal
);

int32 __stdcall RFmxLTE_ModAccGetPreFFTErrorEstimationInterval(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 *attrVal
);

int32 __stdcall RFmxLTE_ModAccSetPreFFTErrorEstimationInterval(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 attrVal
);

int32 __stdcall RFmxLTE_ModAccGetSymbolClockErrorEstimationEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 *attrVal
);

int32 __stdcall RFmxLTE_ModAccSetSymbolClockErrorEstimationEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 attrVal
);

int32 __stdcall RFmxLTE_ModAccGetTimingTrackingEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 *attrVal
);

int32 __stdcall RFmxLTE_ModAccSetTimingTrackingEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 attrVal
);

int32 __stdcall RFmxLTE_ModAccGetPhaseTrackingEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 *attrVal
);

int32 __stdcall RFmxLTE_ModAccSetPhaseTrackingEnabled(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
int32 attrVal
);

int32 __stdcall RFmxLTE_ModAccGetResultsMeanRMSCompositeEVM(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
Expand Down Expand Up @@ -3901,12 +3975,24 @@ int32 __stdcall RFmxLTE_ModAccGetResultsMeanFrequencyError(
float64 *attrVal
);

int32 __stdcall RFmxLTE_ModAccGetResultsMaximumPeakFrequencyError(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
float64 *attrVal
);

int32 __stdcall RFmxLTE_ModAccGetResultsMeanIQOriginOffset(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
float64 *attrVal
);

int32 __stdcall RFmxLTE_ModAccGetResultsMaximumPeakIQOriginOffset(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
float64 *attrVal
);

int32 __stdcall RFmxLTE_ModAccGetResultsMeanIQGainImbalance(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
Expand Down Expand Up @@ -7271,6 +7357,7 @@ int32 __stdcall RFmxLTE_SlotPowerSetAllTracesEnabled(

// Values for RFMXLTE_ATTR_SEM_UPLINK_MASK_TYPE
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS03_OR_NS11_OR_NS20 1
#define RFMXLTE_VAL_SEM_UPLINK_MASK_TYPE_NS27 8

// Values for RFMXLTE_ATTR_SUBBLOCK_FREQUENCY_DEFINITION
#define RFMXLTE_VAL_SUBBLOCK_FREQUENCY_DEFINITION_RELATIVE 0
Expand Down
34 changes: 34 additions & 0 deletions source/codegen/metadata/nirfmxlte/attributes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,11 @@
'name': 'MODACC_RESULTS_SPECTRAL_FLATNESS_RANGE2_MAXIMUM_TO_RANGE1_MINIMUM',
'type': 'float64'
},
3162160: {
'access': 'read-write',
'name': 'MODACC_RESULTS_MAXIMUM_PEAK_IQ_ORIGIN_OFFSET',
'type': 'float64'
},
3162162: {
'access': 'read-write',
'enum': 'ModAccEvmWithExclusionPeriodEnabled',
Expand Down Expand Up @@ -1402,6 +1407,35 @@
'name': 'MODACC_MULTICARRIER_TIME_SYNCHRONIZATION_MODE',
'type': 'int32'
},
3162239: {
'access': 'read-write',
'enum': 'ModAccPreFftErrorEstimationInterval',
'name': 'MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL',
'type': 'int32'
},
3162240: {
'access': 'read-write',
'enum': 'ModAccSymbolClockErrorEstimationEnabled',
'name': 'MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED',
'type': 'int32'
},
3162241: {
'access': 'read-write',
'enum': 'ModAccTimingTrackingEnabled',
'name': 'MODACC_TIMING_TRACKING_ENABLED',
'type': 'int32'
},
3162242: {
'access': 'read-write',
'enum': 'ModAccPhaseTrackingEnabled',
'name': 'MODACC_PHASE_TRACKING_ENABLED',
'type': 'int32'
},
3162243: {
'access': 'read-write',
'name': 'MODACC_RESULTS_MAXIMUM_PEAK_FREQUENCY_ERROR',
'type': 'float64'
},
3170304: {
'access': 'read-write',
'name': 'OBW_MEASUREMENT_ENABLED',
Expand Down
70 changes: 69 additions & 1 deletion source/codegen/metadata/nirfmxlte/enums.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,36 @@
}
]
},
'ModAccPhaseTrackingEnabled': {
'enum-value-prefix': 'MODACC_PHASE_TRACKING_ENABLED',
'values': [
{
'name': 'FALSE',
'value': 0
},
{
'name': 'TRUE',
'value': 1
}
]
},
'ModAccPreFftErrorEstimationInterval': {
'enum-value-prefix': 'MODACC_PRE_FFT_ERROR_ESTIMATION_INTERVAL',
'values': [
{
'name': 'SLOT',
'value': 0
},
{
'name': 'SUBFRAME',
'value': 1
},
{
'name': 'MEASUREMENT_LENGTH',
'value': 2
}
]
},
'ModAccSpectralFlatnessCondition': {
'enum-value-prefix': 'MODACC_SPECTRAL_FLATNESS_CONDITION',
'values': [
Expand All @@ -1215,6 +1245,19 @@
}
]
},
'ModAccSymbolClockErrorEstimationEnabled': {
'enum-value-prefix': 'MODACC_SYMBOL_CLOCK_ERROR_ESTIMATION_ENABLED',
'values': [
{
'name': 'FALSE',
'value': 0
},
{
'name': 'TRUE',
'value': 1
}
]
},
'ModAccSynchronizationMode': {
'enum-value-prefix': 'MODACC_SYNCHRONIZATION_MODE',
'values': [
Expand All @@ -1232,6 +1275,19 @@
}
]
},
'ModAccTimingTrackingEnabled': {
'enum-value-prefix': 'MODACC_TIMING_TRACKING_ENABLED',
'values': [
{
'name': 'FALSE',
'value': 0
},
{
'name': 'TRUE',
'value': 1
}
]
},
'NBIoTUplinkSubcarrierSpacing': {
'enum-value-prefix': 'NB_IOT_UPLINK_SUBCARRIER_SPACING',
'values': [
Expand Down Expand Up @@ -1675,12 +1731,24 @@
'value': 7
},
{
'name': 'NS27',
'name': 'NS27_OR_NS43',
'value': 8
},
{
'name': 'NS35',
'value': 9
},
{
'name': 'NS28',
'value': 10
},
{
'name': 'CANS09',
'value': 11
},
{
'name': 'CANS10',
'value': 12
}
]
},
Expand Down

0 comments on commit 791a18c

Please sign in to comment.