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

some model bug fix & AAF & tail light on/off & meadecam #943

Merged
merged 9 commits into from
Jul 18, 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
12 changes: 12 additions & 0 deletions debian/libaltaircam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libaltaircam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- altair; Mon, 15 Jul 2024 09:56:43 +0800

libaltaircam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- altair; Sun, 07 Jul 2024 20:30:55 +0800

libaltaircam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libbressercam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libbressercam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- bresser; Mon, 15 Jul 2024 09:56:47 +0800

libbressercam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- bresser; Sun, 07 Jul 2024 20:31:02 +0800

libbressercam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libmallincam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libmallincam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- procom; Mon, 15 Jul 2024 09:57:03 +0800

libmallincam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- procom; Sun, 07 Jul 2024 20:31:18 +0800

libmallincam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
6 changes: 6 additions & 0 deletions debian/libmeadecam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libmeadecam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- meade; Mon, 15 Jul 2024 09:56:38 +0800

libmeadecam (1.54.2) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libnncam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libnncam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- nn; Mon, 15 Jul 2024 09:57:51 +0800

libnncam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- nn; Sun, 07 Jul 2024 20:31:36 +0800

libnncam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libogmacam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libogmacam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- ogmavision; Mon, 15 Jul 2024 09:56:52 +0800

libogmacam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- ogmavision; Sun, 07 Jul 2024 20:31:07 +0800

libogmacam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libomegonprocam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libomegonprocam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- nimax; Mon, 15 Jul 2024 09:57:19 +0800

libomegonprocam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- nimax; Sun, 07 Jul 2024 20:31:25 +0800

libomegonprocam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libstarshootg/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libstarshootg (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- orion; Mon, 15 Jul 2024 09:56:57 +0800

libstarshootg (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- orion; Sun, 07 Jul 2024 20:31:12 +0800

libstarshootg (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libtoupcam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libtoupcam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- touptek; Mon, 15 Jul 2024 09:56:31 +0800

libtoupcam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- touptek; Sun, 07 Jul 2024 20:30:47 +0800

libtoupcam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
12 changes: 12 additions & 0 deletions debian/libtscam/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
libtscam (56.26054.20240714) jammy; urgency=medium

* Upstream release

-- teleskop; Mon, 15 Jul 2024 09:57:56 +0800

libtscam (56.25996.20240707) jammy; urgency=medium

* Upstream release

-- teleskop; Sun, 07 Jul 2024 20:31:42 +0800

libtscam (55.25633.20240519) jammy; urgency=medium

* Upstream release
Expand Down
21 changes: 12 additions & 9 deletions indi-toupbase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@ add_executable(indi_mallincam_wheel ${indi_wheel_SRCS})
target_compile_definitions(indi_mallincam_wheel PRIVATE "-DBUILD_MALLINCAM")
target_link_libraries(indi_mallincam_wheel ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MALLINCAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

########### indi_meadecam_* ###########
add_executable(indi_meadecam_ccd ${indi_toupbase_SRCS})
target_compile_definitions(indi_meadecam_ccd PRIVATE "-DBUILD_MEADECAM")
target_link_libraries(indi_meadecam_ccd ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MEADECAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
add_executable(indi_meadecam_wheel ${indi_wheel_SRCS})
target_compile_definitions(indi_meadecam_wheel PRIVATE "-DBUILD_MEADECAM")
target_link_libraries(indi_meadecam_wheel ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MEADECAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

########### indi_nncam_* ###########
add_executable(indi_nncam_ccd ${indi_toupbase_SRCS})
target_compile_definitions(indi_nncam_ccd PRIVATE "-DBUILD_NNCAM")
Expand Down Expand Up @@ -128,6 +120,14 @@ add_executable(indi_tscam_wheel ${indi_wheel_SRCS})
target_compile_definitions(indi_tscam_wheel PRIVATE "-DBUILD_TSCAM")
target_link_libraries(indi_tscam_wheel ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${TSCAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

########### indi_meadecam_* ###########
add_executable(indi_meadecam_ccd ${indi_toupbase_SRCS})
target_compile_definitions(indi_meadecam_ccd PRIVATE "-DBUILD_MEADECAM")
target_link_libraries(indi_meadecam_ccd ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MEADECAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
add_executable(indi_meadecam_wheel ${indi_wheel_SRCS})
target_compile_definitions(indi_meadecam_wheel PRIVATE "-DBUILD_MEADECAM")
target_link_libraries(indi_meadecam_wheel ${INDI_LIBRARIES} ${CFITSIO_LIBRARIES} ${MEADECAM_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})

#####################################

if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
Expand All @@ -140,6 +140,7 @@ target_link_libraries(indi_ogmacam_ccd rt)
target_link_libraries(indi_omegonprocam_ccd rt)
target_link_libraries(indi_starshootg_ccd rt)
target_link_libraries(indi_tscam_ccd rt)
target_link_libraries(indi_meadecam_ccd rt)
target_link_libraries(indi_toupcam_wheel rt)
target_link_libraries(indi_altair_wheel rt)
target_link_libraries(indi_bressercam_wheel rt)
Expand All @@ -149,19 +150,20 @@ target_link_libraries(indi_ogmacam_wheel rt)
target_link_libraries(indi_omegonprocam_wheel rt)
target_link_libraries(indi_starshootg_wheel rt)
target_link_libraries(indi_tscam_wheel rt)
target_link_libraries(indi_meadecam_wheel rt)
endif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")

install(TARGETS
indi_toupcam_ccd
indi_altair_ccd
indi_bressercam_ccd
indi_mallincam_ccd
indi_meadecam_ccd
indi_nncam_ccd
indi_ogmacam_ccd
indi_omegonprocam_ccd
indi_starshootg_ccd
indi_tscam_ccd
indi_meadecam_ccd
indi_toupcam_wheel
indi_altair_wheel
indi_bressercam_wheel
Expand All @@ -171,6 +173,7 @@ install(TARGETS
indi_omegonprocam_wheel
indi_starshootg_wheel
indi_tscam_wheel
indi_meadecam_wheel
RUNTIME DESTINATION bin)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_toupbase.xml DESTINATION ${INDI_DATA_DIR})
3 changes: 2 additions & 1 deletion indi-toupbase/indi-toupbase.spec
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ BuildRequires: libtoupcam
BuildRequires: libaltaircam
BuildRequires: libbressercam
BuildRequires: libmallincam
BuildRequires: libmeadecam
BuildRequires: libnncam
BuildRequires: libogmacam
BuildRequires: libomegonprocam
BuildRequires: libstarshootg
BuildRequires: libtscam
BuildRequires: libmeadecam


%description
Expand Down Expand Up @@ -86,4 +86,5 @@ make DESTDIR=%{buildroot} install
* Sun Jul 19 2020 Jim Howard <[email protected]> 1.8.7.git-1
- update to build from git for copr, credit to Sergio Pascual and Christian Dersch for prior work on spec files
- added Omegon SDK based toupcam driver. 2022-05-27
- added Meade SDK based toupcam driver. 2024-07-12

50 changes: 45 additions & 5 deletions indi-toupbase/indi_toupbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ bool ToupBase::initProperties()

if (m_Instance->model->flag & CP(FLAG_TEC_ONOFF))
{
TemperatureN[0].min = CP(TEC_TARGET_MIN);
TemperatureN[0].max = CP(TEC_TARGET_MAX);
TemperatureN[0].value = CP(TEC_TARGET_DEF);

///////////////////////////////////////////////////////////////////////////////////
/// Cooler Control
///////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -247,6 +243,12 @@ bool ToupBase::initProperties()
IUFillSwitchVector(&m_LowNoiseSP, m_LowNoiseS, 2, getDeviceName(), "TC_LOW_NOISE", "Low Noise Mode", CONTROL_TAB, IP_RW,
ISR_1OFMANY, 60, IPS_IDLE);

// Tail Light
IUFillSwitch(&m_TailLightS[INDI_ENABLED], "INDI_ENABLED", "ON", ISS_OFF);
IUFillSwitch(&m_TailLightS[INDI_DISABLED], "INDI_DISABLED", "OFF", ISS_ON);
IUFillSwitchVector(&m_TailLightSP, m_TailLightS, 2, getDeviceName(), "TC_TAILLIGHT", "Tail Light", CONTROL_TAB, IP_RW,
ISR_1OFMANY, 60, IPS_IDLE);

///////////////////////////////////////////////////////////////////////////////////
/// High Fullwell
///////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -330,7 +332,6 @@ bool ToupBase::updateProperties()
defineProperty(&m_CoolerSP);
defineProperty(m_CoolerNP);
}

// Even if there is no cooler, we define temperature property as READ ONLY
else if (m_Instance->model->flag & CP(FLAG_GETTEMPERATURE))
{
Expand Down Expand Up @@ -358,6 +359,9 @@ bool ToupBase::updateProperties()
if (m_Instance->model->flag & (CP(FLAG_CG) | CP(FLAG_CGHDR)))
defineProperty(&m_GainConversionSP);

if (m_SupportTailLight)
defineProperty(&m_TailLightSP);

// Binning mode
defineProperty(&m_BinningModeSP);
if (m_MonoCamera == false)
Expand Down Expand Up @@ -407,6 +411,9 @@ bool ToupBase::updateProperties()
if (m_Instance->model->flag & (CP(FLAG_CG) | CP(FLAG_CGHDR)))
deleteProperty(m_GainConversionSP.name);

if (m_SupportTailLight)
deleteProperty(m_TailLightSP.name);

deleteProperty(m_BinningModeSP.name);
if (m_MonoCamera == false)
{
Expand Down Expand Up @@ -452,6 +459,20 @@ bool ToupBase::Connect()
cap |= CCD_HAS_ST4_PORT;
SetCCDCapability(cap);

if (m_Instance->model->flag & CP(FLAG_TEC_ONOFF))
{
int tecRange = 0;
FP(get_Option(m_Handle, CP(OPTION_TECTARGET_RANGE), &tecRange));
TemperatureN[0].min = TemperatureN[0].value = tecRange & 0xffff;
TemperatureN[0].max = (tecRange >> 16) & 0xffff;
}

{
int taillight = 0;
HRESULT rc = FP(get_Option(m_Handle, CP(OPTION_TAILLIGHT), &taillight));
m_SupportTailLight = SUCCEEDED(rc) ? true : false;
}

// Get min/max exposures
uint32_t min = 0, max = 0, current = 0;
FP(get_ExpTimeRange(m_Handle, &min, &max, &current));
Expand Down Expand Up @@ -1057,6 +1078,25 @@ bool ToupBase::ISNewSwitch(const char *dev, const char *name, ISState *states, c
return true;
}

// Tail Light
if (!strcmp(name, m_TailLightSP.name))
{
int prevIndex = IUFindOnSwitchIndex(&m_TailLightSP);
IUUpdateSwitch(&m_TailLightSP, states, names, n);
HRESULT rc = FP(put_Option(m_Handle, CP(OPTION_TAILLIGHT), m_TailLightS[INDI_ENABLED].s));
if (SUCCEEDED(rc))
m_TailLightSP.s = IPS_OK;
else
{
LOGF_ERROR("Failed to set tail light %s. %s", m_TailLightS[INDI_ENABLED].s == ISS_ON ? "ON" : "OFF", errorCodes(rc).c_str());
m_TailLightSP.s = IPS_ALERT;
IUResetSwitch(&m_TailLightSP);
m_TailLightS[prevIndex].s = ISS_ON;
}
IDSetSwitch(&m_TailLightSP, nullptr);
return true;
}

//////////////////////////////////////////////////////////////////////
/// Auto Exposure
//////////////////////////////////////////////////////////////////////
Expand Down
5 changes: 5 additions & 0 deletions indi-toupbase/indi_toupbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ class ToupBase : public INDI::CCD
ISwitchVectorProperty m_HeatSP;
ISwitch *m_HeatS { nullptr };

// Tail Light
ISwitchVectorProperty m_TailLightSP;
ISwitch m_TailLightS[2];

// Camera Info
ITextVectorProperty m_CameraTP;
IText m_CameraT[6];
Expand Down Expand Up @@ -285,6 +289,7 @@ class ToupBase : public INDI::CCD
eTriggerMode m_CurrentTriggerMode = TRIGGER_SOFTWARE; /* By default, we start the camera with software trigger mode, make it standby */

bool m_MonoCamera { false };
bool m_SupportTailLight { false };
double m_LastTemperature {-100};
double m_LastCoolerPower {-1};
uint8_t m_BitsPerPixel { 8 };
Expand Down
12 changes: 8 additions & 4 deletions indi-toupbase/indi_toupbase.xml.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<driver name="MALLINCAM">indi_mallincam_ccd</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
<device label="Meadecam" mdpd="true" manufacturer="Meade">
<driver name="Meade">indi_meadecam_ccd</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
<device label="Nncam" mdpd="true" manufacturer="Nn">
<driver name="Nn">indi_nncam_ccd</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
Expand All @@ -41,6 +37,10 @@
<driver name="Teleskop">indi_tscam_ccd</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
<device label="Meadecam" mdpd="true" manufacturer="Meade">
<driver name="Meade">indi_meadecam_ccd</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
</devGroup>
<devGroup group="Filter Wheels">
<device label="Toupcam EFW" mdpd="true" manufacturer="Toupcam">
Expand Down Expand Up @@ -79,5 +79,9 @@
<driver name="Teleskop">indi_tscam_wheel</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
<device label="Meadecam EFW" mdpd="true" manufacturer="Meade">
<driver name="Meade">indi_meadecam_wheel</driver>
<version>@TOUPBASE_VERSION_MAJOR@.@TOUPBASE_VERSION_MINOR@</version>
</device>
</devGroup>
</driversList>
Loading
Loading