Merge branch 'master' of https://git.astron.nl/lofar2.0/pypcc

pypcc/config/CCDTR.yaml

@@ -308,6 +308,7 @@ methods:
     debug: True
     instructions:   
       - CCDTR_I2C_error : 0
+      - WAIT: 2000
       - CCD_IO1_GPIO1 : Update
       - CCD_IO1_GPIO2 : Update
       - CCD_BACK_ID: Update
@@ -343,16 +344,23 @@ methods:
      - IO1.GPIO1: 0x42 #0100 0010 CS=high 
      - WAIT: 200        
      - CCD_PLL_setup: 0
+     - FAN_setup: 0
+     - WAIT: 500         #ms to wait before checking lock
+     - CCD_clear_lock: 1
+     - CCD_clear_lock: 0
+     - CCDTR_Update: 0   #refresh all settings
+
+  - name: FAN_setup  
+    driver: I2C_CLK
+    debug: true
+    instructions:   
      - MAX.0x00 : 0x00
      - MAX.0x02 : 0x08
      - MAX.0x01 : 0x0F
      - MAX.0x06 : 0x60
      - MAX.0x28 : 227
      - MAX.0x29 : 0x80
-     - WAIT: 500         #ms to wait before checking lock
-     - CCD_clear_lock: 1
-     - CCD_clear_lock: 0
-     - CCDTR_Update: 0   #refresh all settings
+
 
   - name: CCD_off  
     driver: I2C_CLK

pypcc/testing/check_ip.py

@@ -71,7 +71,7 @@ def check_ip():
  if ID in [0,1,2,3]: #APSCT in subrack
    ip_new='10.99.%i.100'%ID
    logging.info("APSCT subrack, ip=%s"%ip_new)
- if ID in [21,10]:
+ if ID in [20,21,10]:
    ip_new=IP_CCD
    logging.info("CCD detected, ip=%s"%ip_new)