From 2c94dd36eea85e650df58e2b7d338d81cd6a6896 Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Thu, 3 Sep 2020 17:24:33 -0700 Subject: [PATCH 1/3] AD5592 and one-bit-adcdac device interface to QMxFE classes Signed-off-by: Travis F. Collins --- +adi/+QuadMxFE/Base.m | 9 +++++++++ +adi/+QuadMxFE/Rx.m | 4 ++++ +adi/+QuadMxFE/Tx.m | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/+adi/+QuadMxFE/Base.m b/+adi/+QuadMxFE/Base.m index 0da53f10..a5455f97 100644 --- a/+adi/+QuadMxFE/Base.m +++ b/+adi/+QuadMxFE/Base.m @@ -23,6 +23,10 @@ SamplingRate = 250e6; end + properties (Logical) + CalibrationBoardAttached = false; + end + properties(Nontunable, Hidden) Timeout = Inf; kernelBuffersCount = 2; @@ -38,6 +42,11 @@ ComplexData = true; end + properties (Hidden) + iioAD5592r; + iioOneBitADCDAC; + end + methods %% Constructor function obj = Base(varargin) diff --git a/+adi/+QuadMxFE/Rx.m b/+adi/+QuadMxFE/Rx.m index a0d63288..4ae873f3 100644 --- a/+adi/+QuadMxFE/Rx.m +++ b/+adi/+QuadMxFE/Rx.m @@ -368,6 +368,10 @@ function setupInit(obj) obj.iioDev1 = getDev(obj, obj.devName1); obj.iioDev2 = getDev(obj, obj.devName2); obj.iioHMC425a = getDev(obj, 'hmc425a'); + if obj.CalibrationBoardAttached + obj.iioAD5592r = getDev(obj, 'AD5592r'); + obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac’'); + end % Update attributes obj.setAttributeRAW('voltage0_i','test_mode',... diff --git a/+adi/+QuadMxFE/Tx.m b/+adi/+QuadMxFE/Tx.m index f7b6e2a5..85d061f5 100644 --- a/+adi/+QuadMxFE/Tx.m +++ b/+adi/+QuadMxFE/Tx.m @@ -422,6 +422,10 @@ function setupInit(obj) obj.iioDevADF4371_2 = getDev(obj, 'adf4371-2'); obj.iioDevADF4371_3 = getDev(obj, 'adf4371-3'); obj.iioDevHMC7043 = getDev(obj, 'hmc7043'); + if obj.CalibrationBoardAttached + obj.iioAD5592r = getDev(obj, 'AD5592r'); + obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac’'); + end %% obj.CheckAndUpdateHW(obj.ChannelNCOFrequenciesChipA,... From 73308e66278315b670dcd8fda8c375a39e4e20a3 Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Fri, 4 Sep 2020 13:04:46 -0700 Subject: [PATCH 2/3] Fix some minor typos QMxFE classes Signed-off-by: Travis F. Collins --- +adi/+QuadMxFE/Rx.m | 6 +++--- +adi/+QuadMxFE/Tx.m | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/+adi/+QuadMxFE/Rx.m b/+adi/+QuadMxFE/Rx.m index 4ae873f3..6df7075a 100644 --- a/+adi/+QuadMxFE/Rx.m +++ b/+adi/+QuadMxFE/Rx.m @@ -340,7 +340,7 @@ obj.ExternalAttenuation = value; if obj.ConnectedToDevice id = 'voltage0'; - obj.setAttributeLongLong(id,'hardwaregain',value,true,obj.iioHMC425a); + obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioHMC425a); end end end @@ -369,8 +369,8 @@ function setupInit(obj) obj.iioDev2 = getDev(obj, obj.devName2); obj.iioHMC425a = getDev(obj, 'hmc425a'); if obj.CalibrationBoardAttached - obj.iioAD5592r = getDev(obj, 'AD5592r'); - obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac’'); + obj.iioAD5592r = getDev(obj, 'ad5592r'); + obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac'); end % Update attributes diff --git a/+adi/+QuadMxFE/Tx.m b/+adi/+QuadMxFE/Tx.m index 85d061f5..f0de9cbb 100644 --- a/+adi/+QuadMxFE/Tx.m +++ b/+adi/+QuadMxFE/Tx.m @@ -423,8 +423,8 @@ function setupInit(obj) obj.iioDevADF4371_3 = getDev(obj, 'adf4371-3'); obj.iioDevHMC7043 = getDev(obj, 'hmc7043'); if obj.CalibrationBoardAttached - obj.iioAD5592r = getDev(obj, 'AD5592r'); - obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac’'); + obj.iioAD5592r = getDev(obj, 'ad5592r'); + obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac'); end %% From 32ba495a1e0364bc5d46a7352f865514d715c3be Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Fri, 4 Sep 2020 13:17:29 -0700 Subject: [PATCH 3/3] Update common submodule to include to optional phy inputs Signed-off-by: Travis F. Collins --- +adi/+common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/+adi/+common b/+adi/+common index 938b49d8..62420f9e 160000 --- a/+adi/+common +++ b/+adi/+common @@ -1 +1 @@ -Subproject commit 938b49d8b2bb6e144c4aaa9b52a4f2ac571606e2 +Subproject commit 62420f9e37bdfe9109941783c9f2be65aec16858