QHYCCD: New control class to improve support

Author: GuLinux

src/drivers/qhy/CMakeLists.txt

@@ -1,15 +1,15 @@
 #TODO replace this script invokation
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(QHY_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Linux)
-  set(QHY_LIBS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Linux)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(QHY_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Windows_SDK_x64_LatestVersion/x64/include)
   set(QHY_DLL_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Windows_SDK_x64_LatestVersion/x64/dll)
   include_directories(${QHY_INCLUDE_DIRECTORY})
+else()
+  set(QHY_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Linux)
+  set(QHY_LIBS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/QHYCCD_Linux)
 endif()
 execute_process(COMMAND ${CMAKE_SOURCE_DIR}/scripts/qhy_errors_to_map ${QHY_INCLUDE_DIRECTORY}/qhyccderr.h OUTPUT_VARIABLE qhy_error_codes)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   configure_file(${QHY_INCLUDE_DIRECTORY}/qhyccd.h ${CMAKE_CURRENT_BINARY_DIR}/ COPYONLY)
   configure_file(${QHY_INCLUDE_DIRECTORY}/qhyccdcamdef.h ${CMAKE_CURRENT_BINARY_DIR}/ COPYONLY)
   configure_file(${QHY_INCLUDE_DIRECTORY}/qhyccdstruct.h ${CMAKE_CURRENT_BINARY_DIR}/ COPYONLY)
@@ -27,7 +27,7 @@ set(LIBQHY_SOVERSION "0")
 
 configure_file(qhyexception.cpp.in qhyexception.cpp)
 set(qhy_GENERATED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/qhyexception.cpp)
-set(qhy_SOURCES qhyccdimager.cpp qhydriver.cpp qhyimagingworker.cpp)
+set(qhy_SOURCES qhyccdimager.cpp qhydriver.cpp qhyimagingworker.cpp qhycontrol.cpp)
 
 set(QHY_LIBRARY_armv6 ${QHY_LIBS_DIRECTORY}/libqhy_arm_v6.bin)
 set(QHY_LIBRARY_armv7 ${QHY_LIBS_DIRECTORY}/libqhy_arm_v7.bin)
@@ -39,6 +39,10 @@ set(QHY_LIBRARY ${QHY_LIBRARY_${PlanetaryImager_ARCH}})
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(QHY_LIBRARY ${QHY_DLL_DIRECTORY}/qhyccd.dll)
 endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(QHY_LIBRARY ${QHY_LIBS_DIRECTORY}/libqhy_osx.a)
+  set(QHY_EXTRA_LIBRARIES usb-1.0  "-framework CoreFoundation" "-framework IOKit" objc)
+endif()
 
 
 # if(ADD_DRIVERS_BUILD_DIRECTORY)
@@ -57,4 +61,4 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   install(FILES ${QHY_LIBRARY} DESTINATION .)
 endif()
-add_driver(NAME qhy OS Linux Windows DEFAULT_ON SRCS ${qhy_SOURCES} ${qhy_GENERATED_SOURCES} LINK ${QHY_LIBRARY})
+add_driver(NAME qhy OS Linux Windows Darwin DEFAULT_ON SRCS ${qhy_SOURCES} ${qhy_GENERATED_SOURCES} LINK ${QHY_LIBRARY} ${QHY_EXTRA_LIBRARIES})

src/drivers/qhy/qhyccdimager.cpp

@@ -33,6 +33,7 @@
 #include "qhyimagingworker.h"
 #include <chrono>
 #include "c++/stlutils.h"
+#include "qhycontrol.h"
 #include <boost/lexical_cast.hpp>
 
 using namespace std;
@@ -45,10 +46,8 @@ DPTR_IMPL(QHYCCDImager) {
   QHYCCDImager *q;
   qhyccd_handle *handle;
     Properties chip;
-  Controls controls;
+  QList<QHYControl::ptr> controls;
   QHYImagingWorker::ptr imaging_worker;
-  void load_controls();
-  void load(Control &setting);
 };
 
 
@@ -63,9 +62,6 @@ QHYCCDImager::QHYCCDImager(const QString &cameraName, const char *id, const Imag
   QHY_CHECK << InitQHYCCD(d->handle) << "Initializing Camera %1"_q % cameraName;
   qDebug() << "camera initialized";
   uint8_t buffer[1024];
-  // Not implemented in QHY Library
-//   GetQHYCCDCFWStatus(d->handle, buf);
-//   qDebug() << "firmware status: " << QByteArray{buf};
   QHY_CHECK << GetQHYCCDFWVersion(d->handle, buffer) << "Getting firmware version";
   qDebug() << "firmware version: " << QString::fromLocal8Bit(reinterpret_cast<const char*>(buffer));
   double chipwidth, chipheight, pixelwidth, pixelheight;
@@ -75,10 +71,8 @@ QHYCCDImager::QHYCCDImager(const QString &cameraName, const char *id, const Imag
   d->chip << Properties::Property{"bpp", bpp};
   d->chip << LiveStream;
   qDebug() << d->chip;
-  d->load_controls();
-  qDebug() << d->controls;
+  d->controls = QHYControl::availableControls(d->handle);
   qDebug() << "Finished initializing QHY camera" << d->name;
-//   GetQHYCCDCameraStatus(d->handle, st); // NOT IMPLEMENTED IN QHY Library
 }
 
 
@@ -99,93 +93,25 @@ QString QHYCCDImager::name() const
   return d->name;
 }
 
-QList< QHYCCDImager::Control > QHYCCDImager::controls() const
+QList<Imager::Control> QHYCCDImager::controls() const
 {
-  return d->controls;
-}
-
-void QHYCCDImager::Private::load_controls()
-{
-  controls.clear();
-  static QList<QPair<QString,CONTROL_ID>>qhy_controls{
-    { "control_brightness", CONTROL_BRIGHTNESS },
-    { "control_contrast", CONTROL_CONTRAST },
-    { "control_wbr", CONTROL_WBR },
-    { "control_wbb", CONTROL_WBB },
-    { "control_wbg", CONTROL_WBG },
-    { "control_gamma", CONTROL_GAMMA },
-    { "control_gain", CONTROL_GAIN },
-    { "control_offset", CONTROL_OFFSET },
-    { "control_exposure", CONTROL_EXPOSURE },
-    { "control_speed", CONTROL_SPEED },
-    { "control_transferbit", CONTROL_TRANSFERBIT },
-    { "control_channels", CONTROL_CHANNELS },
-    { "control_usbtraffic", CONTROL_USBTRAFFIC },
-    { "control_rownoisere", CONTROL_ROWNOISERE },
-    { "control_curtemp", CONTROL_CURTEMP },
-    { "control_curpwm", CONTROL_CURPWM },
-    { "control_manulpwm", CONTROL_MANULPWM },
-    { "control_cfwport", CONTROL_CFWPORT },
-    { "control_cooler", CONTROL_COOLER },
-    { "control_st4port", CONTROL_ST4PORT },
-    { "cam_color", CAM_COLOR },
-    { "cam_bin1x1mode", CAM_BIN1X1MODE },
-    { "cam_bin2x2mode", CAM_BIN2X2MODE },
-    { "cam_bin3x3mode", CAM_BIN3X3MODE },
-    { "cam_bin4x4mode", CAM_BIN4X4MODE },
-    { "CAM_MECHANICALSHUTTER", CAM_MECHANICALSHUTTER },
-    { "CAM_TRIGER_INTERFACE", CAM_TRIGER_INTERFACE },
-    { "CAM_TECOVERPROTECT_INTERFACE", CAM_TECOVERPROTECT_INTERFACE },
-    { "CAM_SINGNALCLAMP_INTERFACE", CAM_SINGNALCLAMP_INTERFACE },
-    { "CAM_FINETONE_INTERFACE", CAM_FINETONE_INTERFACE },
-    { "CAM_SHUTTERMOTORHEATING_INTERFACE", CAM_SHUTTERMOTORHEATING_INTERFACE },
-    { "CAM_CALIBRATEFPN_INTERFACE", CAM_CALIBRATEFPN_INTERFACE },
-    { "CAM_CHIPTEMPERATURESENSOR_INTERFACE", CAM_CHIPTEMPERATURESENSOR_INTERFACE },
-    { "CAM_USBREADOUTSLOWEST_INTERFACE", CAM_USBREADOUTSLOWEST_INTERFACE },
-  };
-  for(auto qhy_control: qhy_controls) {
-    try {
-      QHY_CHECK << IsQHYCCDControlAvailable(handle, qhy_control.second) << GuLinux::stringbuilder() << "checking control availability for control " << qhy_control.second;
-      double min, max, step;
-      QHY_CHECK << GetQHYCCDParamMinMaxStep(handle, qhy_control.second, &min, &max, &step) << GuLinux::stringbuilder() << "checking control range for control " << qhy_control.second;
-      
-      if(qhy_control.second == CONTROL_GAIN)
-        step /= 10.;
-      auto control = Control{qhy_control.second, qhy_control.first}.set_range(min, max, step);
-      if(control.id == CONTROL_TRANSFERBIT ) {
-        qDebug() << "Changing transferbit setting for " << q->name() << id;
-                control.type = Control::Combo;
-                control.add_choice("8", 8).add_choice("16", 16);
-      }
-      if(control.id == CONTROL_EXPOSURE) {
-                control.is_duration = true;
-                control.duration_unit = 1us;
-                control.set_is_exposure(true);
-      }
-      load(control);
-  //     setting.value = GetQHYCCDParam(handle, control.second);
-      qDebug() << control;
-            controls << control;
-    } catch(const QHYException &e) {
-      qWarning() << e.what();
-    }
-  }
-}
-
-void QHYCCDImager::Private::load ( QHYCCDImager::Control& setting )
-{
-  setting.value = GetQHYCCDParam(handle, static_cast<CONTROL_ID>(setting.id));
+    QList< Imager::Control > controls;
+    transform(begin(d->controls), end(d->controls), back_inserter(controls), [](const auto &c) { return c->control(); });
+  return controls;
 }
 
 
-void QHYCCDImager::setControl(const QHYCCDImager::Control& setting)
+void QHYCCDImager::setControl(const Imager::Control& control)
 {
+    auto qhyControlIt = find_if(begin(d->controls), end(d->controls), [&](const auto &c) { return c->id() == control.id; });
+    if(qhyControlIt == end(d->controls))
+    // TODO: error check?
+        return;
+    auto qhyControl = *qhyControlIt;
   wait_for(push_job_on_thread([=]{
-    QHY_CHECK << SetQHYCCDParam(d->handle, static_cast<CONTROL_ID>(setting.id), setting.value.toDouble()) << "Setting control " << setting.name << " to value " << setting.value.toDouble();
-    Control &setting_ref = *find_if(begin(d->controls), end(d->controls), [setting](const Control &s) { return s.id == setting.id; });
-    d->load(setting_ref);
-    qDebug() << "setting" << setting.name << "updated to value" << setting_ref.value;
-    emit changed(setting_ref);
+      qhyControl->setValue(control.value.toDouble());
+      qhyControl->reload();
+      emit changed(qhyControl->control());
   }));
 }