Fix conflict

indilib · Jul 26, 2024 · 572f76c · 572f76c
1 parent 34867c9
commit 572f76c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/drivers/auxiliary/waveshare_modbus_relay.cpp b/drivers/auxiliary/waveshare_modbus_relay.cpp
@@ -207,7 +207,7 @@ bool WaveshareRelay::UpdateDigitalOutputs()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 ///
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool WaveshareRelay::CommandOutput(uint32_t index, Status command)
+bool WaveshareRelay::CommandOutput(uint32_t index, OutputState command)
 {
     uint16_t value = (command == On) ? 0xFF00 : 0;
 

diff --git a/drivers/auxiliary/waveshare_modbus_relay.h b/drivers/auxiliary/waveshare_modbus_relay.h
@@ -52,7 +52,7 @@ class WaveshareRelay : public INDI::DefaultDevice, public INDI::OutputInterface
          * \brief Send command to relay
          * \return True if operation is successful, false otherwise
          */
-        virtual bool CommandOutput(uint32_t index, Status command) override;
+        virtual bool CommandOutput(uint32_t index, OutputState command) override;
 
         virtual void TimerHit() override;
         virtual bool saveConfigItems(FILE *fp) override;

diff --git a/libs/indibase/indiinputinterface.h b/libs/indibase/indiinputinterface.h
@@ -51,8 +51,7 @@ class InputInterface
         {
             Off,     /*!< Input is off. */
             On,      /*!< Input is on. */
-            Unknown /*!< Could not determined input status. */
-        } Status;
+        } InputState;
 
         /**
          * \brief Update all digital inputs

diff --git a/libs/indibase/indioutputinterface.cpp b/libs/indibase/indioutputinterface.cpp
@@ -118,7 +118,7 @@ bool OutputInterface::processSwitch(const char *dev, const char *name, ISState s
                 if (oldState != newState)
                 {
                     // Cast to Command and send
-                    if (CommandOutput(i, static_cast<Status>(newState)))
+                    if (CommandOutput(i, static_cast<OutputState>(newState)))
                     {
                         DigitalOutputsSP[i].setState(IPS_OK);
                     }

diff --git a/libs/indibase/indioutputinterface.h b/libs/indibase/indioutputinterface.h
@@ -50,7 +50,7 @@ class OutputInterface
         {
             Off,     /*!< Output is off. For Relays, it is open circuit. */
             On,      /*!< Output is on. For Relays, it is closed circuit. */
-        } Status;
+        } OutputState;
 
         /**
          * \brief Update all digital outputs
@@ -66,7 +66,7 @@ class OutputInterface
          * \brief Send command to output
          * \return True if operation is successful, false otherwise
          */
-        virtual bool CommandOutput(uint32_t index, Status command) = 0;
+        virtual bool CommandOutput(uint32_t index, OutputState command) = 0;
 
     protected:
         /**