[Kstars-devel] KDE/kdeedu/kstars/kstars/indi

[Jasem Mutlaq]

SVN commit 537339 by mutlaqja:

Adding Orion Atlas/Sky Scan telescope driver by Bruce Bockius.

CCMAIL: kstars-devel at kde.org



 M  +13 -0     CMakeLists.txt  
 M  +8 -0      drivers.xml  
 M  +24 -24    indicom.c  
 A             orionatlas.cpp   [License: LGPL (v2.1+) (wrong address)]
 A             orionatlas.h   [License: LGPL (v2.1+) (wrong address)]
 M  +0 -5      v4ldriver.h  


--- trunk/KDE/kdeedu/kstars/kstars/indi/CMakeLists.txt #537338:537339
@@ -251,6 +251,19 @@
 install_targets(/bin apmount )
 
 ########### next target ###############
+########### Orion Atlas ########
+set(orionatlas_SRCS 
+   indidrivermain.c 
+   eventloop.c 
+   orionatlas.cpp )
+
+kde4_add_executable(orionatlas ${orionatlas_SRCS}  ${liblilxml_SRCS} ${libindicom_SRCS})
+
+target_link_libraries(orionatlas  ${KDE4_KDECORE_LIBS} )
+
+install_targets(/bin orionatlas )
+
+########### next target ###############
 ########### Takahashi Temma #########
 set(temma_SRCS 
    indidrivermain.c 
--- trunk/KDE/kdeedu/kstars/kstars/indi/drivers.xml #537338:537339
@@ -62,6 +62,14 @@
 		<driver>lx200basic</driver>
 		<version>0.1</version>
 	</device>
+	<device label="Orion Atlas" focal_length="" aperture="">
+		<driver>orionatlas</driver>
+		<version>0.1</version>
+	</device>
+	<device label="Sky Scan" focal_length="" aperture="">
+		<driver>orionatlas</driver>
+		<version>0.1</version>
+	</device>
 	<device label="Losmandy Gemini" focal_length="" aperture="">
 		<driver>lx200basic</driver>
 		<version>1.0</version>
--- trunk/KDE/kdeedu/kstars/kstars/indi/indicom.c #537338:537339
@@ -754,37 +754,37 @@
  if (ttyOptions == NULL)
  {
 	ttyOptions = (struct termios *) malloc(sizeof(struct termios));
-	is_null = 1;
- }
+	memset(ttyOptions, 0, sizeof(struct termios));
 
-  memset(ttyOptions, 0, sizeof(struct termios));
-  tcgetattr(t_fd, ttyOptions);
+   	tcgetattr(t_fd, ttyOptions);
 
-   /* Control options
-    charecter size */
-   ttyOptions->c_cflag &= ~CSIZE;
-   /* 8 bit, enable read */
-   ttyOptions->c_cflag |= CREAD | CLOCAL | CS8;
-   /* no parity */
-   ttyOptions->c_cflag &= ~PARENB;
+	/* Control options charecter size */
+   	ttyOptions->c_cflag &= ~CSIZE;
+   	/* 8 bit, enable read */
+   	ttyOptions->c_cflag |= CREAD | CLOCAL | CS8;
+   	/* no parity */
+   	ttyOptions->c_cflag &= ~PARENB;
 
-   /* set baud rate */
-   cfsetispeed(ttyOptions, B9600);
-   cfsetospeed(ttyOptions, B9600);
+   	/* set baud rate */
+   	cfsetispeed(ttyOptions, B9600);
+   	cfsetospeed(ttyOptions, B9600);
 
-  /* set input/output flags */
-  ttyOptions->c_iflag = IGNBRK;
-  /* no software flow control */
-  ttyOptions->c_iflag &= ~(IXON|IXOFF|IXANY);
+  	/* set input/output flags */
+  	ttyOptions->c_iflag = IGNBRK;
+  	/* no software flow control */
+  	ttyOptions->c_iflag &= ~(IXON|IXOFF|IXANY);
 
-  /* Read at least one byte */
-  ttyOptions->c_cc[VMIN] = 1;
-  ttyOptions->c_cc[VTIME] = 5;
+  	/* Read at least one byte */
+  	ttyOptions->c_cc[VMIN] = 1;
+  	ttyOptions->c_cc[VTIME] = 5;
 
-  /* Misc. */
-  ttyOptions->c_lflag = 0;
-  ttyOptions->c_oflag = 0;
+  	/* Misc. */
+  	ttyOptions->c_lflag = 0;
+  	ttyOptions->c_oflag = 0;
 
+  	is_null = 1;
+ }
+
   /* set attributes */
   tcsetattr(t_fd, TCSANOW, ttyOptions);
 
--- trunk/KDE/kdeedu/kstars/kstars/indi/v4ldriver.h #537338:537339
@@ -46,11 +46,6 @@
 #include "cfitsio/fitsio.h"
 #include "eventloop.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <config-kstars.h>
-
 #ifdef HAVE_LINUX_VIDEODEV2_H
 #include "webcam/v4l2_base.h"
 #else