Merge tag 'v0.99.5' into dev_zynqmon_path

ver. w/ sm_cm_config subtree synced

sm_cm_config/.gitignore

@@ -0,0 +1,132 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# testing xml output
+src/test.xml

sm_cm_config/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Apollo platform for CMS and ATLAS at CERN
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

sm_cm_config/README.md

@@ -0,0 +1,2 @@
+# sm_cm_config
+Configuration files for SM and CM firmware

sm_cm_config/data/zynqmon.yml

@@ -0,0 +1,111 @@
+name: zynqmon configuration file
+cm_hw_rev: 1A
+sm_hw_rev: 1A
+sm_fw_rev: 1A
+revision: 1
+psmon_single_instance: &psmon_one [TEMP1, TEMP3, VIN, VOUT, IOUT, RESERVED, RESERVED, RESERVED]
+
+config:
+  - name: firefly
+    start: 0
+    count: 25
+    mcu_call: firefly_temps
+    type: int8
+    extra: Table=CM_FF_MON;Column=Temp_C;Status=1;
+    names:
+      - K01  12 Tx GTH
+      - K01  12 Rx GTH
+      - K02  12 Tx GTH
+      - K02  12 Rx GTH
+      - K03  12 Tx GTH
+      - K03  12 Rx GTH
+      - K04 4 XCVR GTY
+      - K05 4 XCVR GTY
+      - K06 4 XCVR GTY
+      - K07  12 Tx GTY
+      - K07  12 Rx GTY
+      - V01 4 XCVR GTY
+      - V02 4 XCVR GTY
+      - V03 4 XCVR GTY
+      - V04 4 XCVR GTY
+      - V05 4 XCVR GTY
+      - V06 4 XCVR GTY
+      - V07 4 XCVR GTY
+      - V08 4 XCVR GTY
+      - V09 4 XCVR GTY
+      - V10 4 XCVR GTY
+      - V11  12 Tx GTY
+      - V11  12 Rx GTY
+      - V12  12 Tx GTY
+      - V12  12 Rx GTY
+  - name: psmon
+    start: 32
+    count: 8
+    mcu_call: psmon
+    type: fp16
+    extra: Table=CM_MON;Status=2
+    names: 
+      - 1V8
+      - 3V3
+      - KVCCINT1_1
+      - KVCCINT1_2
+      - VVCCINT1_1
+      - VVCCINT1_2
+      - VVCCINT2_1
+      - VVCCINT2_2
+    postfixes: *psmon_one
+  - name: adcmon
+    start: 96
+    count: 21
+    mcu_call: adcmon
+    type: fp16
+    extra: Table=CM_MON;Status=2;Column=ADC
+    names:
+      - VCC_12V
+      - VCC_2V5
+      - VCC_M3V3
+      - VCC_3V3
+      - VCC_1V8
+      - VCC_M1V8
+      - V_VCCINT
+      - K_VCCINT
+      - V_MGTY1_AVTT
+      - V_MGTY2_AVTT
+      - K_MGTH_AVTT
+      - K_MGTY_AVTT
+      - V_MGTY1_VCCAUX
+      - V_MGTY2_VCCAUX
+      - K_MGTY_VCCAUX
+      - K_MGTH_VCCAUX
+      - V_MGTY1_AVCC
+      - V_MGTY2_AVCC
+      - K_MGTY_AVCC
+      - K_MGTH_AVCC
+      - TM4C_TEMP
+  - name: uptime
+    start: 192
+    count: 1
+    type: uint32_t
+    mcu_call: uptime
+    extra: Table=CM_MON;Column=Minutes;Status=1
+    names:
+      - MCU_UPTIME
+  - name: gitversion
+    start: 118
+    count: 20
+    type: char
+    size: 5
+    mcu_call: gitversion
+    names:
+      - MCU_FW_VER
+  - name: fpga
+    start: 128
+    count: 4
+    type: fp16
+    extra: Table=CM_MON;Column=Temp_C;Status=2;
+    mcu_call: fpga
+    names:
+      - F1_TEMP_SLR0
+      - F2_TEMP_SLR0
+      - F1_TEMP_SLR1
+      - F2_TEMP_SLR1