indilib · knro · Oct 2, 2023 · May 5, 2023 · May 6, 2023 · May 7, 2023
diff --git a/cmake_modules/FindASTROASIS.cmake b/cmake_modules/FindASTROASIS.cmake
@@ -22,12 +22,22 @@ else (ASTROASIS_INCLUDE_DIR AND ASTROASIS_LIBRARIES)
     ${GNUWIN32_DIR}/include
   )
 
-  find_library(ASTROASIS_LIBRARIES NAMES oasisfocuser
+  find_library(ASTROASIS_FOCUSER_LIBRARIES NAMES oasisfocuser
     PATHS
     ${_obLinkDir}
     ${GNUWIN32_DIR}/lib
   )
 
+  find_library(ASTROASIS_FILTER_WHEEL_LIBRARIES NAMES oasisfilterwheel
+    PATHS
+    ${_obLinkDir}
+    ${GNUWIN32_DIR}/lib
+  )
+
+  if (ASTROASIS_FOCUSER_LIBRARIES AND ASTROASIS_FILTER_WHEEL_LIBRARIES)
+	  set(ASTROASIS_LIBRARIES ${ASTROASIS_FOCUSER_LIBRARIES} ${ASTROASIS_FILTER_WHEEL_LIBRARIES})
+  endif (ASTROASIS_FOCUSER_LIBRARIES AND ASTROASIS_FILTER_WHEEL_LIBRARIES)
+
   if(ASTROASIS_INCLUDE_DIR AND ASTROASIS_LIBRARIES)
     set(ASTROASIS_FOUND TRUE)
   else (ASTROASIS_INCLUDE_DIR AND ASTROASIS_LIBRARIES)

diff --git a/debian/indi-astroasis/changelog b/debian/indi-astroasis/changelog
@@ -1,3 +1,10 @@
+indi-astroasis (1.1) jammy; urgency=medium
+
+    * Add Oasis Filter Wheel driver.
+    * Update compilation and installation instructions.
+
+ -- Frank Chen <[email protected]>  Mon, 2 Oct 2023 21:00:00 +0800
+
 indi-astroasis (1.0) jammy; urgency=medium
 
     * Initial release.

diff --git a/debian/libastroasis/changelog b/debian/libastroasis/changelog
@@ -1,3 +1,9 @@
+libastroasis (1.1.0) jammy; urgency=medium
+
+  * Add Oasis Filter Wheel driver library files.
+
+ -- Frank Chen <[email protected]>  Sun, 1 Oct 2023 01:00:00 +0800
+
 libastroasis (1.0.5) jammy; urgency=medium
 
   * Initial Release.

diff --git a/indi-astroasis/CMakeLists.txt b/indi-astroasis/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(USB1 REQUIRED)
 find_package(Threads REQUIRED)
 
 set(ASTROASIS_VERSION_MAJOR 1)
-set(ASTROASIS_VERSION_MINOR 0)
+set(ASTROASIS_VERSION_MINOR 1)
 
 set(INDI_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/indi")
 
@@ -35,11 +35,22 @@ ELSE()
 target_link_libraries(indi_oasis_focuser ${INDI_LIBRARIES} ${ASTROASIS_LIBRARIES} ${USB1_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 ENDIF()
 
+########### indi_oasis_filter_wheel ###########
+add_executable(indi_oasis_filter_wheel ${CMAKE_CURRENT_SOURCE_DIR}/oasis_filter_wheel.cpp)
+IF (APPLE)
+set(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework CoreFoundation")
+target_link_libraries(indi_oasis_filter_wheel ${INDI_LIBRARIES} ${ASTROASIS_LIBRARIES} ${LIBUSB_LIBRARIES})
+ELSE()
+target_link_libraries(indi_oasis_filter_wheel ${INDI_LIBRARIES} ${ASTROASIS_LIBRARIES} ${USB1_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ENDIF()
+
 #####################################
 
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
 target_link_libraries(indi_oasis_focuser rt)
+target_link_libraries(indi_oasis_filter_wheel rt)
 endif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
 
 install(TARGETS indi_oasis_focuser RUNTIME DESTINATION bin)
+install(TARGETS indi_oasis_filter_wheel RUNTIME DESTINATION bin)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_astroasis.xml DESTINATION ${INDI_DATA_DIR})
diff --git a/indi-astroasis/INSTALL b/indi-astroasis/INSTALL
@@ -1,16 +1,22 @@
 Installation instructions
 =========================
 
-Compile Instructions
-  - Assumption: INDI package installed (see https://indilib.org/download.html)
-  - Retrieve the sources for the Astroasis driver
-    git clone https://github.com/astroasis/indi-3rdparty.git
-  - cd indi-3rdparty
-    checkout branch "master"
-  - mkdir -p build/indi-astroasis
-  - cd build/indi-astroasis
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ../../indi-astroasis
-  - sudo make install
+Compilation Instructions
 
-And now start the INDI server and kstars.
+Step 1: build and install libastroasis
+  1) $ cd indi-3rdparty
+  2) $ mkdir -p build/libastroasis
+  3) $ cd build/libastroasis
+  4) $ cmake -DCMAKE_INSTALL_PREFIX=/usr ../../libastroasis
+  5) $ make
+  6) $ sudo make install
+
+Step 2: build and install indi-astroasis
+  1) $ cd indi-3rdparty
+  2) $ mkdir -p build/indi-astroasis
+  3) $ cd build/indi-astroasis
+  4) $ cmake -DCMAKE_INSTALL_PREFIX=/usr ../../indi-astroasis
+  5) $ make
+  6) $ sudo make install
 
+And now start the INDI server and kstars.
diff --git a/indi-astroasis/indi_astroasis.xml.cmake b/indi-astroasis/indi_astroasis.xml.cmake
@@ -6,4 +6,10 @@
                 <version>@ASTROASIS_VERSION_MAJOR@.@ASTROASIS_VERSION_MINOR@</version>
         </device>
 </devGroup>
+<devGroup group="Filter Wheels">
+        <device label="Oasis Filter Wheel" manufacturer="Astroasis">
+                <driver name="Oasis Filter Wheel">indi_oasis_filter_wheel</driver>
+                <version>@ASTROASIS_VERSION_MAJOR@.@ASTROASIS_VERSION_MINOR@</version>
+        </device>
+</devGroup>
 </driversList>