From 70fae082aeccb41fc9e730325c72fcc2dd0dce0c Mon Sep 17 00:00:00 2001
From: Pieter Donker <donker@astron.nl>
Date: Mon, 24 Jul 2017 13:41:25 +0000
Subject: [PATCH] Task #893: changed lib name
---
tools/oneclick/prestudy/YAML/mm_menu.py | 2 +-
.../peripherals/unb1_board.peripheral.yaml | 43 +++++++++
.../documentation.py | 0
.../{py_mm_lib => py_args_lib}/my_logger.py | 0
.../{py_mm_lib => py_args_lib}/peripheral.py | 2 +-
.../peripheral_lib/__init__.py | 0
.../peripheral_lib/base_object.py | 0
.../peripheral_lib/constants.py | 0
.../peripheral_lib/field.py | 0
.../peripheral_lib/fifo.py | 0
.../peripheral_lib/ram.py | 0
.../peripheral_lib/register.py | 0
.../{py_mm_lib => py_args_lib}/rom_system.py | 0
.../YAML/{py_mm_lib => py_args_lib}/system.py | 0
.../prestudy/YAML/py_mm_lib/__init__.py | 21 -----
.../apertif_unb1_bn_filterbank.system.yaml | 43 ++++++---
.../prestudy/YAML/systems/demo.system.yaml | 4 +
.../systems/unb1_minimal_sopc.system.yaml | 4 +
.../YAML/work/system_info.peripheral.yaml | 57 ------------
.../prestudy/YAML/work/work.peripheral.yaml | 89 -------------------
20 files changed, 82 insertions(+), 183 deletions(-)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/documentation.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/my_logger.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral.py (99%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/__init__.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/base_object.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/constants.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/field.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/fifo.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/ram.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/peripheral_lib/register.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/rom_system.py (100%)
rename tools/oneclick/prestudy/YAML/{py_mm_lib => py_args_lib}/system.py (100%)
delete mode 100644 tools/oneclick/prestudy/YAML/py_mm_lib/__init__.py
delete mode 100644 tools/oneclick/prestudy/YAML/work/system_info.peripheral.yaml
delete mode 100644 tools/oneclick/prestudy/YAML/work/work.peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/mm_menu.py b/tools/oneclick/prestudy/YAML/mm_menu.py
index d41c11d8fb..cd65b39b8b 100755
--- a/tools/oneclick/prestudy/YAML/mm_menu.py
+++ b/tools/oneclick/prestudy/YAML/mm_menu.py
@@ -31,7 +31,7 @@ import argparse
import yaml
import traceback
from subprocess import CalledProcessError
-from py_mm_lib import *
+from py_args_lib import *
def main():
diff --git a/tools/oneclick/prestudy/YAML/peripherals/unb1_board.peripheral.yaml b/tools/oneclick/prestudy/YAML/peripherals/unb1_board.peripheral.yaml
index 4139c67212..e146c289f3 100644
--- a/tools/oneclick/prestudy/YAML/peripherals/unb1_board.peripheral.yaml
+++ b/tools/oneclick/prestudy/YAML/peripherals/unb1_board.peripheral.yaml
@@ -6,6 +6,49 @@ hdl_library_name : unb1_board
hdl_library_description: " This is the description for the unb1_board package "
peripherals:
+ -
+ peripheral_name: rom_system_info
+ slave_ports:
+ -
+ # rom_system_info
+ slave_prefix : WORK
+ slave_name : ROM_SYSTEM_INFO
+ slave_postfix: REG
+ slave_type : REG
+ fields:
+ -
+ field_name : field_rom_info
+ access_mode : RO
+ address_offset: 0x0
+ number_of_fields: 1024
+ field_description: |
+ "address place for rom_system_info"
+ slave_description: " rom_info "
+
+ peripheral_description: |
+ " settings for rom_system_info register "
+ -
+ peripheral_name: reg_system_info
+ slave_ports:
+ -
+ # reg_system_info
+ slave_prefix : WORK
+ slave_name : REG_SYSTEM_INFO
+ slave_postfix: REG
+ slave_type : REG
+ fields:
+ -
+ field_name : field_reg_info
+ access_mode : RO
+ address_offset: 0x0
+ number_of_fields: 31
+ field_description: |
+ "address place for reg_system_info"
+ slave_description: " reg_info "
+
+ peripheral_description: |
+ " settings for reg_system_info register "
+
# peripheral, unb1_board_wdi_reg
-
peripheral_name: ctrl_unb1_board
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/documentation.py b/tools/oneclick/prestudy/YAML/py_args_lib/documentation.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/documentation.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/documentation.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/my_logger.py b/tools/oneclick/prestudy/YAML/py_args_lib/my_logger.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/my_logger.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/my_logger.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral.py
similarity index 99%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral.py
index a6fac9bb49..c1d8bed382 100755
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py
+++ b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral.py
@@ -119,7 +119,7 @@ class Peripheral(BaseObject):
if val is not None:
logger.debug(" Parameter %s default value: %s is overwritten with new value: %s",
key,
- str(self._parameters[key]),
+ str(self._parameters.get(key, 'None')),
str(val))
self._parameters[key] = val
return
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/__init__.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/__init__.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/__init__.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/__init__.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/base_object.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/base_object.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/base_object.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/base_object.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/constants.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/constants.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/constants.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/constants.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/field.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/field.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/field.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/field.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/fifo.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/fifo.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/fifo.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/fifo.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/ram.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/ram.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py b/tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/register.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/peripheral_lib/register.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py b/tools/oneclick/prestudy/YAML/py_args_lib/rom_system.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/rom_system.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/system.py b/tools/oneclick/prestudy/YAML/py_args_lib/system.py
similarity index 100%
rename from tools/oneclick/prestudy/YAML/py_mm_lib/system.py
rename to tools/oneclick/prestudy/YAML/py_args_lib/system.py
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/__init__.py b/tools/oneclick/prestudy/YAML/py_mm_lib/__init__.py
deleted file mode 100644
index 57077e7a7b..0000000000
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-""" init file for py_mm_lib
-"""
-
-import os
-import sys
-
-cwd = __file__[:__file__.rfind('/')]
-print(cwd)
-
-sys.path.append(cwd)
-
-from my_logger import MyLogger
-
-mylogger = MyLogger(os.path.join(os.getcwd(), 'log'))
-logger = mylogger.logger
-
-from peripheral import PeripheralLibrary, Peripheral
-from system import System
-from documentation import Documentation
-from rom_system import RomSystem
-from peripheral_lib import *
diff --git a/tools/oneclick/prestudy/YAML/systems/apertif_unb1_bn_filterbank.system.yaml b/tools/oneclick/prestudy/YAML/systems/apertif_unb1_bn_filterbank.system.yaml
index 6150eed890..528052d279 100644
--- a/tools/oneclick/prestudy/YAML/systems/apertif_unb1_bn_filterbank.system.yaml
+++ b/tools/oneclick/prestudy/YAML/systems/apertif_unb1_bn_filterbank.system.yaml
@@ -13,40 +13,50 @@ parameters:
- { name : nof_streams, value: 12 }
peripherals:
- - peripheral_name: rom_system_info
+ -
+ peripheral_name: rom_system_info
subsystem_name : ''
slave_port_names:
- rom_unb_system_info
-
- - peripheral_name: reg_system_info
-
+ parameters:
+ - { name: lock_base_address, value: 0x1000 }
+
+ -
+ peripheral_name: reg_system_info
subsystem_name : ''
slave_port_names:
- reg_unb_system_info
+ parameters:
+ - { name: lock_base_address, value: 0x0 }
- - peripheral_name: ctrl_unb1_board
+ -
+ peripheral_name: ctrl_unb1_board
subsystem_name : ''
slave_port_names:
- pio_wdi
- - peripheral_name: unb1_board_wdi_reg
+ -
+ peripheral_name: unb1_board_wdi_reg
subsystem_name : ''
slave_port_names:
- reg_wdi
- - peripheral_name: eth1g
+ -
+ peripheral_name: eth1g
subsystem_name : ''
slave_port_names:
- avs_eth_0_mms_tse
- avs_eth_0_mms_reg
- avs_eth_0_mms_ram
- - peripheral_name: ppsh
+ -
+ peripheral_name: ppsh
subsystem_name : ''
slave_port_names:
- pio_pps
- - peripheral_name: epcs_reg
+ -
+ peripheral_name: epcs_reg
subsystem_name : ''
slave_port_names:
- reg_epcs
@@ -57,12 +67,14 @@ peripherals:
parameters:
- { name : g_sim_flash_model, value: FALSE }
- - peripheral_name: remu_reg
+ -
+ peripheral_name: remu_reg
subsystem_name : ''
slave_port_names:
- reg_remu
- - peripheral_name: unb1_board_sens_reg
+ -
+ peripheral_name: unb1_board_sens_reg
subsystem_name : ''
slave_port_names:
- reg_unb_sens
@@ -72,21 +84,24 @@ peripherals:
- { name : g_temp_high, value: 85 }
# extra peripherals for apertif_unb1_bn_filterbank
- - peripheral_name: common_pulse_delay
+ -
+ peripheral_name: common_pulse_delay
subsystem_name : ''
slave_port_names:
- reg_common_pulse_delay
parameters:
- { name : , value: }
- - peripheral_name: bsn_source
+ -
+ peripheral_name: bsn_source
subsystem_name : ''
slave_port_names:
- reg_bsn_source
parameters:
- { name : , value: }
- - peripheral_name: bsn_scheduler_wg
+ -
+ peripheral_name: bsn_scheduler_wg
subsystem_name : ''
slave_port_names:
- reg_bsn_scheduler_wg
diff --git a/tools/oneclick/prestudy/YAML/systems/demo.system.yaml b/tools/oneclick/prestudy/YAML/systems/demo.system.yaml
index 4976023935..a841bef709 100644
--- a/tools/oneclick/prestudy/YAML/systems/demo.system.yaml
+++ b/tools/oneclick/prestudy/YAML/systems/demo.system.yaml
@@ -22,11 +22,15 @@ peripherals:
subsystem_name : ''
slave_port_names:
- rom_system_info
+ parameters:
+ - { name: lock_base_address, value: 0x1000 }
- peripheral_name: reg_system_info
subsystem_name : ''
slave_port_names:
- reg_system_info
+ parameters:
+ - { name: lock_base_address, value: 0x0 }
- peripheral_name: fringe_stop_unit
subsystem_name : ''
diff --git a/tools/oneclick/prestudy/YAML/systems/unb1_minimal_sopc.system.yaml b/tools/oneclick/prestudy/YAML/systems/unb1_minimal_sopc.system.yaml
index cc18de5fe2..d042e02858 100644
--- a/tools/oneclick/prestudy/YAML/systems/unb1_minimal_sopc.system.yaml
+++ b/tools/oneclick/prestudy/YAML/systems/unb1_minimal_sopc.system.yaml
@@ -13,12 +13,16 @@ peripherals:
subsystem_name : ''
slave_port_names:
- rom_system_info
+ parameters:
+ - { name: lock_base_address, value: 0x1000 }
- peripheral_name: reg_system_info
subsystem_name : ''
slave_port_names:
- pio_system_info
+ parameters:
+ - { name: lock_base_address, value: 0x0 }
- peripheral_name: ctrl_unb1_board
subsystem_name : ''
diff --git a/tools/oneclick/prestudy/YAML/work/system_info.peripheral.yaml b/tools/oneclick/prestudy/YAML/work/system_info.peripheral.yaml
deleted file mode 100644
index cabb50301a..0000000000
--- a/tools/oneclick/prestudy/YAML/work/system_info.peripheral.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-protocol_name : args
-protocol_version: 1.0
-protocol_type : peripheral
-
-hdl_library_name : system_info
-hdl_library_description: " This is the description for the system_info library "
-
-peripherals:
- -
- peripheral_name: rom_system_info
- parameters:
- - { name: lock_base_address, value: 0x1000 }
-
- slave_ports:
- -
- # rom_system_info
- slave_prefix : WORK
- slave_name : ROM_SYSTEM_INFO
- slave_postfix: REG
- slave_type : REG
- fields:
- -
- field_name : field_rom_info
- access_mode : RO
- address_offset: 0x0
- number_of_fields: 1024
- field_description: |
- "address place for rom_system_info"
- slave_description: " rom_info "
-
- peripheral_description: |
- " settings for rom_system_info register "
- -
- peripheral_name: reg_system_info
- parameters:
- - { name: lock_base_address, value: 0x0 }
-
- slave_ports:
- -
- # reg_system_info
- slave_prefix : WORK
- slave_name : REG_SYSTEM_INFO
- slave_postfix: REG
- slave_type : REG
- fields:
- -
- field_name : field_reg_info
- access_mode : RO
- address_offset: 0x0
- number_of_fields: 31
- field_description: |
- "address place for reg_system_info"
- slave_description: " reg_info "
-
- peripheral_description: |
- " settings for reg_system_info register "
-
diff --git a/tools/oneclick/prestudy/YAML/work/work.peripheral.yaml b/tools/oneclick/prestudy/YAML/work/work.peripheral.yaml
deleted file mode 100644
index 610bb3516d..0000000000
--- a/tools/oneclick/prestudy/YAML/work/work.peripheral.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-protocol_name : args
-protocol_version: 1.0
-protocol_type : peripheral
-
-hdl_library_name : work
-hdl_library_description: " This is the description for the work package "
-
-peripherals:
- -
- peripheral_name: unb1_board_sens
-
- parameters:
- - { name: g_temp_high, value: 85 }
-
- slave_ports:
- -
- # actual hdl name: reg_unb1_sens
- slave_prefix : WORK
- slave_name : UNB1_SENS
- slave_postfix: REG
- slave_type : REG
- fields:
- -
- field_name : sens_data
- width : 8
- access_mode : RO
- address_offset: 0x0
- number_of_fields: 4
- field_description: |
- " data array with sens data
- 0x0 = fpga temperature in degrees (two's complement)
- 0x1 = eth_temp temperature in degrees (two's complement)
- 0x2 = hot_swap_v_sens
- 0x3 = hot_swap_v_source"
- -
- field_name : sens_err
- width : 1
- access_mode : RO
- address_offset: 0x4
- radix : unsigned
- field_description: |
- ""
- -
- field_name : temp_high
- width : 7
- address_offset: 0x5
- reset_value : g_temp_high
- software_value: g_temp_high
- field_description: |
- ""
- slave_description: " "
- peripheral_description: |
- "
- +-----------------------------------------------------------------------------+
- |31 (byte3) 24|23 (byte2) 16|15 (byte1) 8|7 (byte0) 0| wi |
- |-----------------------------------------------------------------------|-----|
- | xxx fpga_temp = sens_data[0][7:0]| 0 |
- |-----------------------------------------------------------------------|-----|
- | xxx eth_temp = sens_data[1][7:0]| 1 |
- |-----------------------------------------------------------------------|-----|
- | xxx hot_swap_v_sense = sens_data[2][7:0]| 2 |
- |-----------------------------------------------------------------------|-----|
- | xxx hot_swap_v_source = sens_data[3][7:0]| 3 |
- |-----------------------------------------------------------------------|-----|
- | xxx sens_err[0]| 4 |
- |-----------------------------------------------------------------------|-----|
- | xxx temp_high[6:0]| 5 |
- +-----------------------------------------------------------------------------+
- * The fpga_temp and eth_temp are in degrees (two's complement)
- * The hot swap voltages depend on:
- . From i2c_dev_ltc4260_pkg:
- LTC4260_V_UNIT_SENSE = 0.0003 -- 0.3 mV over Rs for current sense
- LTC4260_V_UNIT_SOURCE = 0.4 -- 400 mV supply voltage (e.g +48 V)
- LTC4260_V_UNIT_ADIN = 0.01 -- 10 mV ADC
-
- . From UniBoard unb_sensors.h:
- SENS_HOT_SWAP_R_SENSE = 0.005 -- R sense on UniBoard is 5 mOhm (~= 10 mOhm // 10 mOhm)
- SENS_HOT_SWAP_I_UNIT_SENSE = LTC4260_V_UNIT_SENSE / SENS_HOT_SWAP_R_SENSE
- SENS_HOT_SWAP_V_UNIT_SOURCE = LTC4260_V_UNIT_SOURCE
-
- ==>
- Via all FN and BN:
- 0 = FPGA temperature = TInt8(fpga_temp)
- Only via BN3:
- 1 = UniBoard ETH PHY temperature = TInt8(eth_temp)
- 2 = UniBoard hot swap supply current = hot_swap_v_sense * SENS_HOT_SWAP_I_UNIT_SENSE
- 3 = UniBoard hot swap supply voltage = hot_swap_v_source * SENS_HOT_SWAP_V_UNIT_SOURCE
- 4 = I2C error status for BN3 sensors access only, 0 = ok"
-
--
GitLab