Add Moravian SFW driver (#903)

Adds new driver for Standalone Filter Wheel which will be released soon. Supporting libmicam library was updated to version 0.10.0/0.9.0
indilib · Mar 8, 2024 · 43ac082 · 43ac082
1 parent 0c31770
commit 43ac082
Show file tree

Hide file tree

Showing 17 changed files with 570 additions and 23 deletions.
diff --git a/debian/indi-mi/changelog b/debian/indi-mi/changelog
@@ -1,3 +1,9 @@
+indi-mi (2.0) buster; urgency=medium
+
+  * Add MI Standalone Filter Wheel driver
+
+ -- Jakub Smutny <[email protected]>  Tue, 05 Mar 2024 10:00:00 +0100
+
 indi-mi (1.8) buster; urgency=medium
 
   * Using MI Libraries again.

diff --git a/debian/indi-mi/indi-mi.links b/debian/indi-mi/indi-mi.links
@@ -1,2 +1,4 @@
 usr/bin/indi_mi_ccd usr/bin/indi_mi_ccd_usb
 usr/bin/indi_mi_ccd usr/bin/indi_mi_ccd_eth
+usr/bin/indi_mi_sfw usr/bin/indi_mi_sfw_usb
+usr/bin/indi_mi_sfw usr/bin/indi_mi_sfw_eth
diff --git a/debian/libmicam/changelog b/debian/libmicam/changelog
@@ -1,3 +1,9 @@
+libmicam (1.2) buster; urgency=low
+
+  * Updated MI library to version 0.10.0/0.9.0
+
+ -- Jakub Smutny <[email protected]>  Tue, 05 Mar 2024 10:00:00 +0100
+
 libmicam (1.1) buster; urgency=low
 
   * Updated MI library to version 0.9.0/0.8.0

diff --git a/indi-mi/CMakeLists.txt b/indi-mi/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-PROJECT(indi_miccd CXX C)
+PROJECT(indi_mi CXX C)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")
@@ -13,17 +13,17 @@ find_package(USB1 REQUIRED)
 find_package(Threads REQUIRED)
 find_package(CFITSIO REQUIRED)
 
-set(INDI_MI_VERSION_MAJOR 1)
-set(INDI_MI_VERSION_MINOR 9)
+set(INDI_MI_VERSION_MAJOR 2)
+set(INDI_MI_VERSION_MINOR 0)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/indi_miccd.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/indi_miccd.xml)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${INDI_INCLUDE_DIR})
-include_directories( ${CFITSIO_INCLUDE_DIR})
-include_directories( ${MICAM_INCLUDE_DIR})
+include_directories(${CFITSIO_INCLUDE_DIR})
+include_directories(${MICAM_INCLUDE_DIR})
 
 ########### MI CCD ###########
 set(indi_miccd_SRCS
@@ -37,13 +37,6 @@ else (APPLE)
     target_link_libraries(indi_mi_ccd ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MICAM_LIBRARIES} ${USB1_LIBRARIES} Threads::Threads rt)
 endif(APPLE)
 
-#if(THREADS_HAVE_PTHREAD_ARG)
-#  target_compile_options(indi_mi_ccd "-pthread")
-#endif()
-#if(CMAKE_THREAD_LIBS_INIT)
-#  target_link_libraries(indi_mi_ccd "${CMAKE_THREAD_LIBS_INIT}")
-#endif()
-
 install(TARGETS indi_mi_ccd RUNTIME DESTINATION bin)
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_mi_ccd_symlink.cmake
@@ -52,4 +45,26 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_mi_ccd_symlink.cmake
 
 set_target_properties(indi_mi_ccd PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_mi_ccd_symlink.cmake)
 
+########### MI SFW ###########
+set(indi_misfw_SRCS
+   ${CMAKE_CURRENT_SOURCE_DIR}/mi_sfw.cpp
+   )
+
+add_executable(indi_mi_sfw ${indi_misfw_SRCS})
+if (APPLE)
+    target_link_libraries(indi_mi_sfw ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MICAM_LIBRARIES} ${USB1_LIBRARIES} Threads::Threads)
+else (APPLE)
+    target_link_libraries(indi_mi_sfw ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MICAM_LIBRARIES} ${USB1_LIBRARIES} Threads::Threads rt)
+endif(APPLE)
+
+install(TARGETS indi_mi_sfw RUNTIME DESTINATION bin)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_mi_sfw_symlink.cmake
+"exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink indi_mi_sfw \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/indi_mi_sfw_usb)\n
+ exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink indi_mi_sfw \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/indi_mi_sfw_eth)\n")
+
+set_target_properties(indi_mi_sfw PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_mi_sfw_symlink.cmake)
+
+##############################
+
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_miccd.xml DESTINATION ${INDI_DATA_DIR})
diff --git a/indi-mi/INSTALL b/indi-mi/INSTALL
@@ -1,4 +1,4 @@
-MI CCD INSTALL
+MI DRIVERS INSTALL
 ==============
 
 You must have CMake >= 2.8.0 in order to build this package.

diff --git a/indi-mi/README b/indi-mi/README
@@ -1,7 +1,7 @@
-Moravian Instruments CCD Driver
+Moravian Instruments INDI Driver
 ===============================
 
-This package provides Moravian Instruments CCD INDI driver for MI CCD cameras.
+This package provides Moravian Instruments INDI driver for MI cameras and standalone filter wheels.
 
 Requirements
 ============
@@ -29,14 +29,22 @@ How to Use
 
 	To run the driver from the command line:
 
-	USB variant:
+	Cameras (USB variant):
 
 	$ indiserver indi_mi_ccd_usb
 
-	ETH variant:
+	Cameras (ETH variant):
 
 	$ indiserver indi_mi_ccd_eth
 
+	SFW (USB variant):
+
+	$ indiserver indi_mi_sfw_usb
+
+	SFW (ETH variant):
+
+	$ indiserver indi_mi_sfw_eth
+
 	You can then connect to the driver from any client, the default port is 7624.
 	If you're using KStars, the driver will be automatically listed in KStars' Device Manager,
 	no further configuration is necessary.
diff --git a/indi-mi/indi_miccd.xml.cmake b/indi-mi/indi_miccd.xml.cmake
@@ -10,4 +10,14 @@
         <version>@INDI_MI_VERSION_MAJOR@.@INDI_MI_VERSION_MINOR@</version>
     </device>
 </devGroup>
+<devGroup group="Filter Wheels">
+    <device label="MI SFW (USB)" manufacturer="Moravian Instruments">
+        <driver name="MI SFW">indi_mi_sfw_usb</driver>
+        <version>@INDI_MI_VERSION_MAJOR@.@INDI_MI_VERSION_MINOR@</version>
+    </device>
+    <device label="MI SFW (ETH)" manufacturer="Moravian Instruments">
+        <driver name="MI SFW">indi_mi_sfw_eth</driver>
+        <version>@INDI_MI_VERSION_MAJOR@.@INDI_MI_VERSION_MINOR@</version>
+    </device>
+</devGroup>
 </driversList>
diff --git a/indi-mi/mi_ccd.cpp b/indi-mi/mi_ccd.cpp
@@ -116,7 +116,8 @@ MICCD::MICCD(int camId, bool eth) : FilterInterface(this)
     else
     {
         rtrim(sp);
-        snprintf(name, MAXINDINAME, "MI %s", sp);
+        strncpy(name, "MI ", MAXINDINAME);
+        strncat(name, sp, MAXINDINAME - 3);
         IDLog("Detected camera: %s.\n", name);
     }