Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
labRemote
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Berkeley Lab
labRemote
Commits
bf167765
Commit
bf167765
authored
1 year ago
by
Emily Anne Thompson
Browse files
Options
Downloads
Patches
Plain Diff
Add NGP800
parent
36c420d6
No related branches found
No related tags found
3 merge requests
!316
Merge devel into main
,
!304
Add RS_NGP804 power supply
,
!302
Add developments for cold box
Pipeline
#5947183
failed
1 year ago
Stage: check
Stage: build
Stage: package
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/libPS/CMakeLists.txt
+1
-0
1 addition, 0 deletions
src/libPS/CMakeLists.txt
src/libPS/RS_NGP804.cpp
+13
-0
13 additions, 0 deletions
src/libPS/RS_NGP804.cpp
src/libPS/RS_NGP804.h
+24
-0
24 additions, 0 deletions
src/libPS/RS_NGP804.h
src/libPS/python.cpp
+4
-0
4 additions, 0 deletions
src/libPS/python.cpp
with
42 additions
and
0 deletions
src/libPS/CMakeLists.txt
+
1
−
0
View file @
bf167765
...
...
@@ -21,6 +21,7 @@ target_sources(PS
Keithley22XX.cpp
RS_HMP4040.cpp
RS_HMP2020.cpp
RS_NGP804.cpp
Tenma72133XX.cpp
Tenma722XXX.cpp
TTIPs.cpp
...
...
This diff is collapsed.
Click to expand it.
src/libPS/RS_NGP804.cpp
0 → 100644
+
13
−
0
View file @
bf167765
#include
"RS_NGP804.h"
#include
<algorithm>
#include
<thread>
#include
"Logger.h"
// Register power supply
#include
"PowerSupplyRegistry.h"
REGISTER_POWERSUPPLY
(
RS_NGP804
)
RS_NGP804
::
RS_NGP804
(
const
std
::
string
&
name
)
:
SCPIPs
(
name
,
{
"NGP804"
},
4
)
{}
This diff is collapsed.
Click to expand it.
src/libPS/RS_NGP804.h
0 → 100644
+
24
−
0
View file @
bf167765
#ifndef RS_NGP804_H
#define RS_NGP804_H
#include
<chrono>
#include
<memory>
#include
<string>
#include
"SCPIPs.h"
#include
"SerialCom.h"
/** \brief ROHDE&SCHWARZ NGP804
* Implementation for the ROHDE&SCHWARZ NGP804 power supply.
*
* [Programming
* Manual](https://scdn.rohde-schwarz.com/ur/pws/dl_downloads/pdm/cl_manuals/user_manual/5601_5610_01/NGP800_User_Manual_en_11.pdf)
*
*/
class
RS_NGP804
:
public
SCPIPs
{
public:
RS_NGP804
(
const
std
::
string
&
name
);
~
RS_NGP804
()
=
default
;
};
#endif
This diff is collapsed.
Click to expand it.
src/libPS/python.cpp
+
4
−
0
View file @
bf167765
...
...
@@ -16,6 +16,7 @@
#include
"PowerSupplyRegistry.h"
#include
"RS_HMP2020.h"
#include
"RS_HMP4040.h"
#include
"RS_NGP804.h"
#include
"RigolDP832.h"
#include
"SCPIPs.h"
#include
"SorensenPs.h"
...
...
@@ -305,6 +306,9 @@ void register_ps(py::module &m) {
py
::
class_
<
RS_HMP2020
,
SCPIPs
,
std
::
shared_ptr
<
RS_HMP2020
>>
(
m
,
"RS_HMP2020"
)
.
def
(
py
::
init
<
const
std
::
string
&>
());
py
::
class_
<
RS_NGP804
,
SCPIPs
,
std
::
shared_ptr
<
RS_NGP804
>>
(
m
,
"RS_NGP804"
)
.
def
(
py
::
init
<
const
std
::
string
&>
());
py
::
class_
<
RigolDP832
,
SCPIPs
,
std
::
shared_ptr
<
RigolDP832
>>
(
m
,
"RigolDP832"
)
.
def
(
py
::
init
<
const
std
::
string
&>
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment