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.

Sign up for GitHub

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

Jump to bottom

Ticket 6556 khly2700 added emulator and test #10

Merged
merged 79 commits into from
Apr 26, 2022
Merged

Ticket 6556 khly2700 added emulator and test #10

merged 79 commits into from
Apr 26, 2022

Conversation

Adam-Szw
Copy link
Contributor

AdrianPotter and others added 30 commits January 6, 2017 15:17
Rename plankton_emulators to lewis_emulators because framework name h…
22ba8ba 
…as changed
Update __init__.py
6f425de
@FreddieAkeroyd
Merge pull request #17 from ISISComputingGroup/Ticket2371_EOL_fixes
966314a 
Fixes missing final EOL
Tidied up the formatting for a lot of files
91fdfb6
Merge pull request #18 from ISISComputingGroup/Ticket2379_Create_TPG2…
698b0ed 
…6x_Emulator

Ticket2379: Create TPG26x Emulator & Test Cases
keithely2700 tests
473f733
Pin emulators to latest version
815d310
@esouthren
changed formatting of assert_pv_is.. functions
e4654f3
@esouthren
Moved commit from master to branch
ec86a70
@esouthren
Delete keithley_2700.py
efd66c6 
Accidentally committed test file to master instead of Ticket647 branch
@esouthren
cody tidy
88d0bcf
@davidkeymer
Upgrade Lewis
f554372
@esouthren
Update lewis_versions.py
45128f5 
Added new line
@esouthren
Merge pull request #55 from ISISComputingGroup/Ticket2386_Upgrade_Lewis
54bf02f 
Upgrade Lewis
@esouthren
updated branch with master files/lewis update
0b8fff9
@esouthren
update for lewis upgrade
32871a4
@esouthren
added readback commands
ff485e9
@esouthren
rework tidy
842decf
@esouthren
split alarm tests
4504242
@esouthren
Pre review tidy, adapted new :MEASUREMENT return value from support f…
6ad6b69 
…ile changs
@Tom-Willemsen
Merge remote-tracking branch 'origin/master' into Ticket647_Keithley_…
436411a 
…2700_Test_Files
@esouthren
Pre-review code tidy
35aa7f9
@esouthren
changed all device variables to enum values, added dictionaries to ma…
6544c60 
…p them in stream_interface
Changed module name and updated emulator to pass temp test.
184de6c
Refactored using process_pv function.
e16e1e9
@Tom-Willemsen
Re-add lost init file, with comment saying do not delete.
f563e8d
@Tom-Willemsen
Convert docs to new style. Make assertion names consistent.
7fff59b
Updated stream interface for Keithley 2001 some more
3635eec
Reverted back to master version of Keithley2700 files
3b0a1ff
@LiamPanchaud
Altered test data and added more tests
cdc99e4
Tom-Willemsen and others added 24 commits September 25, 2019 17:18
@Tom-Willemsen
Merge pull request #54 from ISISComputingGroup/Ticket4775_upgrade_lew…
aafac49 
…is_to_1.2.1

Ticket4775: Updated Lewis version
@LilithCole
renamed to cryogenic_sms/CRYOSMS
c34b3fd
@LilithCole
merge master
d657cf6
@Tom-Willemsen
Switch assertion orders, fix wm323 test names
8f0b697
@John-Holt-Tessella
Merge pull request #257 from ISISComputingGroup/fix_assertion_order
2bcf6a9 
Switch assertion orders, fix wm323 test names
@LilithCole
Merge branch 'master' into Ticket5259_switch_rates_mid_ramp
01cc85a
@LilithCole
continually add readings into the buffer unless otherwise specified
82356d2
@LilithCole
Keithley tests modified to work with emulator additions
2b79ac7
@LilithCole
remove change on wrong branch
19f8ea2
@DominicOram
Updated lewis version to 1.2.2
616fd99
@aaron-long
Fixed variable name for lewis version number
a22ceee
@rerpha
Merge pull request #87 from ISISComputingGroup/Ticket4889_convert_dev…
75c85c2 
…ice_emulator_to_python3

Ticket 4889 - Convert device emulator to python3
@LilithCole
Merge branch 'master' into Ticket5259_switch_rates_mid_ramp
aa575da
@DominicOram
Updated to use latest lewis version and convert strings correctly
a95671b
@DominicOram
Update lewis version
eb11a0d
@DominicOram
Fix python 3 errors
9776d95
@DominicOram
Speed up tests and clear buffer as final thing in set up
fb81cc6
@DominicOram
Added logging to when simulated values are turned off
83239bb
@Tom-Willemsen
Merge pull request #107 from ISISComputingGroup/fix_keithley_2700
7b953e4 
Fix keithley 2700
@Tom-Willemsen
Merge pull request #435 from ISISComputingGroup/fix_keithley_2700
4e5ed6b 
Fix Keithley 2700: Speed up tests and clear buffer as final thing in set up
@DominicOram
Moved utils into lewis itself
e995c27
@Adam-Szw
Merge branch 'master' of C:/Instrument/Dev/EPICS-IOC_Test_Framework i…
d2a271d 
…nto ticket_6556_khly2700
@Adam-Szw
Merge branch 'master' of C:\Instrument\Dev\EPICS-DeviceEmulator into …
885cc1f 
…ticket_6556_khly2700
@Adam-Szw
added emulator and tests
54b8b37
@Adam-Szw Adam-Szw mentioned this pull request Apr 22, 2022
Open
@JackEAllen JackEAllen self-requested a review April 25, 2022 09:26
JackEAllen
JackEAllen approved these changes Apr 26, 2022
View reviewed changes
Copy link
Member

@JackEAllen JackEAllen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

@JackEAllen JackEAllen merged commit 895447d into master Apr 26, 2022
@JackEAllen JackEAllen deleted the ticket_6556_khly2700 branch April 26, 2022 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JackEAllen JackEAllen JackEAllen approved these changes

Assignees
No one assigned
Labels
size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.