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

[Jasem Mutlaq]

SVN commit 615475 by mutlaqja:

It looked like I already had a working solution for KStars INDI vs.
vanilla INDI trees using an #ifdef that is issued by the vanilla INDI
build system. This solution works, if there is a better one, please let
me know.

CCMAIL: kstars-devel at kde.org




 M  +0 -7      apogee/CameraIO_LinuxISA.cpp  
 M  +0 -7      apogee/CameraIO_LinuxPCI.cpp  
 M  +6 -0      celestronprotocol.c  
 M  +7 -2      indicom.h  
 M  +0 -4      lx200driver.c  


--- trunk/KDE/kdeedu/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp #615474:615475
@@ -49,13 +49,6 @@
 #include "CameraIO_Linux.h"
 #include "ApogeeLinux.h"
 
-const int NUM_POSITIONS = 6;
-const int NUM_STEPS_PER_FILTER = 48;
-const int STEP_DELAY = 10;
-
-const unsigned char Steps[] = { 0x10, 0x30, 0x20, 0x60, 0x40, 0xc0, 0x80, 0x90 };
-const int NUM_STEPS = sizeof ( Steps );
-
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
--- trunk/KDE/kdeedu/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp #615474:615475
@@ -49,13 +49,6 @@
 #include "CameraIO_Linux.h"
 #include "ApogeeLinux.h"
 
-const int NUM_POSITIONS = 6;
-const int NUM_STEPS_PER_FILTER = 48;
-const int STEP_DELAY = 10;
-
-const unsigned char Steps[] = { 0x10, 0x30, 0x20, 0x60, 0x40, 0xc0, 0x80, 0x90 };
-const int NUM_STEPS = sizeof ( Steps );
-
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
--- trunk/KDE/kdeedu/kstars/kstars/indi/celestronprotocol.c #615474:615475
@@ -35,10 +35,16 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+
+#ifndef HAVE_CONFIG_H
 #include "kstars/config-kstars.h"
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
+#else
+#include <termios.h>
+#endif
+
 #include <math.h>
 #include "celestronprotocol.h"
 
--- trunk/KDE/kdeedu/kstars/kstars/indi/indicom.h #615474:615475
@@ -44,13 +44,18 @@
 #ifndef INDICOM_H
 #define INDICOM_H
 
+#include <time.h>
+
+#ifndef HAVE_CONFIG_H
 #include "kstars/config-kstars.h"
-
-#include <time.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
+#else
+#include <termios.h>
+#endif
 
+
 #define J2000 2451545.0
 #define ERRMSG_SIZE 1024
 #define INDI_DEBUG
--- trunk/KDE/kdeedu/kstars/kstars/indi/lx200driver.c #615474:615475
@@ -26,10 +26,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "kstars/config-kstars.h"
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
 #include <time.h>
 
 #include "indicom.h"