Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update niRFmxNR to 23.8 #1003

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Update niRFmxNR to 23.8 #1003

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
040a2e4
Update niRFmxNR to 23.8
alenkani Sep 28, 2023
c747717
version number changes
alenkani Sep 28, 2023
8fd419c
test update
alenkani Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions generated/nirfmxnr/nirfmxnr.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-RFMXNR API metadata version 23.5.0
// This file is generated from NI-RFMXNR API metadata version 23.8.0
//---------------------------------------------------------------------
// Proto file for the NI-RFMXNR Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -395,6 +395,7 @@ enum NiRFmxNRAttribute {
NIRFMXNR_ATTRIBUTE_DOWNLINK_TEST_MODEL_CELL_ID_MODE = 9437470;
NIRFMXNR_ATTRIBUTE_SUBBLOCK_FREQUENCY = 9437471;
NIRFMXNR_ATTRIBUTE_SSB_HRF_INDEX = 9437472;
NIRFMXNR_ATTRIBUTE_BANDWIDTH_PART_DC_LOCATION_KNOWN = 9437473;
NIRFMXNR_ATTRIBUTE_TRANSMITTER_ARCHITECTURE = 9438267;
NIRFMXNR_ATTRIBUTE_PHASE_COMPENSATION = 9438269;
NIRFMXNR_ATTRIBUTE_LIST_STEP_TIMER_UNIT = 9441270;
Expand Down Expand Up @@ -1061,6 +1062,8 @@ enum NiRFmxNRInt32AttributeValues {
NIRFMXNR_INT32_AUTO_RESOURCE_BLOCK_DETECTION_ENABLED_TRUE = 1;
NIRFMXNR_INT32_BANDWIDTH_PART_CYCLIC_PREFIX_MODE_NORMAL = 0;
NIRFMXNR_INT32_BANDWIDTH_PART_CYCLIC_PREFIX_MODE_EXTENDED = 1;
NIRFMXNR_INT32_BANDWIDTH_PART_DC_LOCATION_KNOWN_FALSE = 0;
NIRFMXNR_INT32_BANDWIDTH_PART_DC_LOCATION_KNOWN_TRUE = 1;
NIRFMXNR_INT32_CHP_AMPLITUDE_CORRECTION_TYPE_RF_CENTER_FREQUENCY = 0;
NIRFMXNR_INT32_CHP_AMPLITUDE_CORRECTION_TYPE_SPECTRUM_FREQUENCY_BIN = 1;
NIRFMXNR_INT32_CHP_AVERAGING_ENABLED_FALSE = 0;
Expand Down Expand Up @@ -1130,7 +1133,8 @@ enum NiRFmxNRInt32AttributeValues {
NIRFMXNR_INT32_DOWNLINK_TEST_MODEL_MODULATION_TYPE_QAM16 = 2;
NIRFMXNR_INT32_DOWNLINK_TEST_MODEL_MODULATION_TYPE_QAM64 = 3;
NIRFMXNR_INT32_FREQUENCY_RANGE_RANGE1 = 0;
NIRFMXNR_INT32_FREQUENCY_RANGE_RANGE2 = 1;
NIRFMXNR_INT32_FREQUENCY_RANGE_RANGE2_1 = 1;
astarche marked this conversation as resolved.
Show resolved Hide resolved
NIRFMXNR_INT32_FREQUENCY_RANGE_RANGE2_2 = 2;
NIRFMXNR_INT32_GNODEB_CATEGORY_WIDE_AREA_BASE_STATION_CATEGORY_A = 0;
NIRFMXNR_INT32_GNODEB_CATEGORY_WIDE_AREA_BASE_STATION_CATEGORY_B_OPTION1 = 1;
NIRFMXNR_INT32_GNODEB_CATEGORY_WIDE_AREA_BASE_STATION_CATEGORY_B_OPTION2 = 2;
Expand Down Expand Up @@ -1398,6 +1402,8 @@ enum NiRFmxNRInt32AttributeValues {
NIRFMXNR_INT32_SSB_PATTERN_C_3GHZ_TO_6GHZ = 5;
NIRFMXNR_INT32_SSB_PATTERN_D = 6;
NIRFMXNR_INT32_SSB_PATTERN_E = 7;
NIRFMXNR_INT32_SSB_PATTERN_F = 8;
NIRFMXNR_INT32_SSB_PATTERN_G = 9;
NIRFMXNR_INT32_TRANSMITTER_ARCHITECTURE_LO_PER_COMPONENT_CARRIER = 0;
NIRFMXNR_INT32_TRANSMITTER_ARCHITECTURE_LO_PER_SUBBLOCK = 1;
NIRFMXNR_INT32_TRIGGER_MINIMUM_QUIET_TIME_MODE_MANUAL = 0;
Expand Down
25 changes: 24 additions & 1 deletion imports/include/niRFmxNR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#define RFMXNR_ATTR_GRID_SIZE 0x0090009a
#define RFMXNR_ATTR_BANDWIDTH_PART_RESOURCE_BLOCK_OFFSET 0x0090003e
#define RFMXNR_ATTR_BANDWIDTH_PART_NUMBER_OF_RESOURCE_BLOCKS 0x0090003f
#define RFMXNR_ATTR_BANDWIDTH_PART_DC_LOCATION_KNOWN 0x00900121
#define RFMXNR_ATTR_NUMBER_OF_USERS 0x00900064
#define RFMXNR_ATTR_RNTI 0x00900065
#define RFMXNR_ATTR_NUMBER_OF_PUSCH_CONFIGURATIONS 0x0090004b
Expand Down Expand Up @@ -564,7 +565,8 @@

// Values for RFMXNR_ATTR_FREQUENCY_RANGE
#define RFMXNR_VAL_FREQUENCY_RANGE_RANGE1 0
#define RFMXNR_VAL_FREQUENCY_RANGE_RANGE2 1
#define RFMXNR_VAL_FREQUENCY_RANGE_RANGE2_1 1
#define RFMXNR_VAL_FREQUENCY_RANGE_RANGE2_2 2

// Values for RFMXNR_ATTR_COMPONENT_CARRIER_SPACING_TYPE
#define RFMXNR_VAL_COMPONENT_CARRIER_SPACING_TYPE_NOMINAL 0
Expand Down Expand Up @@ -604,6 +606,10 @@
#define RFMXNR_VAL_BANDWIDTH_PART_CYCLIC_PREFIX_MODE_NORMAL 0
#define RFMXNR_VAL_BANDWIDTH_PART_CYCLIC_PREFIX_MODE_EXTENDED 1

// Values for RFMXNR_ATTR_BANDWIDTH_PART_DC_LOCATION_KNOWN
#define RFMXNR_VAL_BANDWIDTH_PART_DC_LOCATION_KNOWN_FALSE 0
#define RFMXNR_VAL_BANDWIDTH_PART_DC_LOCATION_KNOWN_TRUE 1

// Values for RFMXNR_ATTR_PUSCH_TRANSFORM_PRECODING_ENABLED
#define RFMXNR_VAL_PUSCH_TRANSFORM_PRECODING_ENABLED_FALSE 0
#define RFMXNR_VAL_PUSCH_TRANSFORM_PRECODING_ENABLED_TRUE 1
Expand Down Expand Up @@ -722,6 +728,8 @@
#define RFMXNR_VAL_SSB_PATTERN_CASE_C_3GHZ_TO_6GHZ 5
#define RFMXNR_VAL_SSB_PATTERN_CASE_D 6
#define RFMXNR_VAL_SSB_PATTERN_CASE_E 7
#define RFMXNR_VAL_SSB_PATTERN_CASE_F 8
#define RFMXNR_VAL_SSB_PATTERN_CASE_G 9

// Values for RFMXNR_ATTR_LIST_STEP_TIMER_UNIT
#define RFMXNR_VAL_LIST_STEP_TIMER_UNIT_SLOT 1
Expand Down Expand Up @@ -3946,6 +3954,18 @@ int32 __stdcall RFmxNR_SetBandwidthPartNumberOfResourceBlocks(
int32 attrVal
);

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

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

int32 __stdcall RFmxNR_GetNumberOfUsers(
niRFmxInstrHandle instrumentHandle,
char selectorString[],
Expand Down Expand Up @@ -8037,6 +8057,9 @@ int32 __stdcall RFmxNR_PVTGetResultsPeakWindowedOFFPowerTime(
#define RFMXNR_VAL_MODACC_TIMING_TRACKING_ENABLED_FALSE 0
#define RFMXNR_VAL_MODACC_TIMING_TRACKING_ENABLED_TRUE 1

// Values for RFMXNR_ATTR_FREQUENCY_RANGE
#define RFMXNR_VAL_FREQUENCY_RANGE_RANGE2 1

#ifdef __cplusplus
extern "C"
{
Expand Down
6 changes: 6 additions & 0 deletions source/codegen/metadata/nirfmxnr/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,12 @@
'name': 'SSB_HRF_INDEX',
'type': 'int32'
},
9437473: {
'access': 'read-write',
'enum': 'BandwidthPartDCLocationKnown',
'name': 'BANDWIDTH_PART_DC_LOCATION_KNOWN',
'type': 'int32'
},
9438267: {
'access': 'read-write',
'enum': 'TransmitterArchitecture',
Expand Down
2 changes: 1 addition & 1 deletion source/codegen/metadata/nirfmxnr/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
config = {
'api_version': '23.5.0',
'api_version': '23.8.0',
'c_header': 'niRFmxNR.h',
'c_function_prefix': 'RFmxNR_',
'service_class_prefix': 'NiRFmxNR',
Expand Down
26 changes: 25 additions & 1 deletion source/codegen/metadata/nirfmxnr/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,18 @@
}
]
},
'BandwidthPartDCLocationKnown': {
'values': [
{
'name': 'FALSE',
'value': 0
},
{
'name': 'TRUE',
'value': 1
}
]
},
'ChpAmplitudeCorrectionType': {
'values': [
{
Expand Down Expand Up @@ -787,8 +799,12 @@
'value': 0
},
{
'name': 'RANGE2',
'name': 'RANGE2_1',
'value': 1
},
{
'name': 'RANGE2_2',
'value': 2
}
]
},
Expand Down Expand Up @@ -2385,6 +2401,14 @@
{
'name': 'E',
'value': 7
},
{
'name': 'F',
'value': 8
},
{
'name': 'G',
'value': 9
}
]
},
Expand Down
Loading