Skip to content
Snippets Groups Projects
  1. May 21, 2024
  2. Apr 03, 2024
  3. Nov 14, 2023
  4. Nov 13, 2023
  5. Apr 06, 2023
  6. Nov 15, 2022
    • Dietrich Rothe's avatar
      Drothe/wip 10305 doocsimg (#89) · d0c6dc19
      Dietrich Rothe authored
      * image encoding concept
      
      byte-array which is reinterpreted via templated view
      
      * add xml option D_image for DOOCS image
      
      MappedImage now has the code which shall be included from the server application. 
      DoocsImage has DOOCS-dependent stuff.
      MappedImage builds on generic interface for opaque structs.
      
      * discussion points and some small improvements
      
      - OpaqueStructHeader: use type_index
      - rework ImgHeader definition
      - rename xml tag D_image -> D_imagec
      - add some documentation
      - add unit tests
      - refactoring
      
      * move MappedImage.h to ControlSystemAdapter
      
      * get rid of compiler warning
      
      which was due to overly strict check of definition=declaration
      d0c6dc19
  7. Aug 04, 2022
    • d-rothe's avatar
      Drothe/wip 10002 refactor (#81) · d712e8c7
      d-rothe authored
      
      * refactoring
      
      - get rid of much of the code duplicates by moving functionality to base
      class PropertyBase
      - make timestamp handling more consistent
      - make data consistency group usage more consistent accross different classes
      - formal code style fixes
      - some formal code cleaning and documentation
      
      * copyright headers
      
      * apply clang-format-14 -i <files>
      * fix include order where messed up by autoformat
      
      * docu for D_xy
      * enable ZMQ for D_xy
      
      * reduce number of linter warnings
      
      * PropertyBase as seperate file
      
      * put error into ZMQ status
      
      Co-authored-by: default avatarDietrich Rothe <dietrich.rothe@desy.de>
      Co-authored-by: default avatarMartin Hierholzer <martin.hierholzer@desy.de>
      d712e8c7
  8. Jun 30, 2022
    • Martin Christoph Hierholzer's avatar
      fix crash if property array length mismatch · 96c1a63e
      Martin Christoph Hierholzer authored
      This can happen e.g. if the ProcessArray length in the application has
      changed but the old value is still in the DOOCS config file. If the new
      length is bigger than the old one, the server crashed because it
      attempted to read too many value from the property in auto_init.
      
      This fix should also cover the case when a wrong length is set trough an
      RPC call.
      96c1a63e
  9. Jun 28, 2022
    • Martin Christoph Hierholzer's avatar
      fix multi-mapped variable with macro pulse number attached (cf. #9960) · 47fc3d12
      Martin Christoph Hierholzer authored
      If a macro pulse number is attached to a property which is mapped to a
      variable mapped to also other properties, the update from the other,
      writeable property was not getting through due to the consistency check.
      This check is now effectively disabled in that case, which is ok, since
      the update is anyway uncorrelated to the macro pulse number (since
      coming from e.g. the operator).
      47fc3d12
  10. Jun 16, 2022
    • Martin Christoph Hierholzer's avatar
      Feature: synchronise multi-mapped writeable variables · 1992ded5
      Martin Christoph Hierholzer authored
      If a writeable process variable is mapped to multiple properties, so far
      the values in the properties were not synchronised, i.e. writing to one
      property did not propagate the value to the other connected properties.
      This synchronisation is now implemented.
      
      Note that inconsistencies might occur when more than one of the
      properties is writeable, hence a warning will be displayed in this case.
      1992ded5
  11. Jun 15, 2022
    • d-rothe's avatar
      Wip/9838 error reporting concept (#73) · af3cb3c3
      d-rothe authored
      
      * concept for error reporting to set_error
      - destination is DOOCS EqFct::set_error(code, message)
      - StatusMonitor variables and/or Device status variables as input
      - configuration per location via xml
      - only single data source for set_error
      - consistent updates of error code and error message, to remove
      duplicate log lines
      this depends on changes in ApplicationCore/DeviceModule!
      * remove deprecated use of boost/test/test_case_template.hpp
      * make configuration of status message input unneccesary
      it will be found from the naming convention
      * some refactoring
      which was neccesary because Status definitions moved to
      ControlSystemAdapter
      * add docu for set_error
      * add basic test for set_error tag
      
      Co-authored-by: default avatarDietrich Rothe <dietrich.rothe@desy.de>
      af3cb3c3
  12. May 18, 2022
    • d-rothe's avatar
      partial fix for #9836 (#69) · ebbd6c13
      d-rothe authored
      
      * partial fix for #9836
      
      This fixes that cleared error codes appear in DOOCS history where error
      is not yet cleared.
      It is only a partial fix since the history still contains more data than
      was intended; intended was only first invalid data point
      
      * remove comments about outdated concept
      
      Co-authored-by: default avatarDietrich Rothe <dietrich.rothe@desy.de>
      ebbd6c13
  13. Apr 22, 2022
    • Martin Christoph Hierholzer's avatar
      do not send out identical time stamps on the same property (#67) · ee5576f0
      Martin Christoph Hierholzer authored
      Identical time stamps are considered to have identical data when DOOCS checks for inconsistencies on silent ZeroMQ connections. If on the same property new data is set without changing the VersionNumber, the timestamp will now be altered by 1 microsecond.
      
      This is more like a temporary work around. A feature request to DOOCS should be made to introduce a distinction between a "server timestamp" and a "source timestamp" like it is realised in OPC UA.
      
      Also a potential better solution to the other part of the problem inside ApplicationCore is described here: https://redmine.msktools.desy.de/issues/9723 
      ee5576f0
  14. Mar 25, 2022
  15. Mar 24, 2022
  16. Dec 08, 2021
  17. Aug 18, 2021
  18. Jul 23, 2021
  19. Jul 15, 2021
    • Dietrich Rothe's avatar
      persistance behaviour for long arrays in DOOCS · 6f228be0
      Dietrich Rothe authored
      - arrays are now by default saved just like spectra
      - Short arrays go into main server config file, long into separate files
      - only if array is writable
      - behaviour is configurable in order to return to default behaviour of
      DOOCS
      6f228be0
  20. Jun 03, 2021
  21. Apr 30, 2021
  22. Mar 11, 2021
  23. Nov 20, 2020
  24. Sep 28, 2020
    • vargheseg's avatar
      default dmsg_info.ident when no macropulse source · 20d5b50e
      vargheseg authored
      dmsg_info.ident is set to 0 when DoocsProcessArray and
      DoocsProcessScalar do not have a macropulse source defined.  This is
      what the other supported types do currently; behavior should be
      consistent between the types with this commit.
      
      Revert this if it is not the intended behavior.
      20d5b50e
  25. Sep 23, 2020
    • vargheseg's avatar
      Support zmq publishing form cs to app. · 7a8bcf49
      vargheseg authored
      The adapter publishes value changes made from the control system side
      for the following types:
        DoocsSpectrum
        DoocsIfff
        DoocsProcessArray
        DoocsProcessScalar
      7a8bcf49
  26. Sep 21, 2020
  27. Sep 01, 2020
  28. Aug 25, 2020
  29. Aug 21, 2020
  30. Aug 13, 2020
  31. Jul 20, 2020
  32. Jun 04, 2020
  33. May 13, 2020
  34. May 06, 2020
Loading