Commit Graph

Select branches

Hide Pull Requests

andrea

develop

dilsc

dilsc_feb2023

flame

flowsas

hot_lakeshore

mirror

paul

sinqtmp

tmp

tnmr

trinamic

trinamic_persistent

ultrasound

uniax

uniax_may2021

wip

work

v0.20.1-7

Mono Color

• 8eee7ab3b0 fix keithley 2601b after tests Markus Zolliker 2022-04-27 14:05:02 +02:00
• 98cdbafa7a fix mercury Markus Zolliker 2022-04-26 08:51:58 +02:00
• 478075c545 allow a configfile path as single argument to secop-server Markus Zolliker 2022-04-22 16:10:29 +02:00
• b7d16d2e16 add 'ts' to the ppms simulation Markus Zolliker 2022-04-22 16:14:26 +02:00
• 6752997048 replace 'iodev' by 'io' in cfg files l_samenv 2022-04-11 15:43:20 +02:00
• 026ab3f4b2 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip l_samenv 2022-04-22 16:36:03 +02:00
• 20ad159722 support for OI mercury series Markus Zolliker 2022-03-29 16:01:36 +02:00
• 7316632fa6 improve poller error handling Markus Zolliker 2022-04-11 18:45:56 +02:00
• 2159753398 avoid deadlock in proxy Markus Zolliker 2022-04-11 16:21:09 +02:00
• 8cb3ba7dfc fix error in secop.logging Markus Zolliker 2022-04-12 09:01:33 +02:00
• b1a24b253a improved trinamic driver Markus Zolliker 2022-02-02 16:53:33 +01:00
• 5a553dbdeb motor valve using trinamic motor Markus Zolliker 2022-03-29 16:54:00 +02:00
• e9f687e6dd update phytron driver l_samenv 2022-04-22 16:25:14 +02:00
• d3379d5e95 support for OI mercury series Markus Zolliker 2022-03-29 16:01:36 +02:00
• 1ac2f8557c fixes in sch5 HRPT 2022-04-20 15:53:15 +02:00
• 774f33122a fixes in secop_psi/sea.py HRPT 2022-04-20 15:52:43 +02:00
• 1da7657483 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip focus 2022-04-20 14:52:17 +02:00
• ac3bf5b122 add cryosim and magsim cfg Markus Zolliker 2022-04-13 10:46:57 +02:00
• d6ad5f058d improve poller error handling Markus Zolliker 2022-04-11 18:45:56 +02:00
• a35134978a avoid deadlock in proxy Markus Zolliker 2022-04-11 16:21:09 +02:00
• 7891c281e1 fix error in secop.logging Markus Zolliker 2022-04-12 09:01:33 +02:00
• 6460e51920 improved trinamic driver Markus Zolliker 2022-02-02 16:53:33 +01:00
• b40b0e75b1 motor valve using trinamic motor Markus Zolliker 2022-03-29 16:54:00 +02:00
• f6f2dd189b use a common poller thread for modules sharing io Markus Zolliker 2022-03-28 18:14:06 +02:00
• d5924567da fix statemachine Markus Zolliker 2022-03-28 15:14:31 +02:00
• 9152ea1d26 reintroduced individual init of generalConfig.defaults Markus Zolliker 2022-03-23 13:53:46 +01:00
• a124adab97 avoid race conditions in read_*/write_* methods Markus Zolliker 2022-03-03 15:42:29 +01:00
• 2e21bcdd0a HasConvergence mixin Markus Zolliker 2022-03-16 16:55:35 +01:00
• 526a182ed7 init generalConfig.defaults only in secop-server Markus Zolliker 2022-03-21 14:11:32 +01:00
• af983287e7 use a common poller thread for modules sharing io Markus Zolliker 2022-03-28 18:14:06 +02:00
• 8d23503bbd fix statemachine Markus Zolliker 2022-03-28 15:14:31 +02:00
• bb097ac3ba reintroduced individual init of generalConfig.defaults Markus Zolliker 2022-03-23 13:53:46 +01:00
• 16a9550080 avoid race conditions in read_*/write_* methods Markus Zolliker 2022-03-03 15:42:29 +01:00
• 9858973ba1 HasConvergence mixin Markus Zolliker 2022-03-16 16:55:35 +01:00
• e6d6179925 init generalConfig.defaults only in secop-server Markus Zolliker 2022-03-21 14:11:32 +01:00
• b1ddc01fbb merge until "support write_ method on readonly param and more" Markus Zolliker 2022-03-21 14:00:12 +01:00
• 60c62a340d support write_ method on readonly param and more Markus Zolliker 2022-03-16 15:50:46 +01:00
• 3c0c60615a fix error in write wrapper and more Markus Zolliker 2022-03-11 14:15:01 +01:00
• fda1939324 fix and improved Attached Markus Zolliker 2022-03-01 14:37:23 +01:00
• 8767be2aac improve k2601b driver Markus Zolliker 2022-03-07 17:39:09 +01:00
• 39a3e79eb3 move markdown to requirements-dev.txt Markus Zolliker 2022-03-08 10:39:58 +01:00
• 7c9296fe2e even more merges from gerrit Markus Zolliker 2022-03-08 10:54:04 +01:00
• 34b93adef0 more merges from gerrit Markus Zolliker 2022-03-08 10:52:14 +01:00
• 10018b8cad some more merges from gerrit Markus Zolliker 2022-03-08 08:52:29 +01:00
• 57e0a2cc72 add statemachine Markus Zolliker 2022-03-08 08:37:26 +01:00
• a2bfe878b6 add handlers Markus Zolliker 2022-03-08 08:36:40 +01:00
• 9320541754 result from merge with gerrit Markus Zolliker 2022-03-08 08:35:41 +01:00
• bd246c5ca7 result from merge with gerrit Markus Zolliker 2022-03-07 17:49:08 +01:00
• c1d42f0f02 improve softcal Markus Zolliker 2022-03-07 16:02:24 +01:00
• 3fe44d32b1 reset connection on identification Markus Zolliker 2022-03-07 15:13:20 +01:00
• f58ab263e7 various small fixes Markus Zolliker 2022-01-12 16:43:21 +01:00
• dee3514065 Makefile: fix docker image Georg Brandl 2021-05-29 14:46:20 +02:00
• e0fe7e46d1 support for fast poll when busy Markus Zolliker 2022-03-04 14:57:33 +01:00
• b423235c5d new poll mechanism Markus Zolliker 2022-02-23 16:42:28 +01:00
• aa82bc580d proper return value in handler read_* methods Markus Zolliker 2022-03-01 09:52:49 +01:00
• c2596a9629 implement a state machine Markus Zolliker 2022-02-02 09:07:53 +01:00
• bf1761bbc4 common read/write handlers Markus Zolliker 2022-02-23 11:22:53 +01:00
• 99588fc815 fix handling commands Markus Zolliker 2022-01-20 14:38:04 +01:00
• bbc4663266 ppms: replace IOHandler by Read/WriteHandler Markus Zolliker 2022-02-01 07:41:50 +01:00
• 93c8866f37 fixed README.md Markus Zolliker 2022-02-02 11:40:30 +01:00
• acb3bdad6a varios fixes at psi repo, as of 2022-02-01 Markus Zolliker 2022-02-02 09:57:30 +01:00
• 5e3fb10884 trinamic (psi repo!) as of 2022-02-01 Markus Zolliker 2022-02-02 09:56:44 +01:00
• 3b25251e10 ppms fixes (psi repo!) as of 2022-02-01 Markus Zolliker 2022-02-02 09:56:08 +01:00
• 903e17a6e5 mercury, as of 2022-02-01 Markus Zolliker 2022-02-02 09:55:43 +01:00
• 9109170752 logging as of 2022-02-01 Markus Zolliker 2022-02-02 09:54:54 +01:00
• 05d0cfb193 history, as of 2022-02-01 Markus Zolliker 2022-02-02 09:52:01 +01:00
• c1307cdd03 unify name and module on Attached property Markus Zolliker 2022-01-27 18:11:42 +01:00
• b911bc1838 check for problematic value range Markus Zolliker 2022-01-28 17:41:53 +01:00
• 26a0f2e078 do not convert string to float Markus Zolliker 2022-01-28 11:37:23 +01:00
• 4f7083bc98 ReadHandler and WriteHandler decorators Markus Zolliker 2022-01-18 08:53:46 +01:00
• 0909f92e12 UniqueObject Markus Zolliker 2022-01-17 10:44:41 +01:00
• f3450375ce enhance logging Markus Zolliker 2022-01-12 15:51:28 +01:00
• eb2e8f5f74 fix doc (stringio - > io) Markus Zolliker 2022-01-12 16:23:21 +01:00
• 2ef0da68e8 change name of read_hw_status method in sequencer mixin Markus Zolliker 2022-01-10 19:55:02 +01:00
• 9b38db7706 check for bad read_* and write_* methods Markus Zolliker 2022-01-06 17:35:32 +01:00
• 8f7fb1e45b improve handling of module init methods Markus Zolliker 2021-12-22 15:19:21 +01:00
• f13e29aad2 introduce general config file Markus Zolliker 2021-12-20 15:27:05 +01:00
• c5d228ffc4 add timeouts to MultiEvents Markus Zolliker 2021-12-21 15:44:41 +01:00
• 8253fe471b check for missing supercalls to module init methods Markus Zolliker 2021-12-21 09:46:50 +01:00
• 245f4f48bf all members optional be default in struct Markus Zolliker 2021-12-21 09:21:00 +01:00
• 071ba38b60 remote logging (issue 46) Markus Zolliker 2021-12-17 15:22:37 +01:00
• c523e8f84e [WIP] work on history writer Markus Zolliker 2021-12-03 16:31:52 +01:00
• 6e73420d0f add doc strings to commands missing them Markus Zolliker 2021-12-03 16:49:48 +01:00
• 483d4c9d6f add doc string to Persistent.factory_reset Markus Zolliker 2021-12-03 16:26:07 +01:00
• b29b1e1b36 entangle.AnalogOutput: fix window mechanism Markus Zolliker 2021-11-17 13:20:13 +01:00
• 77acda840a fix tests from mlz repo Markus Zolliker 2021-11-12 17:13:40 +01:00
• 1eecc93f71 fix feature for removing commands Markus Zolliker 2021-11-12 17:09:29 +01:00
• 1d9e07edb4 add more tests and fixes for command inheritance Markus Zolliker 2021-11-12 17:07:11 +01:00
• 9058ef054b various small changes Markus Zolliker 2021-11-10 15:07:16 +01:00
• c91d726f9d add more tests and fixes for command inheritance Markus Zolliker 2021-11-12 15:00:08 +01:00
• 1d75d192e5 automatic saving of persistent parameters Markus Zolliker 2021-11-10 16:57:06 +01:00
• 4bf3acab98 various small changes Markus Zolliker 2021-11-10 15:07:16 +01:00
• eebc9232cd debian: fix email addresses in changelog Georg Brandl 2021-11-12 09:18:11 +01:00
• c16f159599 [deb] Release v0.12.4 Jenkins system 2021-11-11 16:21:19 +01:00
• 796be752b7 fix command inheritance Markus Zolliker 2021-11-10 17:54:31 +01:00
• b8e8d24b50 [deb] Release v0.12.3 Jenkins system 2021-11-10 16:33:19 +01:00
• 45dd14a72c fix feature for removing commands Markus Zolliker 2021-11-10 15:29:55 +01:00
• a7b741eaa4 updates from mlz repo Markus Zolliker 2021-11-10 14:37:57 +01:00
• ad7cfe4ea0 automatically register subclasses of AsynConn Markus Zolliker 2021-11-10 13:21:44 +01:00
• 47d09e9b08 improve simulation Markus Zolliker 2021-11-10 13:12:49 +01:00