Several fixes to INDI Alpaca drivers. Use better defaults. Fix Camera driver connection.

knro · knro · commit 2958e2d701bf · 2026-05-03T23:09:43.000+03:00
diff --git a/drivers/ccd/indi_alpaca_ccd.cpp b/drivers/ccd/indi_alpaca_ccd.cpp
@@ -51,17 +51,18 @@ AlpacaCCD::AlpacaCCD()
 
 void AlpacaCCD::setDefaultServerAddress(const char *host, const char *port, bool force)
 {
+    // Only apply defaults if no value was loaded from saved config (mirrors TCP plugin pattern).
+    // m_ConfigHost/m_ConfigPort are empty when no config file entry exists for this device,
+    // meaning this is either a first run or the user has never saved settings.
     if (host != nullptr)
     {
-        const char *currentHost = ServerAddressTP[0].getText();
-        if (force || currentHost == nullptr || strlen(currentHost) == 0)
+        if (force || m_ConfigHost.empty())
             ServerAddressTP[0].setText(host);
     }
 
     if (port != nullptr)
     {
-        const char *currentPort = ServerAddressTP[1].getText();
-        if (force || currentPort == nullptr || strlen(currentPort) == 0)
+        if (force || m_ConfigPort.empty())
             ServerAddressTP[1].setText(port);
     }
 }
@@ -76,11 +77,21 @@ bool AlpacaCCD::initProperties()
     CoolerSP[INDI_DISABLED].fill("COOLER_OFF", "OFF", ISS_ON);
     CoolerSP.fill(getDeviceName(), "CCD_COOLER", "Cooler", MAIN_CONTROL_TAB, IP_WO, ISR_1OFMANY, 0, IPS_IDLE);
 
-    // Setup server address properties
-    ServerAddressTP[0].fill("HOST", "Host", "");
-    ServerAddressTP[1].fill("PORT", "Port", "11111");
+    // Try to load server address from saved config (mirrors TCP plugin pattern).
+    // m_ConfigHost/m_ConfigPort are empty if no config was previously saved.
+    char configHost[MAXINDINAME] = {0};
+    char configPort[MAXINDINAME] = {0};
+    if (IUGetConfigText(getDeviceName(), "SERVER_ADDRESS", "HOST", configHost, MAXINDINAME) == 0)
+        m_ConfigHost = configHost;
+    if (IUGetConfigText(getDeviceName(), "SERVER_ADDRESS", "PORT", configPort, MAXINDINAME) == 0)
+        m_ConfigPort = configPort;
+
+    // Setup server address properties using config values (empty string if no config saved).
+    // Subclasses call setDefaultServerAddress() after initProperties() to set their own defaults,
+    // which will only take effect if m_ConfigHost/m_ConfigPort are still empty.
+    ServerAddressTP[0].fill("HOST", "Host", m_ConfigHost.c_str());
+    ServerAddressTP[1].fill("PORT", "Port", m_ConfigPort.c_str());
     ServerAddressTP.fill(getDeviceName(), "SERVER_ADDRESS", "Server", CONNECTION_TAB, IP_RW, 60, IPS_IDLE);
-    ServerAddressTP.load();
 
     // Setup device number property
     DeviceNumberNP[0].fill("DEVICE_NUMBER", "Device Number", "%.0f", 0, 10, 1, 0);
@@ -1015,12 +1026,7 @@ bool AlpacaCCD::sendAlpacaPUT(const std::string& endpoint, const nlohmann::json&
     std::string url = getAlpacaURL(endpoint);
     std::string form_data = buildAlpacaFormData(request);
 
-    httplib::Headers headers =
-    {
-        {"Content-Type", "application/x-www-form-urlencoded"}
-    };
-
-    auto result = httpClient->Put(url.c_str(), headers, form_data, "application/x-www-form-urlencoded");
+    auto result = httpClient->Put(url, form_data, "application/x-www-form-urlencoded");
 
     if (!result)
     {
diff --git a/drivers/ccd/indi_alpaca_ccd.h b/drivers/ccd/indi_alpaca_ccd.h
@@ -103,6 +103,10 @@ class AlpacaCCD : public INDI::CCD
         void setDefaultServerAddress(const char *host, const char *port, bool force = false);
 
     private:
+        // Config-loaded values (empty = no saved config, mirrors TCP plugin pattern)
+        std::string m_ConfigHost;
+        std::string m_ConfigPort;
+
         // Internal state variables
         bool m_ExposureInProgress {false};
         std::string m_CurrentReadoutModeName {"0"}; // Default to mode 0
diff --git a/drivers/ccd/indi_seestar_ccd.cpp b/drivers/ccd/indi_seestar_ccd.cpp
@@ -58,15 +58,15 @@ bool SeestarCCD::initProperties()
 {
     // Call parent class first
     AlpacaCCD::initProperties();
-    
+
     // Set Seestar-specific default connection parameters
-    setDefaultServerAddress("seestar.local", "32323");
-    
+    setDefaultServerAddress("SeeStar.local", "32323");
+
     // Remove cooler capability (Seestar doesn't have active cooling)
     uint32_t cap = GetCCDCapability();
     cap &= ~CCD_HAS_COOLER;
     SetCCDCapability(cap);
-    
+
     return true;
 }
 
@@ -78,13 +78,13 @@ bool SeestarCCD::Connect()
     // Call base class Connect
     if (!AlpacaCCD::Connect())
         return false;
-    
+
     // Force remove cooler capability after base class may have added it
     // (Seestar reports cansetccdtemperature=true but we don't want to expose cooler controls)
     uint32_t cap = GetCCDCapability();
     cap &= ~CCD_HAS_COOLER;
     SetCCDCapability(cap);
-    
+
     return true;
 }
 
@@ -95,15 +95,15 @@ bool SeestarCCD::updateProperties()
 {
     // Call base class first
     AlpacaCCD::updateProperties();
-    
+
     // Remove cooler properties if they were added by base class
     if (isConnected())
     {
         deleteProperty("CCD_COOLER");
         deleteProperty("CCD_TEMPERATURE");
         deleteProperty("CCD_COOLER_POWER");
     }
-    
+
     return true;
 }
 
@@ -125,7 +125,7 @@ std::string SeestarCCD::buildAlpacaFormData(const nlohmann::json& request)
     // Seestar requires method parameters FIRST, then ClientID/ClientTransactionID
     // This is opposite of standard Alpaca ordering
     std::string form_data;
-    
+
     // Add method-specific parameters first
     for (auto& [key, value] : request.items())
     {
@@ -177,8 +177,8 @@ bool SeestarCCD::parseImageBytesMetadata(ImageBytesMetadata* metadata, size_t bo
 
     // Log the raw metadata before corrections
     LOGF_INFO("Seestar raw metadata: Rank=%d, Dim1=%d, Dim2=%d, Dim3=%d, TransType=%d, DataStart=%d",
-               metadata->Rank, metadata->Dimension1, metadata->Dimension2, metadata->Dimension3,
-               metadata->TransmissionElementType, metadata->DataStart);
+              metadata->Rank, metadata->Dimension1, metadata->Dimension2, metadata->Dimension3,
+              metadata->TransmissionElementType, metadata->DataStart);
 
     // Apply Seestar-specific workarounds
     // Bug #1: Dimension1 and Dimension2 are swapped
diff --git a/drivers/focuser/indi_alpaca_focuser.cpp b/drivers/focuser/indi_alpaca_focuser.cpp
@@ -1,6 +1,6 @@
 /*
     INDI alpaca Focuser Driver
-    
+
     Copyright (C) 2024 Gord Tulloch
 
     This library is free software; you can redistribute it and/or
@@ -29,13 +29,11 @@ AlpacaFocuser::AlpacaFocuser()
 {
     setVersion(1, 0);
     FI::SetCapability(FOCUSER_CAN_ABS_MOVE | FOCUSER_CAN_ABORT);
-    
-    tcpConnection = new Connection::TCP(this);
+    setSupportedConnections(CONNECTION_TCP);
 }
 
 AlpacaFocuser::~AlpacaFocuser()
 {
-    delete tcpConnection;
 }
 
 const char *AlpacaFocuser::getDefaultName()
@@ -48,11 +46,12 @@ bool AlpacaFocuser::initProperties()
     INDI::Focuser::initProperties();
 
     // Use built-in TCP connection with default alpaca.local:32323
-    setActiveConnection(tcpConnection);
     tcpConnection->setDefaultHost("alpaca.local");
     tcpConnection->setDefaultPort(32323);
-    tcpConnection->registerHandshake([&]() { return Handshake(); });
-    registerConnection(tcpConnection);
+    tcpConnection->registerHandshake([&]()
+    {
+        return Handshake();
+    });
 
     // Device information
     DeviceInfoTP[DESCRIPTION].fill("DESCRIPTION", "Description", "");
@@ -241,7 +240,7 @@ IPState AlpacaFocuser::MoveAbsFocuser(uint32_t targetTicks)
     // Validate range
     if (targetTicks > FocusMaxPosNP[0].getValue())
     {
-        LOGF_ERROR("Target position %u exceeds maximum %u", targetTicks, 
+        LOGF_ERROR("Target position %u exceeds maximum %u", targetTicks,
                    static_cast<uint32_t>(FocusMaxPosNP[0].getValue()));
         return IPS_ALERT;
     }
@@ -250,7 +249,7 @@ IPState AlpacaFocuser::MoveAbsFocuser(uint32_t targetTicks)
 
     nlohmann::json response;
     std::string data = "Position=" + std::to_string(targetTicks);
-    
+
     if (!sendAlpacaPUT("/move", data, response))
     {
         LOGF_ERROR("Failed to move to position %u", targetTicks);
@@ -263,16 +262,16 @@ IPState AlpacaFocuser::MoveAbsFocuser(uint32_t targetTicks)
         int errorNum = response["ErrorNumber"].get<int>();
         if (errorNum != 0)
         {
-            std::string errorMsg = response.contains("ErrorMessage") ? 
-                                 response["ErrorMessage"].get<std::string>() : "Unknown error";
+            std::string errorMsg = response.contains("ErrorMessage") ?
+                                   response["ErrorMessage"].get<std::string>() : "Unknown error";
             LOGF_ERROR("Error moving focuser: %d - %s", errorNum, errorMsg.c_str());
             return IPS_ALERT;
         }
     }
 
     m_TargetPosition = targetTicks;
     m_Moving = true;
-    
+
     return IPS_BUSY;
 }
 
@@ -281,7 +280,7 @@ bool AlpacaFocuser::AbortFocuser()
     LOG_INFO("Aborting focuser movement");
 
     nlohmann::json response;
-    
+
     if (!sendAlpacaPUT("/halt", "", response))
     {
         LOG_ERROR("Failed to halt focuser");
@@ -291,7 +290,7 @@ bool AlpacaFocuser::AbortFocuser()
     m_Moving = false;
     FocusAbsPosNP.setState(IPS_IDLE);
     FocusAbsPosNP.apply();
-    
+
     LOG_INFO("Focuser movement halted");
     return true;
 }
@@ -317,20 +316,20 @@ void AlpacaFocuser::TimerHit()
     if (m_Moving)
     {
         bool moving = isMoving();
-        
+
         if (!moving)
         {
             // Movement completed
             m_Moving = false;
-            
+
             // Update current position
             int currentPos = getPosition();
             if (currentPos >= 0)
             {
                 FocusAbsPosNP[0].setValue(currentPos);
                 FocusAbsPosNP.setState(IPS_OK);
                 FocusAbsPosNP.apply();
-                
+
                 LOGF_INFO("Focuser reached position: %d", currentPos);
             }
         }
@@ -352,7 +351,7 @@ void AlpacaFocuser::TimerHit()
 bool AlpacaFocuser::isMoving()
 {
     nlohmann::json response;
-    
+
     if (!sendAlpacaGET("/ismoving", response))
     {
         return false;
@@ -369,7 +368,7 @@ bool AlpacaFocuser::isMoving()
 int AlpacaFocuser::getPosition()
 {
     nlohmann::json response;
-    
+
     if (!sendAlpacaGET("/position", response))
     {
         return -1;
@@ -399,11 +398,11 @@ bool AlpacaFocuser::sendAlpacaGET(const std::string &endpoint, nlohmann::json &r
         return false;
 
     std::string url = "/api/v1/focuser/" + std::to_string(m_DeviceNumber) + endpoint;
-    
+
     LOGF_DEBUG("GET %s", url.c_str());
-    
+
     auto res = m_AlpacaClient->Get(url.c_str());
-    
+
     if (!res)
     {
         LOGF_ERROR("HTTP GET failed for %s", url.c_str());
@@ -419,20 +418,20 @@ bool AlpacaFocuser::sendAlpacaGET(const std::string &endpoint, nlohmann::json &r
     try
     {
         response = nlohmann::json::parse(res->body);
-        
+
         // Check for Alpaca errors
         if (response.contains("ErrorNumber"))
         {
             int errorNum = response["ErrorNumber"].get<int>();
             if (errorNum != 0)
             {
-                std::string errorMsg = response.contains("ErrorMessage") ? 
-                                     response["ErrorMessage"].get<std::string>() : "Unknown error";
+                std::string errorMsg = response.contains("ErrorMessage") ?
+                                       response["ErrorMessage"].get<std::string>() : "Unknown error";
                 LOGF_WARN("Alpaca error %d: %s", errorNum, errorMsg.c_str());
                 return false;
             }
         }
-        
+
         return true;
     }
     catch (const nlohmann::json::exception &e)
@@ -448,18 +447,18 @@ bool AlpacaFocuser::sendAlpacaPUT(const std::string &endpoint, const std::string
         return false;
 
     std::string url = "/api/v1/focuser/" + std::to_string(m_DeviceNumber) + endpoint;
-    
+
     // Add client info to data
     std::string fullData = data;
     if (!fullData.empty())
         fullData += "&";
     fullData += "ClientID=" + std::to_string(m_ClientID);
     fullData += "&ClientTransactionID=" + std::to_string(++m_TransactionID);
-    
+
     LOGF_DEBUG("PUT %s: %s", url.c_str(), fullData.c_str());
-    
+
     auto res = m_AlpacaClient->Put(url.c_str(), fullData, "application/x-www-form-urlencoded");
-    
+
     if (!res)
     {
         LOGF_ERROR("HTTP PUT failed for %s", url.c_str());
@@ -475,20 +474,20 @@ bool AlpacaFocuser::sendAlpacaPUT(const std::string &endpoint, const std::string
     try
     {
         response = nlohmann::json::parse(res->body);
-        
+
         // Check for Alpaca errors
         if (response.contains("ErrorNumber"))
         {
             int errorNum = response["ErrorNumber"].get<int>();
             if (errorNum != 0)
             {
-                std::string errorMsg = response.contains("ErrorMessage") ? 
-                                     response["ErrorMessage"].get<std::string>() : "Unknown error";
+                std::string errorMsg = response.contains("ErrorMessage") ?
+                                       response["ErrorMessage"].get<std::string>() : "Unknown error";
                 LOGF_WARN("Alpaca error %d: %s", errorNum, errorMsg.c_str());
                 return false;
             }
         }
-        
+
         return true;
     }
     catch (const nlohmann::json::exception &e)
diff --git a/drivers/focuser/indi_alpaca_focuser.h b/drivers/focuser/indi_alpaca_focuser.h
diff --git a/drivers/telescope/indi_alpaca_telescope.cpp b/drivers/telescope/indi_alpaca_telescope.cpp
