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
Jens Krüger
Lima
Commits
2d8c939b
Commit
2d8c939b
authored
Jul 16, 2018
by
Samuel Debionne
Browse files
Merge branch '57-zwo-camera-plugin' into 'master'
Resolve "ZWO camera plugin" Closes #57 See merge request !77
parents
01d492ba
4f689c80
Changes
5
Hide whitespace changes
Inline
Side-by-side
.gitmodules
View file @
2d8c939b
...
...
@@ -124,3 +124,6 @@
[submodule "camera/fli"]
path = camera/fli
url = ../Lima-camera-fli
[submodule "camera/zwo"]
path = camera/zwo
url = ../Lima-camera-zwo
zwo
@
3b47f02f
Subproject commit 3b47f02ff4887ea387b4c82e0ebe799c35077718
cmake/CameraList.cmake
View file @
2d8c939b
...
...
@@ -359,6 +359,16 @@ if(UNIX)
if
(
LIMACAMERA_XSPRESS3
)
add_subdirectory
(
camera/xspress3
)
endif
(
LIMACAMERA_XSPRESS3
)
#ZWO
if
(
DEFINED ENV{LIMACAMERA_ZWO}
)
set
(
LIMACAMERA_ZWO
"$ENV{LIMACAMERA_ZWO}"
CACHE BOOL
"compile zwo ?"
FORCE
)
else
()
set
(
LIMACAMERA_ZWO OFF CACHE BOOL
"compile zwo ?"
)
endif
()
if
(
LIMACAMERA_ZWO
)
add_subdirectory
(
camera/zwo
)
endif
(
LIMACAMERA_ZWO
)
endif
()
#CAMERA ONLY WORKING ON WINDOWS
...
...
docs/supported_cameras.rst
View file @
2d8c939b
...
...
@@ -29,9 +29,9 @@ Linux Only
Dectris Mythen 3 <camera/mythen3/doc/index>
Dectris Pilatus 2 & 3 <camera/pilatus/doc/index>
ImXpad <camera/imxpad/doc/index>
PointGrey <camera/pointgrey/doc/index>
Merlin <camera/merlin/doc/index>
Pixirad <camera/pixirad/doc/index>
PointGrey <camera/pointgrey/doc/index>
Prosilica <camera/prosilica/doc/index>
Rayonix MarCCD <camera/marccd/doc/index>
Rayonix HS <camera/rayonixhs/doc/index>
...
...
@@ -42,6 +42,7 @@ Linux Only
Xpad <camera/xpad/doc/index>
Xspress3 <camera/xspress3/doc/index>
Xh <camera/xh/doc/index>
Zwo <camera/zwo/doc/index>
Windows and Linux
==================
...
...
scripts/config.txt_default
View file @
2d8c939b
...
...
@@ -55,6 +55,7 @@ LIMACAMERA_FRELON=0
LIMACAMERA_LAMBDA=0
LIMACAMERA_SLSDETECTOR=0
LIMACAMERA_FLI=0
LIMACAMERA_ZWO=0
LIMA_ENABLE_CBF=0
LIMA_ENABLE_NXS=0
LIMA_ENABLE_FITS=0
...
...
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