From da9b3979d18d37383ad67f81abf89522b0fe4250 Mon Sep 17 00:00:00 2001 From: Ben Gilsrud Date: Tue, 16 Aug 2016 20:09:59 -0500 Subject: [PATCH 1/2] Add support for Meade DSI III Color. --- 3rdparty/indi-dsi/CMakeLists.txt | 1 + 3rdparty/indi-dsi/DsiDeviceFactory.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/3rdparty/indi-dsi/CMakeLists.txt b/3rdparty/indi-dsi/CMakeLists.txt index 52568eb..b0e13c2 100644 --- a/3rdparty/indi-dsi/CMakeLists.txt +++ b/3rdparty/indi-dsi/CMakeLists.txt @@ -35,6 +35,7 @@ set(indidsi_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/DsiProII.cpp ${CMAKE_CURRENT_SOURCE_DIR}/DsiProIII.cpp ${CMAKE_CURRENT_SOURCE_DIR}/DsiColorII.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/DsiColorIII.cpp ${CMAKE_CURRENT_SOURCE_DIR}/DsiTypes.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Util.cpp ) diff --git a/3rdparty/indi-dsi/DsiDeviceFactory.cpp b/3rdparty/indi-dsi/DsiDeviceFactory.cpp index 3f902e3..200ec86 100644 --- a/3rdparty/indi-dsi/DsiDeviceFactory.cpp +++ b/3rdparty/indi-dsi/DsiDeviceFactory.cpp @@ -19,6 +19,7 @@ #include "DsiProII.h" #include "DsiColorII.h" #include "DsiProIII.h" +#include "DsiColorIII.h" #include "DsiException.h" using namespace std; @@ -57,6 +58,14 @@ DSI::DeviceFactory::getInstance(const char *devname) if (ccdChipName == "ICX285AL") return new DSI::DsiProIII(devname); + if (ccdChipName == "ICX285AQ") + return new DSI::DsiColorIII(devname); + + /* FIXME: Remove the following once we know that the ICX285AQ is the CCD + * used in the DSI III */ + if (ccdChipName == "ICX285AK") + return new DSI::DsiColorIII(devname); + return 0; } -- 2.7.4