From e37725ac12a3fedf6346582a444a30ae91f00f75 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 22 Nov 2021 14:02:54 +0100 Subject: [PATCH] release notes and some fixes --- RELEASE.txt | 55 +++++++++++++++++++++--------- docs/src/firmware.rst | 70 ++++++++++++++++++++++----------------- python/slsdet/detector.py | 1 + 3 files changed, 81 insertions(+), 45 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 38677eec9..d49caab3e 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,7 +1,7 @@ -SLS Detector Package x.x.x released on xx.xx.2021 +SLS Detector Package 6.0.1 released on 23.11.2021 ================================================== -This document describes the differences between vx.x.x and v6.0.0. +This document describes the differences between v6.0.1 and v6.0.0. @@ -9,10 +9,9 @@ This document describes the differences between vx.x.x and v6.0.0. -------- 1. New or Changed Features 2. Resolved Issues - 3. Known Issues - 4. Changes in Next Major Release - 5. Firmware Requirements - 6. Download, Documentation & Support + 3. Firmware Requirements + 4. Kernel Requirements + 5. Download, Documentation & Support @@ -43,6 +42,16 @@ This document describes the differences between vx.x.x and v6.0.0. detector without tftp. The previous API and command (fewer arguments) using tftp is deprecated. + 5. Update mode in Detector server + Commandline: udpatemode, API set/getUpdateMode + One can set detector server to update mode (especially if server and + firmware are incompatible that the server cannot start up without errors). + This mode will limit access to a few operations only needed to update the + detector. Setting it will create an empty file (udpate.txt) and resetting + it will delete the empty file. Ofcourse, command line "--update" will + overwrite any file detection and start server in update mode. + + 2. Resolved Issues ================== @@ -78,13 +87,7 @@ This document describes the differences between vx.x.x and v6.0.0. - -3. Known Issues -=============== - - - -5. Firmware Requirements +3. Firmware Requirements ======================== Eiger @@ -119,7 +122,6 @@ This document describes the differences between vx.x.x and v6.0.0. Detector Upgrade ================ - The following can be upgraded remotely: Eiger via bit files Jungfrau via command <.pof> @@ -138,8 +140,31 @@ This document describes the differences between vx.x.x and v6.0.0. +4. Kernel Requirements +====================== -6. Download, Documentation & Support + Blackfin + ======== + Latest version: Fri Oct 29 00:00:00 2021 + + Nios + ==== + Compatible version: Mon May 10 18:00:21 CEST 2021 + + Kernel Upgrade + ============== + Eiger via bit files + Others via command + + Commands: udpatekernel, kernelversion + Instructions available at + https://slsdetectorgroup.github.io/devdoc/commandline.html + https://slsdetectorgroup.github.io/devdoc/detector.html + https://slsdetectorgroup.github.io/devdoc/pydetector.html + + + +5. Download, Documentation & Support ==================================== Download diff --git a/docs/src/firmware.rst b/docs/src/firmware.rst index 6bf016d43..fe1f87cce 100644 --- a/docs/src/firmware.rst +++ b/docs/src/firmware.rst @@ -305,43 +305,53 @@ Firmware Troubleshooting with blackfin 5. If one can't list it, read the next section to try to get the blackfin to list it. -How to get back mtd3 drive remotely (copying new kernel) +How to get back mtd3 drive remotely (udpating kernel) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + You have 2 alternatives to update the kernel. - .. code-block:: bash - - # step 1: get the kernel image (uImage.lzma) from slsdetectorgroup - # and copy it to pc's tftp folder + 1. Commands via software (>= v6.0.0) - # step 2: connect to the board - telnet bchipxxx + .. code-block:: bash - #step 3: go to directory for space - cd /var/tmp/ + sls_detector_put updatekernel /home/...path-to-kernel-image - # step 3: copy kernel to board - tftp pcxxx -r uImage.lzma -g - # step 4: verify kernel copied properly - ls -lrt - - # step 5: erase flash - flash_eraseall /dev/mtd1 - - # step 6: copy new image to kernel drive - cat uImage.lzma > /dev/mtd1 - - # step 7: - sync - - # step 8: - reboot - - # step 9: verification - telnet bchipxxx - uname -a # verify kernel date - more /proc/mtd # verify mtd3 is listed + 2. or command line + .. code-block:: bash + + # step 1: get the kernel image (uImage.lzma) from slsdetectorgroup + # and copy it to pc's tftp folder + + # step 2: connect to the board + telnet bchipxxx + + #step 3: go to directory for space + cd /var/tmp/ + + # step 3: copy kernel to board + tftp pcxxx -r uImage.lzma -g + + # step 4: verify kernel copied properly + ls -lrt + + # step 5: erase flash + flash_eraseall /dev/mtd1 + + # step 6: copy new image to kernel drive + cat uImage.lzma > /dev/mtd1 + + # step 7: + sync + + # step 8: + reboot + + # step 9: verification + telnet bchipxxx + uname -a # verify kernel date + more /proc/mtd # verify mtd3 is listed + Last Resort using USB Blaster ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 4406f53b1..7ca606ce5 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -2515,6 +2515,7 @@ class Detector(CppDetectorApi): ----- :getter: always returns in seconds. To get in datetime.delta, use getBurstPeriod + :setter: Not Implemented Example -----------