Weather Interface Refactor (#2025)

* Initial weather refactor * More progress on weather interface migration * Fix weather refactor issues and update drivers * Fix include
indilib · Mar 13, 2024 · ae26512 · ae26512
1 parent f5b4ea4
commit ae26512
Show file tree

Hide file tree

Showing 8 changed files with 178 additions and 216 deletions.
diff --git a/drivers/auxiliary/pegasus_ppb.cpp b/drivers/auxiliary/pegasus_ppb.cpp
@@ -469,9 +469,9 @@ bool PegasusPPB::getSensorData()
                 lastSensorData[PA_DEW_POINT] != result[PA_DEW_POINT])
         {
             if (WI::syncCriticalParameters())
-                IDSetLight(&critialParametersLP, nullptr);
-            ParametersNP.s = IPS_OK;
-            IDSetNumber(&ParametersNP, nullptr);
+                critialParametersLP.apply();
+            ParametersNP.setState(IPS_OK);
+            ParametersNP.apply();
         }
 
         // Power Status

diff --git a/drivers/auxiliary/pegasus_ppba.cpp b/drivers/auxiliary/pegasus_ppba.cpp
@@ -729,9 +729,9 @@ bool PegasusPPBA::getSensorData()
                 lastSensorData[PA_DEW_POINT] != result[PA_DEW_POINT])
         {
             if (WI::syncCriticalParameters())
-                IDSetLight(&critialParametersLP, nullptr);
-            ParametersNP.s = IPS_OK;
-            IDSetNumber(&ParametersNP, nullptr);
+                critialParametersLP.apply();
+            ParametersNP.setState(IPS_OK);
+            ParametersNP.apply();
         }
 
         // Power Status

diff --git a/drivers/auxiliary/pegasus_spb.cpp b/drivers/auxiliary/pegasus_spb.cpp
@@ -789,9 +789,9 @@ bool PegasusSPB::getSensorData()
                 lastSensorData[PA_DEW_POINT] != result[PA_DEW_POINT])
         {
             if (WI::syncCriticalParameters())
-                IDSetLight(&critialParametersLP, nullptr);
-            ParametersNP.s = IPS_OK;
-            IDSetNumber(&ParametersNP, nullptr);
+                critialParametersLP.apply();
+            ParametersNP.setState(IPS_OK);
+            ParametersNP.apply();
         }
 
         // Power Quad Status

diff --git a/drivers/auxiliary/pegasus_upb.cpp b/drivers/auxiliary/pegasus_upb.cpp
@@ -1400,9 +1400,9 @@ bool PegasusUPB::getSensorData()
         if (sensorUpdated(result, 4, 6))
         {
             if (WI::syncCriticalParameters())
-                IDSetLight(&critialParametersLP, nullptr);
-            ParametersNP.s = IPS_OK;
-            IDSetNumber(&ParametersNP, nullptr);
+                critialParametersLP.apply();
+            ParametersNP.setState(IPS_OK);
+            ParametersNP.apply();
         }
 
         // Port Status

diff --git a/drivers/telescope/lx200_OnStep.cpp b/drivers/telescope/lx200_OnStep.cpp
@@ -3274,9 +3274,9 @@ bool LX200_OnStep::ReadScopeStatus()
     WI::updateProperties();
 
     if (WI::syncCriticalParameters())
-        IDSetLight(&critialParametersLP, nullptr);
-    ParametersNP.s = IPS_OK;
-    IDSetNumber(&ParametersNP, nullptr);
+        critialParametersLP.apply();
+    ParametersNP.setState(IPS_OK);
+    ParametersNP.apply();
 
     if (TMCDrivers)
     {

diff --git a/libs/indibase/defaultdevice.h b/libs/indibase/defaultdevice.h
@@ -569,6 +569,7 @@ class DefaultDevice : public ParentDevice
         friend class Connection::TCP;
         friend class FilterInterface;
         friend class FocuserInterface;
+        friend class WeatherInterface;
 
     protected:
         DefaultDevice(const std::shared_ptr<DefaultDevicePrivate> &dd);