From e32252dc253b6479b2ac0d848d889cc06d656ec2 Mon Sep 17 00:00:00 2001
From: kruger <kruger@astron.nl>
Date: Thu, 20 Jun 2024 20:22:02 +0200
Subject: [PATCH] DTH don't readback freq&power
---
pypcc/config/APSPUTR.yaml | 1 +
pypcc/config/RECVTR_HB.yaml | 18 ++++++++++++++----
pypcc/config/RECVTR_LB.yaml | 19 ++++++++++++++-----
scripts/ADC_JESDtest.py | 4 ++--
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/pypcc/config/APSPUTR.yaml b/pypcc/config/APSPUTR.yaml
index 662ef64..07376d9 100644
--- a/pypcc/config/APSPUTR.yaml
+++ b/pypcc/config/APSPUTR.yaml
@@ -176,6 +176,7 @@ methods:
driver: I2C_PU
debug: True
instructions:
+ - WAIT: 5000
- APSPU_PCB_ID : Update
- APSPU_PCB_version : Update
- APSPU_PCB_number : Update
diff --git a/pypcc/config/RECVTR_HB.yaml b/pypcc/config/RECVTR_HB.yaml
index d53ae66..3c9fe4e 100644
--- a/pypcc/config/RECVTR_HB.yaml
+++ b/pypcc/config/RECVTR_HB.yaml
@@ -987,7 +987,7 @@ methods:
- DTH1.PA_CONFIG : [0,45,0,0,125,127]
- DTH2.PA_CONFIG : [0,45,0,0,125,127]
- DTH3.PA_CONFIG : [0,45,0,0,125,127]
- - RCU_DTH_PWR : Update_background
+# - RCU_DTH_PWR : Update_background
- RCU_DTH_freq : [
5, 206, 62, 32, 5, 206, 129, 255, 5, 206, 197, 172, 5, 219, 84, 32, 5, 219, 142, 159, 5, 219, 200, 236, 5, 213, 1, 96, 5, 213, 64, 143, 5, 213, 127, 140,
5, 225, 54, 96, 5, 225, 108, 47, 5, 225, 161, 204, 5, 209, 173, 208, 5, 209, 239, 87, 5, 210, 48, 172, 5, 222, 83, 80, 5, 222, 139, 119, 5, 222, 195, 108,
@@ -1007,8 +1007,18 @@ methods:
- DTH1.Tune : [0,0] #no tuning
- DTH2.Tune : [0,0] #no tuning
- DTH3.Tune : [0,0] #no tuning
- - RCU_DTH_freq : Update_background
+# - RCU_DTH_freq : Update _background
#
+ - name: RCU_DTH_update
+ description: Read frequency and power settings back (take about a minute)
+ driver: I2C_RCU
+ mask: RCU_mask
+# rw: hidden
+ instructions:
+ - RCU_DTH_PWR : Update
+ - RCU_DTH_freq : Update
+
+
- name: RCU_DTH_on
description: Switch dither source on
driver: I2C_RCU
@@ -1022,7 +1032,7 @@ methods:
- DTH1.Start : [0,1,0,0,1]
- DTH2.Start : [0,1,0,0,1]
- DTH3.Start : [0,1,0,0,1]
- - RCU_DTH_on : Update_background
+ - RCU_DTH_on : Update #_background
- name: RCU_DTH_off
description: Switch dither source off
@@ -1040,7 +1050,7 @@ methods:
# - DTH1.State : [0,0]
# - DTH2.State : [0,0]
# - DTH3.State : [0,0]
- - RCU_DTH_on: Update_background
+ - RCU_DTH_on: Update #_background
- name: RCU_DTH_restart #restart to update frequency
driver: I2C_RCU
diff --git a/pypcc/config/RECVTR_LB.yaml b/pypcc/config/RECVTR_LB.yaml
index c3c69f7..0466961 100644
--- a/pypcc/config/RECVTR_LB.yaml
+++ b/pypcc/config/RECVTR_LB.yaml
@@ -873,7 +873,7 @@ methods:
- DTH1.PA_CONFIG : [0,45,0,0,125,127]
- DTH2.PA_CONFIG : [0,45,0,0,125,127]
- DTH3.PA_CONFIG : [0,45,0,0,125,127]
- - RCU_DTH_PWR : Update_background
+# - RCU_DTH_PWR : Update_background
- RCU_DTH_freq : [
5, 206, 62, 32, 5, 206, 129, 255, 5, 206, 197, 172, 5, 219, 84, 32, 5, 219, 142, 159, 5, 219, 200, 236, 5, 213, 1, 96, 5, 213, 64, 143, 5, 213, 127, 140,
5, 225, 54, 96, 5, 225, 108, 47, 5, 225, 161, 204, 5, 209, 173, 208, 5, 209, 239, 87, 5, 210, 48, 172, 5, 222, 83, 80, 5, 222, 139, 119, 5, 222, 195, 108,
@@ -893,7 +893,16 @@ methods:
- DTH1.Tune : [0,0] #no tuning
- DTH2.Tune : [0,0] #no tuning
- DTH3.Tune : [0,0] #no tuning
- - RCU_DTH_freq : Update_background
+# - RCU_DTH_freq : Update_background
+
+ - name: RCU_DTH_update
+ description: Read frequency and power settings back (take about a minute)
+ driver: I2C_RCU
+ mask: RCU_mask
+# rw: hidden
+ instructions:
+ - RCU_DTH_PWR : Update
+ - RCU_DTH_freq : Update
- name: RCU_DTH_on
description: Switch dither source on
@@ -903,12 +912,12 @@ methods:
instructions:
# - RCU_DTH_config : [0,0,0]
# - RCU_DTH_config: Update #debug
- - RCU_DTH_setup : 0
+# - RCU_DTH_setup : 0
# - RCU_DTH_tune: Update #debug
- DTH1.Start : [0,1,0,0,1]
- DTH2.Start : [0,1,0,0,1]
- DTH3.Start : [0,1,0,0,1]
- - RCU_DTH_on : Update_background
+ - RCU_DTH_on : Update #_background
- name: RCU_DTH_off
description: Switch dither source off
@@ -926,7 +935,7 @@ methods:
# - DTH1.State : [0,0]
# - DTH2.State : [0,0]
# - DTH3.State : [0,0]
- - RCU_DTH_on: Update_background
+ - RCU_DTH_on: Update #_background
- name: RCU_DTH_restart #restart to update frequency
driver: I2C_RCU
diff --git a/scripts/ADC_JESDtest.py b/scripts/ADC_JESDtest.py
index 1703d28..1db6974 100644
--- a/scripts/ADC_JESDtest.py
+++ b/scripts/ADC_JESDtest.py
@@ -15,7 +15,7 @@ Att=[True]*3
setAntmask(RCU)
wait_not_busy("RECVTR_translator_busy_R",10)
-att=get_value(name+"_R")
+att=get_debug_value(name+"_R")
print("JESD old:",att[:15])
#for r in RCU:
@@ -27,7 +27,7 @@ if True:
time.sleep(0.5)
wait_not_busy("RECVTR_translator_busy_R",10)
- att=get_value(name+"_R")
+ att=get_debug_value(name+"_R")
print("JESD new:",att[:15])
--
GitLab