Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MI library and extend SFW driver #953

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/indi-mi/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
indi-mi (2.1) buster; urgency=low

* Add new properties to Standalone Filter Wheel driver

-- Jakub Smutny <[email protected]> Fri, 02 Aug 2024 13:00:00 +0100

indi-mi (2.0) buster; urgency=medium

* Add MI Standalone Filter Wheel driver
Expand Down
6 changes: 6 additions & 0 deletions debian/libmicam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libmicam (1.3) buster; urgency=low

* Updated MI library to version 0.11.1/0.10.1

-- Jakub Smutny <[email protected]> Fri, 02 Aug 2024 13:00:00 +0100

libmicam (1.2) buster; urgency=low

* Updated MI library to version 0.10.0/0.9.0
Expand Down
2 changes: 1 addition & 1 deletion indi-mi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(Threads REQUIRED)
find_package(CFITSIO REQUIRED)

set(INDI_MI_VERSION_MAJOR 2)
set(INDI_MI_VERSION_MINOR 0)
set(INDI_MI_VERSION_MINOR 1)

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)
Expand Down
23 changes: 23 additions & 0 deletions indi-mi/mi_sfw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ bool MISFW::initProperties()
IUFillSwitch(&ReinitS[0], "REINIT", "Reinit Filter Wheel", ISS_OFF);
IUFillSwitchVector(&ReinitSP, ReinitS, 1, getDeviceName(), "SFW_REINIT", "Commands", MAIN_CONTROL_TAB, IP_WO, ISR_ATMOST1, 0, IPS_IDLE);

IUFillText(&InfoT[0], "Model", "", "");
IUFillText(&InfoT[1], "Firmware Rev.", "", "");
IUFillText(&InfoT[2], "Serial No.", "", "");
IUFillTextVector(&InfoTP, InfoT, 3, getDeviceName(), "Wheel Info", "Wheel Info", INFO_TAB, IP_RO, 60, IPS_IDLE);

addAuxControls();

return true;
Expand All @@ -154,10 +159,12 @@ bool MISFW::updateProperties()
if (isConnected())
{
defineProperty(&ReinitSP);
defineProperty(&InfoTP);
}
else
{
deleteProperty(ReinitSP.name);
deleteProperty(InfoTP.name);
}

return true;
Expand All @@ -184,6 +191,22 @@ bool MISFW::Connect()
return false;
}

int fw_ver[4];
char sp[MAXINDILABEL];

gxfw_get_string_parameter(wheelHandle, FW_GSP_DESCRIPTION, sp, MAXINDILABEL);
IUSaveText(&InfoT[0], sp);

gxfw_get_integer_parameter(wheelHandle, FW_GIP_VERSION_1, &fw_ver[0]);
gxfw_get_integer_parameter(wheelHandle, FW_GIP_VERSION_2, &fw_ver[1]);
gxfw_get_integer_parameter(wheelHandle, FW_GIP_VERSION_3, &fw_ver[2]);
gxfw_get_integer_parameter(wheelHandle, FW_GIP_VERSION_4, &fw_ver[3]);
snprintf(sp, MAXINDILABEL, "%d.%d.%d.%d", fw_ver[0], fw_ver[1], fw_ver[2], fw_ver[3]);
IUSaveText(&InfoT[1], sp);

gxfw_get_string_parameter(wheelHandle, FW_GSP_SERIAL_NUMBER, sp, MAXINDILABEL);
IUSaveText(&InfoT[2], sp);

LOGF_INFO("Connected to %s.", name);
return true;
}
Expand Down
3 changes: 3 additions & 0 deletions indi-mi/mi_sfw.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class MISFW : public INDI::FilterWheel
ISwitch ReinitS[1];
ISwitchVectorProperty ReinitSP;

IText InfoT[3];
ITextVectorProperty InfoTP;

private:
char name[MAXINDIDEVICE];

Expand Down
4 changes: 2 additions & 2 deletions libmicam/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.16)
project (libmicam)

set (MICAM_VERSION "0.10.0")
set (MICAM_VERSION_MAC "0.9.0")
set (MICAM_VERSION "0.11.1")
set (MICAM_VERSION_MAC "0.10.1")
set (MICAM_SOVERSION "0")

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
Expand Down
Binary file modified libmicam/libgxccd32.bin
Binary file not shown.
Binary file modified libmicam/libgxccd64.bin
Binary file not shown.
Binary file modified libmicam/libgxccdarmv7.bin
Binary file not shown.
Binary file modified libmicam/libgxccdarmv8.bin
Binary file not shown.
Binary file modified libmicam/libgxccdmac.bin
Binary file not shown.
Loading