Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
8b8ad8c4
Commit
8b8ad8c4
authored
Jan 10, 2020
by
Alejandro Homs Puron
Committed by
Laurent Claustre
Mar 25, 2022
Browse files
Add MissingExtStartPulses (SSB), also export ImageCount in Tango
parent
a3ed988e
Changes
6
Hide whitespace changes
Inline
Side-by-side
include/Frelon.h
View file @
8b8ad8c4
...
...
@@ -48,7 +48,8 @@ enum Reg {
Version
,
CompSerNb
,
Warn
,
LastWarn
,
LineClockPer
,
PixelClockPer
,
FirstPHIVLen
,
PHIHSetupLen
,
SingleVertXfer
,
SingleHorzXfer
,
AllVertXfer
,
AllHorzXfer
,
ReadoutTime
,
TransferTime
,
CcdModesAvail
,
StatusSeqA
,
ReadoutTime
,
TransferTime
,
CcdModesAvail
,
StatusSeqA
,
StatusSeqB
,
StatusAMTA
,
StatusAMTB
,
StatusAMTC
,
StatusAMTD
,
StatusAMTE
,
LookUpTable
,
ImagesPerEOF
,
WeightValDFl
,
WeightValSig
,
...
...
include/FrelonCamera.h
View file @
8b8ad8c4
...
...
@@ -149,6 +149,7 @@ class Camera
bool
use_ser_line
=
false
,
bool
read_spb
=
false
);
void
getImageCount
(
unsigned
int
&
img_count
,
bool
only_lsw
=
false
);
void
getMissingExtStartPulses
(
int
&
missing_pulses
);
void
start
();
void
stop
();
...
...
sip/FrelonCamera.sip
View file @
8b8ad8c4
...
...
@@ -117,6 +117,7 @@ class Camera
bool read_spb2=false);
void getImageCount(unsigned int& img_count /Out/, bool only_lsw=false);
void getMissingExtStartPulses(int& missing_pulses /Out/);
void start();
void stop();
...
...
src/Frelon.cpp
View file @
8b8ad8c4
...
...
@@ -91,6 +91,7 @@ static const RegPair RegStrCList[] = {
RegPair
(
CcdModesAvail
,
"CMA"
),
RegPair
(
StatusSeqA
,
"SSA"
),
RegPair
(
StatusSeqB
,
"SSB"
),
RegPair
(
StatusAMTA
,
"SAA"
),
RegPair
(
StatusAMTB
,
"SAB"
),
RegPair
(
StatusAMTC
,
"SAC"
),
...
...
src/FrelonCamera.cpp
View file @
8b8ad8c4
...
...
@@ -884,6 +884,13 @@ void Camera::getImageCount(unsigned int& img_count, bool only_lsw)
DEB_RETURN
()
<<
DEB_VAR1
(
img_count
);
}
void
Camera
::
getMissingExtStartPulses
(
int
&
missing_pulses
)
{
DEB_MEMBER_FUNCT
();
readRegister
(
StatusSeqB
,
missing_pulses
);
DEB_RETURN
()
<<
DEB_VAR1
(
missing_pulses
);
}
void
Camera
::
start
()
{
DEB_MEMBER_FUNCT
();
...
...
tango/Frelon.py
View file @
8b8ad8c4
...
...
@@ -254,6 +254,14 @@ class FrelonClass(PyTango.DeviceClass):
[[
PyTango
.
DevFloat
,
PyTango
.
SCALAR
,
PyTango
.
READ
]],
'image_count'
:
[[
PyTango
.
DevLong
,
PyTango
.
SCALAR
,
PyTango
.
READ
]],
'missing_ext_start_pulses'
:
[[
PyTango
.
DevLong
,
PyTango
.
SCALAR
,
PyTango
.
READ
]],
'camera_serial'
:
[[
PyTango
.
DevString
,
PyTango
.
SCALAR
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment