Skip to content
Snippets Groups Projects
Commit 0bbd543c authored by Paulus Kruger's avatar Paulus Kruger
Browse files

debugging...

parent a61118f8
No related branches found
No related tags found
1 merge request!11Pypcc2
...@@ -105,9 +105,9 @@ variables: ...@@ -105,9 +105,9 @@ variables:
debug: True debug: True
methods: methods:
- name: Init #Called after startup to load. Should have all stored registers - name: CLK_Init #Called after startup to load. Should have all stored registers
driver: I2C_CLK driver: I2C_CLK
hidden: True debug: True
instructions: instructions:
- CLK_I2C_OK : 1 - CLK_I2C_OK : 1
- RCU_IO1_GPIO1 : Update - RCU_IO1_GPIO1 : Update
...@@ -119,24 +119,26 @@ methods: ...@@ -119,24 +119,26 @@ methods:
- name: CLK_on - name: CLK_on
driver: I2C_CLK driver: I2C_CLK
instructions: instructions:
- CLK_I2C_OK : 1
- IO1.CONF1: 0x2C #0010 1100 PPS/PWR output, SCLK,CS,SDI - IO1.CONF1: 0x2C #0010 1100 PPS/PWR output, SCLK,CS,SDI
- IO1.GPIO1: 0x42 #0100 0010 high:PWR enable, CS - IO1.GPIO1: 0x42 #0100 0010 high:PWR enable, CS
- CLK_Enable_PWR: Update - CLK_Enable_PWR: Update
- WAIT: 200 #ms to wait before checking lock
- CLK_PLL_setup: 0
- WAIT: 100 #ms to wait before checking lock
- CLK_PLL_locked: Update
- name: CLK_off - name: CLK_off
driver: I2C_CLK driver: I2C_CLK
instructions: instructions:
- CLK_I2C_OK : 1
- IO1.CONF1: 0x2C #0010 1100 PPS/PWR output, SCLK,CS,SDI - IO1.CONF1: 0x2C #0010 1100 PPS/PWR output, SCLK,CS,SDI
- IO1.GPIO1: 0x00 #all low - IO1.GPIO1: 0x00 #all low
- CLK_Enable_PWR: Update - CLK_Enable_PWR: Update
# - WAIT: 100 #ms to wait before checking lock
# - CLK_PLL_setup: 0
# - WAIT: 100 #ms to wait before checking lock
# - CLK_PLL_locked: Update
- name: CLK_PLL_setup - name: CLK_PLL_setup
driver: I2C_CLK driver: I2C_CLK
debug: true
instructions: instructions:
# - PLL.0x03: 0x08 #Set power, this is default # - PLL.0x03: 0x08 #Set power, this is default
- PLL.0x05: 0x17 #was 97, set lock time - PLL.0x05: 0x17 #was 97, set lock time
......
...@@ -252,22 +252,22 @@ variables: ...@@ -252,22 +252,22 @@ variables:
description: LED on RCU description: LED on RCU
devreg: IO2.GPIO2 devreg: IO2.GPIO2
bitoffset: 6 bitoffset: 6
width: 2 width: 1
rw: rw rw: rw
dtype: uint8 dtype: boolean
dim: 32 dim: 32
mask: RCU_mask mask: RCU_mask
# - name: RCU_LED1 - name: RCU_LED1
# driver: I2C_RCU driver: I2C_RCU
# description: LED on RCU description: LED on RCU
# devreg: IO2.GPIO2 devreg: IO2.GPIO2
# bitoffset: 7 bitoffset: 7
# width: 1 width: 1
# rw: rw rw: rw
# dtype: boolean dtype: boolean
# dim: 32 dim: 32
# mask: RCU_mask mask: RCU_mask
- name: RCU_temperature - name: RCU_temperature
description: Temperature sensor on RCU description: Temperature sensor on RCU
...@@ -357,9 +357,9 @@ variables: ...@@ -357,9 +357,9 @@ variables:
mask: Ant_mask mask: Ant_mask
methods: methods:
- name: Init #Called after startup to load. Should have all stored registers - name: RCU_Init #Called after startup to load. Should have all stored registers
driver: I2C_RCU driver: I2C_RCU
hidden: True debug: True
instructions: instructions:
- RCU_state: 2 - RCU_state: 2
- RCU_IO1_GPIO1: Update - RCU_IO1_GPIO1: Update
......
...@@ -5,31 +5,44 @@ drivers: ...@@ -5,31 +5,44 @@ drivers:
- name: I2C1 - name: I2C1
type: i2c_switch2 type: i2c_switch2
devreg: [APSCT_SWITCH.MASK,UB2_SWITCH1.MASK,UB2_SWITCH2.MASK] devreg: [APSCT_SWITCH.MASK,UB2_SWITCH1.MASK,UB2_SWITCH2.MASK]
parameters: [1,0,0,0] #I2C port number, 3x switch reset pins parameters: [3,0,0,0] #I2C port number, 3x switch reset pins
- name: switch_UNB2 - name: switch_UNB2
type: i2c_array type: i2c_array
parent: I2C1 parent: I2C1
parameters: [0,1] parameters: [0,1]
mask: UNB2_I2C_bus_OK
- name: switch_PS - name: switch_PS
type: i2c_array2 type: i2c_array2
parent: I2C1 parent: I2C1
parameters: [0,1, 4,4] parameters: [0,1, 4,4]
mask: UNB2_I2C_bus_PS_OK
- name: switch_FP - name: switch_FP
type: i2c_array2 type: i2c_array2
parent: I2C1 parent: I2C1
parameters: [0,1, 5,5] parameters: [0,1, 5,5]
mask: UNB2_I2C_bus_FP_OK
- name: switch_QSFP - name: switch_QSFP
type: i2c_array2 #An array of similar devices connected to an I2C switch type: i2c_array2 #An array of similar devices connected to an I2C switch
parent: I2C1 parent: I2C1
parameters: [0,1, 0,3, 0,3, 6,7] #Parameters: APSCT_Switch, main switch, 2nd switch, 2nd switch parameters: [0,1, 0,3, 0,3, 6,7] #Parameters: APSCT_Switch, main switch, 2nd switch, 2nd switch
mask: UNB2_I2C_bus_QSFP_OK
- name: switch_DDR4 - name: switch_DDR4
type: i2c_array2 type: i2c_array2
parent: I2C1 parent: I2C1
parameters: [0,1, 0,3, 4,4] parameters: [0,1, 0,3, 4,4]
mask: UNB2_I2C_bus_DDR4_OK
- name: switch_FPGA_PS - name: switch_FPGA_PS
type: i2c_array2 type: i2c_array2
parent: I2C1 parent: I2C1
parameters: [0,1, 0,3, 5,5] parameters: [0,1, 0,3, 5,5]
mask: UNB2_I2C_bus_FPGA_PS_OK
- name: GPIO - name: GPIO
type: gpio type: gpio
...@@ -80,6 +93,11 @@ variables: ...@@ -80,6 +93,11 @@ variables:
rw: variable rw: variable
dtype: boolean dtype: boolean
dim: 2 dim: 2
- name: UNB2_I2C_bus_FP_OK
driver: switch_UNB2
rw: hidden
dtype: boolean
dim: 2
- name: UNB2_I2C_bus_QSFP_OK - name: UNB2_I2C_bus_QSFP_OK
driver: switch_QSFP driver: switch_QSFP
rw: variable rw: variable
......
...@@ -87,8 +87,10 @@ class yamlreader(yamlconfig): ...@@ -87,8 +87,10 @@ class yamlreader(yamlconfig):
self.server.callmethod(id1,mask) self.server.callmethod(id1,mask)
def CallInit(self): def CallInit(self):
v=Find(self.conf['methods'],'name','Init'); v=Find(self.conf['methods'],'name',self.yamlfile+'_Init');
if not(v): return; if not(v):
logging.warn(self.yamlfile+"_Init method not found for initialisation!")
return;
self.server.callmethod(v['id'],[]) self.server.callmethod(v['id'],[])
def setvar(self,id1,data=[]): def setvar(self,id1,data=[]):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment