Skip to content
Snippets Groups Projects
Commit a4edea62 authored by Thomas Juerges's avatar Thomas Juerges
Browse files

Merge branch '2021-01-14-pypcc2' into 'master' 

Refactor for Paulus' pypcc2 version with arrays

See merge request !2
parents 0b73e774 0afb2183
Branches
Tags
1 merge request!2Refactor for Paulus' pypcc2 version with arrays
Expand all Show whitespace changes
Inline Side-by-side
CDB/LOFAR_ConfigDb.json
+ 127
− 60
View file @ a4edea62
......@@ -12,108 +12,166 @@
"RCUSCC": {
"PTS/RCUSCC/1": {
"attribute_properties": {
"ADC_JESD_R": {
"RCU_ADC_CML_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Attenuator_R": {
"event_period": [
"0"
"RCU_ADC_JESD_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Attenuator_RW": {
"event_period": [
"0"
"RCU_ADC_SYNC_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Band_R": {
"event_period": [
"0"
"RCU_ADC_lock_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Band_RW": {
"event_period": [
"0"
"RCU_ID_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"CLK_PLL_locked_R": {
"event_period": [
"0"
"RCU_LED0_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Dither_Frequency_R": {
"event_period": [
"0"
"RCU_LED0_RW": {
"archive_rel_change": [
"-1",
"1"
],
"format": [
"%6.8f"
"rel_change": [
"-1",
"1"
]
},
"RCU_OUT1_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-0.1",
"0.1"
"-1",
"1"
]
},
"Dither_Frequency_RW": {
"event_period": [
"0"
"RCU_OUT2_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_Pwr_dig_R": {
"archive_rel_change": [
"-1",
"1"
],
"format": [
"%6.8f"
"rel_change": [
"-1",
"1"
]
},
"RCU_attenuator_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-0.1",
"0.1"
"-1",
"1"
]
},
"LED_R": {
"event_period": [
"0"
"RCU_attenuator_RW": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"LED_RW": {
"event_period": [
"0"
"RCU_band_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Pwr_dig_R": {
"event_period": [
"0"
"RCU_band_RW": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_monitor_rate_RW": {
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"RCU_temperature_R": {
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"State": {
"event_period": [
"0"
......@@ -123,20 +181,11 @@
"event_period": [
"0"
]
},
"Temperature_R": {
"event_period": [
"0"
],
"rel_change": [
"-0.1",
"0.1"
]
}
},
"properties": {
"OPC_Server_Name": [
"10.87.6.23"
"ltspi.astron.nl"
],
"OPC_Server_Port": [
"4842"
......@@ -145,29 +194,47 @@
"5.0"
],
"polled_attr": [
"pwr_dig_r",
"1000",
"state",
"1000",
"status",
"1000",
"temperature_r",
"ant_mask_rw",
"1000",
"rcu_adc_cml_r",
"1000",
"rcu_adc_jesd_r",
"1000",
"rcu_adc_lock_r",
"1000",
"rcu_adc_sync_r",
"1000",
"rcu_attenuator_r",
"1000",
"rcu_attenuator_rw",
"1000",
"rcu_band_r",
"1000",
"rcu_band_rw",
"1000",
"rcu_id_r",
"1000",
"rcu_led0_r",
"1000",
"attenuator_r",
"rcu_led0_rw",
"1000",
"attenuator_rw",
"rcu_mask_rw",
"1000",
"band_r",
"rcu_monitor_rate_rw",
"1000",
"band_rw",
"rcu_out1_r",
"1000",
"clk_pll_locked_r",
"rcu_out2_r",
"1000",
"led_r",
"rcu_pwr_dig_r",
"1000",
"led_rw",
"rcu_temperature_r",
"1000",
"adc_jesd_r",
"rcu_version_r",
"1000"
]
}
......
CDB/thomas_ConfigDb.json
+ 127
− 60
View file @ a4edea62
......@@ -12,108 +12,166 @@
"RCUSCC": {
"PTS/RCUSCC/1": {
"attribute_properties": {
"ADC_JESD_R": {
"RCU_ADC_CML_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Attenuator_R": {
"event_period": [
"0"
"RCU_ADC_JESD_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Attenuator_RW": {
"event_period": [
"0"
"RCU_ADC_SYNC_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Band_R": {
"event_period": [
"0"
"RCU_ADC_lock_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Band_RW": {
"event_period": [
"0"
"RCU_ID_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"CLK_PLL_locked_R": {
"event_period": [
"0"
"RCU_LED0_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Dither_Frequency_R": {
"event_period": [
"0"
"RCU_LED0_RW": {
"archive_rel_change": [
"-1",
"1"
],
"format": [
"%6.8f"
"rel_change": [
"-1",
"1"
]
},
"RCU_OUT1_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-0.1",
"0.1"
"-1",
"1"
]
},
"Dither_Frequency_RW": {
"event_period": [
"0"
"RCU_OUT2_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_Pwr_dig_R": {
"archive_rel_change": [
"-1",
"1"
],
"format": [
"%6.8f"
"rel_change": [
"-1",
"1"
]
},
"RCU_attenuator_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-0.1",
"0.1"
"-1",
"1"
]
},
"LED_R": {
"event_period": [
"0"
"RCU_attenuator_RW": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"LED_RW": {
"event_period": [
"0"
"RCU_band_R": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"Pwr_dig_R": {
"event_period": [
"0"
"RCU_band_RW": {
"archive_rel_change": [
"-1",
"1"
],
"rel_change": [
"-1",
"1"
]
},
"RCU_monitor_rate_RW": {
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"RCU_temperature_R": {
"archive_rel_change": [
"-1.0",
"1.0"
],
"rel_change": [
"-1.0",
"1.0"
]
},
"State": {
"event_period": [
"0"
......@@ -123,15 +181,6 @@
"event_period": [
"0"
]
},
"Temperature_R": {
"event_period": [
"0"
],
"rel_change": [
"-0.1",
"0.1"
]
}
},
"properties": {
......@@ -139,35 +188,53 @@
"okeanos"
],
"OPC_Server_Port": [
"50000"
"4842"
],
"OPC_Time_Out": [
"5.0"
],
"polled_attr": [
"pwr_dig_r",
"1000",
"state",
"1000",
"status",
"1000",
"temperature_r",
"ant_mask_rw",
"1000",
"rcu_adc_cml_r",
"1000",
"rcu_adc_jesd_r",
"1000",
"rcu_adc_lock_r",
"1000",
"rcu_adc_sync_r",
"1000",
"rcu_attenuator_r",
"1000",
"rcu_attenuator_rw",
"1000",
"rcu_band_r",
"1000",
"rcu_band_rw",
"1000",
"rcu_id_r",
"1000",
"rcu_led0_r",
"1000",
"attenuator_r",
"rcu_led0_rw",
"1000",
"attenuator_rw",
"rcu_mask_rw",
"1000",
"band_r",
"rcu_monitor_rate_rw",
"1000",
"band_rw",
"rcu_out1_r",
"1000",
"clk_pll_locked_r",
"rcu_out2_r",
"1000",
"led_r",
"rcu_pwr_dig_r",
"1000",
"led_rw",
"rcu_temperature_r",
"1000",
"adc_jesd_r",
"rcu_version_r",
"1000"
]
}
......
RCUSCC/RCUSCC/RCUSCC.py
+ 324
− 153
View file @ a4edea62
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment