Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.2.0 #169

Merged
merged 51 commits into from
May 20, 2021
Merged

Release v0.2.0 #169

merged 51 commits into from
May 20, 2021

Conversation

BrianJKoopman
Copy link
Member

Description

This PR merges the current develop branch into master, which will be marked as the release of v0.2.0.

One major change includes replacing 'sisock-crossbar' with 'crossbar' (#118), which might require a configuration file change if your setup still refers to the old sisock images. The base images are now based on Ubuntu 20.04, where they previously were based on Ubuntu 18.04.

Change Log

New Agents

New Features

Documentation Updates

Bug Fixes

Misc

BrianJKoopman and others added 30 commits November 2, 2020 11:13
This introduces so3g v0.1.0-24-g5645096 and all that comes with it, including
Int64 support in G3VectorInts.
Bump ocs version to v0.7.1-9-g500447e-dev
* Implement labjack ljm functionality

* Move ljm import to readthedocs block

Also changes docs workflow to set the READTHEDOCS environment variable.

* Changes after review

Co-authored-by: jlashner <jlashner@gmail.com>
v3.0.0 of coveralls-python now requires `--service` be specified for things to
work with Github Actions. See [1].

[1] - TheKevJames/coveralls-python#251
Update coveralls command for v3.0.0
Changes include:
1. Check if socket is open before trying to create G3Streamer to
   minimize log_fatals
2. Change some info statents into debug, and some debug statements to
   info
3. Discards G3PipelineInfo frames to fix stream-id-less file on startup
   bug.
- pep8
- changed socket blocking to True and timeout to 0.0 sec.
- docstrings
Update to Ubuntu 20.04 based ocs image
* Created Tektronix AWG agent

Fixed tektronix agent via Brian's comments

Made changes to tektronix agent via Brian's code

Fixed docs building issues

Delete test.py

* Fix docstring on TektronixAWGAgent class

* Added cmd to tektronix fieldnames

Co-authored-by: Brian Koopman <bjk98@cornell.edu>
Co-authored-by: jlashner <jlashner@gmail.com>
* Created smurf crate monitor agent

* Fixed typo in rst file crashing docs build test

* Removed argparse usage in docs.

* Removed emacs buffer files

* Swapped tabs for spaces and added check for exit condition during acquisition wait time

* Addressed syntax issues, print statements, doc errors, from Jack and Matthew

* Added agent refernce to index.rst file

* Added Dockerfile to the main docker-compose.yaml

* Fixed parser build issues, links to ssh setup, and other comments

* Fixed bad comments and entrypoint

* Removed unused methods from class, fixed logging, added parser fn for docs.

* Moved log statement to __main__

Co-authored-by: jseibert575 <jseibert575@gmail.com>
Co-authored-by: jseibert575 <jseibert575@gmail.com>
Both the Tektronix and SCPI PSU interface code use this Prologix interface and
were replicating some of the same code. This makes a GpibInterface class they
can both inherit from.
BrianJKoopman and others added 21 commits March 4, 2021 10:01
Remove outdated information from Agent docs

Mostly related to:
  * sisock
  * Docker image locations
  * depends_on definitions
* Initial commit for the CHWP BeagleboneBlack agent

* Bug fix for CHWP agent, to run even w/o encoder signal input

* another bug fix for the chwp agent

* another bug fix for chwp

* Modifications for the latest CHWP beaglebone software. Also, some cleanups

* style changes suggensted by pylint

* Modifications for CHWP encoder OCS agent to address most of the comments after the PR. Still needs testings at the actual setup:
* This is still using computer system time for timestamps, but not using the same timestamps for arrays of data. Timestamps are approximately calculated using system time and clock counter values. This is convenient for looking at the data in grafana, when we have some issues in IRIG decoding or IRIG itself.
* Added irg_time, unix timestamps decoded from IRIG
* Added irig_info, to save raw IRIG bit info
* Merged multiple data feeds into one. Currently, publish_to_feed happens several times within a few seconds.
* Moved flush_buffer out of the loop
* Added some docstrings
* Clarified the version of beaglebone codes that can work with this agent using sha256sum. Maybe there is a better way to do this…

Some other bug fixes/improvements:
* Changed the data length for the encoder data in a packet, accordingly due to the change in the beaglebone side to avoid packet fragmentations
* Reduced some standard output messages
* Fixed the bug which was dropping some data unintentionally
* Separate the part to publish encoder counter values from the IRIG publishing part, to take encoder data even without IRIG.
* Approximate HWP frequency calculation uses the expected beaglebone clock frequency, not the decoded IRIG info.
* Added the estimation of beaglebone clock frequency

* Temporary(?) modifications for not publishing data feeds in uint64_t

* encoder counter data subsampling for indluxdb-publisher

* For int64 support

* modification for adding a command-line argument for hwp bbb port number

* added chwp agent in socs/docker-compose.yml. minimal document in docs/agents/chwp_encoder.rst

* Initial commit for the CHWP BeagleboneBlack agent

* Bug fix for CHWP agent, to run even w/o encoder signal input

* another bug fix for the chwp agent

* another bug fix for chwp

* Modifications for the latest CHWP beaglebone software. Also, some cleanups

* style changes suggensted by pylint

* Modifications for CHWP encoder OCS agent to address most of the comments after the PR. Still needs testings at the actual setup:
* This is still using computer system time for timestamps, but not using the same timestamps for arrays of data. Timestamps are approximately calculated using system time and clock counter values. This is convenient for looking at the data in grafana, when we have some issues in IRIG decoding or IRIG itself.
* Added irg_time, unix timestamps decoded from IRIG
* Added irig_info, to save raw IRIG bit info
* Merged multiple data feeds into one. Currently, publish_to_feed happens several times within a few seconds.
* Moved flush_buffer out of the loop
* Added some docstrings
* Clarified the version of beaglebone codes that can work with this agent using sha256sum. Maybe there is a better way to do this…

Some other bug fixes/improvements:
* Changed the data length for the encoder data in a packet, accordingly due to the change in the beaglebone side to avoid packet fragmentations
* Reduced some standard output messages
* Fixed the bug which was dropping some data unintentionally
* Separate the part to publish encoder counter values from the IRIG publishing part, to take encoder data even without IRIG.
* Approximate HWP frequency calculation uses the expected beaglebone clock frequency, not the decoded IRIG info.
* Added the estimation of beaglebone clock frequency

* Temporary(?) modifications for not publishing data feeds in uint64_t

* encoder counter data subsampling for indluxdb-publisher

* For int64 support

* modification for adding a command-line argument for hwp bbb port number

* added chwp agent in socs/docker-compose.yml. minimal document in docs/agents/chwp_encoder.rst

* a little bit of error handling of invalid IRIG-B data

* Fix small typos and add chwp to index

* Protect ocs import on RTD build

* Replace mix of tabs with spaces

* Swap print statements for txaio logging

* Add dumb-init and replace sisock in Dockerfile

Co-authored-by: Charles Hill <charles.a.hill01@gmail.com>
Co-authored-by: Brian Koopman <brian.koopman@yale.edu>
Add stream-id argument to smurf stream simulator agent
* Add XY Stage controller for LATRt XY Stages (movement still to be tested)

* fix locking bugs in movement. make data start automatically

* Add XY Stage controller for LATRt XY Stages (movement still to be tested)

* fix locking bugs in movement. make data start automatically

* actually reset lock release time

* use Pacemaker for nicer data!

* remove random sleep

* fixes based on pull request comments

* documentation debugging fixes

* removing underscores from name

* update ocs arg parsing to new version

* remove underscores

* Make Agent class name

Co-authored-by: kmharrington <kmharrington90@gmail.com>
Co-authored-by: Brian Koopman <brian.koopman@yale.edu>
* Create LS370 Agent with Dockerfile and associated LS370 driver

* Cast heater data as floats

* Create Lakshore370 Agent docs page based on 372 page

* Protect ocs imports on readthedocs

* Fix some flake8 warnings

* Add Lakeshore 370 agent to docker-compose

* Add 370 Agent to ocs_plugin file

* Mark private methods in Channel and Heater classes

* Update documentation, including session.data examples

Co-authored-by: Zachary Atkins <zatkins2@gmail.com>
Added two functions to set the still output on the still heater and to get that output for confirming that things are working as expected.
Added set_still_heater() and get_still_heater() to LS372 agent
Update ocs base image to v0.8.0
@BrianJKoopman
Copy link
Member Author

Coverage aside this is ready. Going to merge and make the v0.8.0 release.

@BrianJKoopman BrianJKoopman merged commit 006ac72 into master May 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants