Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Electrometers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Software Control System
Tango devices
MeasureInstruments
lib
Electrometers
Commits
dd231541
Commit
dd231541
authored
1 year ago
by
ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
compile error fixed
parent
0c396dc7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/Novelec_MCCE2.h
+3
-1
3 additions, 1 deletion
include/Novelec_MCCE2.h
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
with
4 additions
and
2 deletions
include/Novelec_MCCE2.h
+
3
−
1
View file @
dd231541
...
@@ -86,7 +86,9 @@ public:
...
@@ -86,7 +86,9 @@ public:
*/
*/
std
::
string
electrometer_status
(
void
);
std
::
string
electrometer_status
(
void
);
virtual
std
::
vector
<
std
::
string
>
ranges_list
(
void
)
{};
virtual
std
::
vector
<
std
::
string
>
ranges_list
(
void
)
{
return
std
::
vector
<
std
::
string
>
()
;
};
protected
:
protected
:
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
dd231541
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
</parent>
</parent>
<groupId>
fr.soleil.lib
</groupId>
<groupId>
fr.soleil.lib
</groupId>
<artifactId>
Electrometers-${aol}-${library}-${mode}
</artifactId>
<artifactId>
Electrometers-${aol}-${library}-${mode}
</artifactId>
<version>
2.7.
0
</version>
<version>
2.7.
1
</version>
<packaging>
nar
</packaging>
<packaging>
nar
</packaging>
<name>
Electrometers library
</name>
<name>
Electrometers library
</name>
<description>
Electrometers library
</description>
<description>
Electrometers library
</description>
...
...
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