Changeset 642 for BAORadio/libindi/libindi/libs/indibase/indifocuser.cpp

Timestamp:

Feb 24, 2012, 12:37:36 PM (12 years ago)

Author:

frichard

Message:

-Alignement des antennes
-Version 0.0.9 de libindi

File:

• BAORadio/libindi/libindi/libs/indibase/indifocuser.cpp (modified) (10 diffs)

BAORadio/libindi/libindi/libs/indibase/indifocuser.cpp

@@ -1 +1 @@
 /*******************************************************************************
-  Copyright(c) 2010 Gerry Rozema. All rights reserved.
+  Copyright(c) 2011 Gerry Rozema. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by the Free
-  Software Foundation; either version 2 of the License, or (at your option)
-  any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
 
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc., 59
-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*******************************************************************************/
 
-  The full GNU General Public License is included in this distribution in the
-  file called LICENSE.
-*******************************************************************************/
 #include "indifocuser.h"
 
@@ -25 +23 @@
 INDI::Focuser::Focuser()
 {
-    //ctor
+    FocusSpeedNP  = new INumberVectorProperty;
+    FocusTimerNP  = new INumberVectorProperty;
+    FocusMotionSP = new ISwitchVectorProperty;
 }
 
 INDI::Focuser::~Focuser()
 {
-    //dtor
+    delete FocusSpeedNP;
+    delete FocusTimerNP;
+    delete FocusMotionSP;
+
 }
 
@@ -37 +40 @@
     DefaultDriver::initProperties();   //  let the base class flesh in what it wants
 
-    IUFillNumber(&FocusspeedN[0],"FOCUS_SPEED_VALUE","Focus Speed","%3.0f",0.0,255.0,1.0,255.0);
-    IUFillNumberVector(&FocusspeedNV,FocusspeedN,1,deviceName(),"FOCUS_SPEED","Speed","Main Control",IP_RW,60,IPS_OK);
+    IUFillNumber(&FocusSpeedN[0],"FOCUS_SPEED_VALUE","Focus Speed","%3.0f",0.0,255.0,1.0,255.0);
+    IUFillNumberVector(FocusSpeedNP,FocusSpeedN,1,deviceName(),"FOCUS_SPEED","Speed",MAIN_CONTROL_TAB,IP_RW,60,IPS_OK);
 
-    IUFillNumber(&FocustimerN[0],"FOCUS_TIMER_VALUE","Focus Timer","%4.0f",0.0,1000.0,10.0,1000.0);
-    IUFillNumberVector(&FocustimerNV,FocustimerN,1,deviceName(),"FOCUS_TIMER","Timer","Main Control",IP_RW,60,IPS_OK);
+    IUFillNumber(&FocusTimerN[0],"FOCUS_TIMER_VALUE","Focus Timer","%4.0f",0.0,1000.0,10.0,1000.0);
+    IUFillNumberVector(FocusTimerNP,FocusTimerN,1,deviceName(),"FOCUS_TIMER","Timer",MAIN_CONTROL_TAB,IP_RW,60,IPS_OK);
 
-    IUFillSwitch(&FocusmotionS[0],"FOCUS_INWARD","Focus In",ISS_ON);
-    IUFillSwitch(&FocusmotionS[1],"FOCUS_OUTWARD","Focus Out",ISS_OFF);
-    IUFillSwitchVector(&FocusmotionSV,FocusmotionS,2,deviceName(),"FOCUS_MOTION","Focus Direction","Main Control",IP_RW,ISR_1OFMANY,60,IPS_OK);
-
+    IUFillSwitch(&FocusMotionS[0],"FOCUS_INWARD","Focus In",ISS_ON);
+    IUFillSwitch(&FocusMotionS[1],"FOCUS_OUTWARD","Focus Out",ISS_OFF);
+    IUFillSwitchVector(FocusMotionSP,FocusMotionS,2,deviceName(),"FOCUS_MOTION","Direction",MAIN_CONTROL_TAB,IP_RW,ISR_1OFMANY,60,IPS_OK);
 
     return 0;
@@ -54 +56 @@
 {
     //  First we let our parent populate
-    IDLog("INDI::Focuser::ISGetProperties %s\n",dev);
     DefaultDriver::ISGetProperties(dev);
 
@@ -65 +66 @@
     {
         //  Now we add our focusser specific stuff
-        IDDefSwitch(&FocusmotionSV, NULL);
-        IDDefNumber(&FocusspeedNV, NULL);
-        IDDefNumber(&FocustimerNV, NULL);
+        defineSwitch(FocusMotionSP);
+        defineNumber(FocusSpeedNP);
+        defineNumber(FocusTimerNP);
     } else
     {
-        deleteProperty(FocusmotionSV.name);
-        deleteProperty(FocusspeedNV.name);
-        deleteProperty(FocustimerNV.name);
+        deleteProperty(FocusMotionSP->name);
+        deleteProperty(FocusSpeedNP->name);
+        deleteProperty(FocusTimerNP->name);
     }
     return true;
@@ -81 +82 @@
 {
     //  first check if it's for our device
-    IDLog("INDI::Focuser::ISNewNumber %s\n",name);
-    if(strcmp(dev,deviceName())==0) {
+    if(strcmp(dev,deviceName())==0)
+    {
         //  This is for our device
         //  Now lets see if it's something we process here
-        if(strcmp(name,"FOCUS_TIMER")==0) {
+        if(strcmp(name,"FOCUS_TIMER")==0)
+        {
             //  Ok, gotta move the focusser now
-            int dir;
+            FocusDirection dir;
             int speed;
             int t;
@@ -93 +95 @@
             //IDLog(")
             //  first we get all the numbers just sent to us
-            FocustimerNV.s=IPS_OK;
-            IUUpdateNumber(&FocustimerNV,values,names,n);
+            FocusTimerNP->s=IPS_OK;
+            IUUpdateNumber(FocusTimerNP,values,names,n);
 
             //  Now lets find what we need for this move
-            speed=FocusspeedN[0].value;
-            if(FocusmotionS[0].s==ISS_ON) dir=1;
-            else dir=0;
-            t=FocustimerN[0].value;
+            speed=FocusSpeedN[0].value;
+            if(FocusMotionS[0].s==ISS_ON) dir=FOCUS_INWARD;
+            else dir=FOCUS_OUTWARD;
+            t=FocusTimerN[0].value;
 
-            Move(dir,speed,t);
+            if (Move(dir,speed,t) == false)
+                FocusTimerNP->s = IPS_ALERT;
 
-
-            //  Update client display
-            IDSetNumber(&FocustimerNV,NULL);
+            IDSetNumber(FocusTimerNP,NULL);
             return true;
         }
 
 
-        if(strcmp(name,"FOCUS_SPEED")==0) {
-
-
-            FocusspeedNV.s=IPS_OK;
-            IUUpdateNumber(&FocusspeedNV,values,names,n);
+        if(strcmp(name,"FOCUS_SPEED")==0)
+        {
+            FocusSpeedNP->s=IPS_OK;
+            IUUpdateNumber(FocusSpeedNP,values,names,n);
 
 
 
             //  Update client display
-            IDSetNumber(&FocusspeedNV,NULL);
+            IDSetNumber(FocusSpeedNP,NULL);
             return true;
         }
@@ -132 +132 @@
 bool INDI::Focuser::ISNewSwitch (const char *dev, const char *name, ISState *states, char *names[], int n)
 {
-    IDLog("Enter IsNewSwitch for %s\n",name);
-    //for(int x=0; x<n; x++) {
-    //    IDLog("Switch %s %d\n",names[x],states[x]);
-    //}
 
-    if(strcmp(dev,deviceName())==0) {
+    if(strcmp(dev,deviceName())==0)
+    {
         //  This one is for us
-        if(strcmp(name,"FOCUS_MOTION")==0) {
+        if(strcmp(name,"FOCUS_MOTION")==0)
+        {
             //  client is telling us what to do with focus direction
-            FocusmotionSV.s=IPS_OK;
-            IUUpdateSwitch(&FocusmotionSV,states,names,n);
+            FocusMotionSP->s=IPS_OK;
+            IUUpdateSwitch(FocusMotionSP,states,names,n);
             //  Update client display
-            IDSetSwitch(&FocusmotionSV,NULL);
+            IDSetSwitch(FocusMotionSP,NULL);
 
             return true;
@@ -155 +153 @@
 }
 
-int INDI::Focuser::Move(int,int,int)
+bool INDI::Focuser::ISNewText (const char *dev, const char *name, char *texts[], char *names[], int n)
+{
+    return DefaultDriver::ISNewText(dev, name, texts, names, n);
+}
+
+void INDI::Focuser::ISSnoopDevice (XMLEle *root)
+{
+ return;
+}
+
+bool INDI::Focuser::Move(FocusDirection dir, int speed, int duration)
 {
     //  This should be a virtual function, because the low level hardware class
@@ -161 +169 @@
     //  but it's much easier early development if the method actually
     //  exists for now
-    return -1;
+    return false;
 }