From 6a10d5b0996e4ca2696f579f2526a402f71b7dac Mon Sep 17 00:00:00 2001
From: kruger <kruger@astron.nl>
Date: Mon, 23 May 2022 18:05:52 +0200
Subject: [PATCH] Fixed RCU2H scaling to 3.3V ref

---
 pypcc/config/RECVTR_HB.yaml | 16 ++++++++--------
 pypcc/config/RECVTR_LB.yaml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pypcc/config/RECVTR_HB.yaml b/pypcc/config/RECVTR_HB.yaml
index cf1a873..8ba8eaf 100644
--- a/pypcc/config/RECVTR_HB.yaml
+++ b/pypcc/config/RECVTR_HB.yaml
@@ -11,7 +11,7 @@ drivers:
    type: i2c_array #An array of similar devices connected to an I2C switch
    parent: I2C1
 #   parameters: [20,22,0,2,     4,6,10,12,     14,16,18,24,    26,28,30,8,          7,5,3,1,     23,21,19,13,     11,9,15,17,  31,29,27,25] #RCU lookup table 
-   parameters: [32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,7,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32] #RCU lookup table 
+   parameters: [32,32,32,32  ,32,32,32,32  ,14,16,18,24  ,26,28,30,8  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32] #RCU lookup table 
 #   parameters: [20,22,0,2,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32] #RCU lookup table 
 #   parameters: [22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0]#repeat 1..7 for RCUH BF test
 #    12,14,16,18,24,26,28,30,8,7,5,3,1,23,21,19,13,11,9,15,17,31,29,27,25] #RCU lookup table 
@@ -347,7 +347,7 @@ variables:
      driver: I2C_RCU
      devreg:  AN.Temp
      width: 23
-     scale: 3.827e-3  #T=DATAOUT * Vref/12.25/32. Vreg=1.5 V
+     scale: 4.210e-3 #Scaled 1.1 for 3.3V ref. 3.827e-3 for 3.0V  #T=DATAOUT * Vref/12.25/32. Vref=1.5 V
      convert_unit: Kelvin2Celsius
      rw:  ro
      dtype: double
@@ -361,7 +361,7 @@ variables:
      driver: I2C_RCU
      devreg:  AN.V_3v3
      width: 23
-     scale: 1.463e-6
+     scale: 1.609e-6 #Scaled 1.1: 1.463e-6 #3.0V
      rw:  ro
      dtype: double
      dim: 32
@@ -374,7 +374,7 @@ variables:
      driver: I2C_RCU
      devreg:  AN.V_1v8
      width: 23
-     scale: 7.1526e-7
+     scale: 7.8679e-7 #Scaled 1.1: 7.1526e-7 #3.0V ref
      rw:  ro
      dtype: double
      dim: 32
@@ -387,7 +387,7 @@ variables:
      driver: I2C_RCU
      devreg:  AN.V_2v5
      width: 23
-     scale: 7.1526e-7
+     scale: 7.8679e-7 #Scaled 1.1: 7.1526e-7 #3.0V ref
      rw:  ro
      dtype: double
      dim: 32
@@ -400,7 +400,7 @@ variables:
      driver: I2C_RCU
      devreg:  [AN.V_Ant_O0,AN.V_Ant_O1,AN.V_Ant_O2]
      width: 23
-     scale: 2.7895e-6
+     scale: 1.57356e-5 #Scaled 1.1: 1.43051e-5 #3V ref
      rw:  ro
      dtype: double
      dim: 96
@@ -414,7 +414,7 @@ variables:
      driver: I2C_RCU
      devreg:  [AN.V_Ant_I0,AN.V_Ant_I1,AN.V_Ant_I2]
      width: 23
-     scale: 2.7895e-6
+     scale: 1.57356e-5 #Scaled 1.1: 1.43051e-5 #3V ref
      rw:  ro
      dtype: double
      dim: 96
@@ -428,7 +428,7 @@ variables:
      driver: I2C_RCU
      devreg:  [AN.I_Ant0,AN.I_Ant1,AN.I_Ant2]
      width: 23
-     scale: 7.1526e-8
+     scale: 2.62262e-7 #4.5K res
      rw:  ro
      dtype: double
      dim: 96
diff --git a/pypcc/config/RECVTR_LB.yaml b/pypcc/config/RECVTR_LB.yaml
index 5f73fcb..d10e1ba 100644
--- a/pypcc/config/RECVTR_LB.yaml
+++ b/pypcc/config/RECVTR_LB.yaml
@@ -11,7 +11,7 @@ drivers:
    type: i2c_array #An array of similar devices connected to an I2C switch
    parent: I2C1
 #   parameters: [20,22,0,2,     4,6,10,12,     14,16,18,24,    26,28,30,8,          7,5,3,1,     23,21,19,13,     11,9,15,17,  31,29,27,25] #RCU lookup table 
-   parameters: [32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,1  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32] #RCU lookup table 
+   parameters: [20,22,0,2     ,4,6,10,12  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32  ,32,32,32,32] #RCU lookup table 
 #   parameters: [20,22,0,2,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32] #RCU lookup table 
 #   parameters: [22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0,2,4,6,10,22,0]#repeat 1..7 for RCUH BF test
 #    12,14,16,18,24,26,28,30,8,7,5,3,1,23,21,19,13,11,9,15,17,31,29,27,25] #RCU lookup table 
-- 
GitLab