[Commit-gnuradio] r3227 - in gnuradio/branches/developers/jcorgan/ezdop: . config ezdop/src/host/hunter gr-ezdop gr-ezdop/src gr-ezdop/src/lib gr-ezdop/src/python

[jcorgan]

Author: jcorgan
Date: 2006-08-09 08:48:30 -0600 (Wed, 09 Aug 2006)
New Revision: 3227

Added:
   gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am
Removed:
   
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am.proto
Modified:
   gnuradio/branches/developers/jcorgan/ezdop/
   gnuradio/branches/developers/jcorgan/ezdop/config/grc_ezdop.m4
   gnuradio/branches/developers/jcorgan/ezdop/configure.ac
   gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/
   gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/doppler.cpp
   gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/
   gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src/
   gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src/lib/
   gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src/python/
Log:
Get 'hunter' legacy application compiling. Misc. svn:ignore updates.



Property changes on: gnuradio/branches/developers/jcorgan/ezdop
___________________________________________________________________
Name: svn:ignore
   - configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile

   + configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile
build


Modified: gnuradio/branches/developers/jcorgan/ezdop/config/grc_ezdop.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/config/grc_ezdop.m4      
2006-08-09 06:38:07 UTC (rev 3226)
+++ gnuradio/branches/developers/jcorgan/ezdop/config/grc_ezdop.m4      
2006-08-09 14:48:30 UTC (rev 3227)
@@ -20,7 +20,7 @@
 AC_DEFUN([GRC_EZDOP],[
     AC_CONFIG_SRCDIR([ezdop/src/host/ezdop/ezdop.h])
 
-    AC_CONFIG_FILES([\
+    AC_CONFIG_FILES([ \
        ezdop/Makefile \
        ezdop/ezdop.pc \
        ezdop/src/Makefile \
@@ -31,6 +31,11 @@
        ezdop/src/host/tests/Makefile \
     ])
 
+    # FIXME: Test for wxWidgets
+    AC_CONFIG_FILES([ \
+       ezdop/src/host/hunter/Makefile \
+    ])    
+
     succeeded=yes
 
     AC_PATH_PROG(AVRGCC, [avr-gcc -v], no)

Modified: gnuradio/branches/developers/jcorgan/ezdop/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/configure.ac     2006-08-09 
06:38:07 UTC (rev 3226)
+++ gnuradio/branches/developers/jcorgan/ezdop/configure.ac     2006-08-09 
14:48:30 UTC (rev 3227)
@@ -93,7 +93,7 @@
 AC_CHECK_LIB(m, cosf, [AC_DEFINE([HAVE_COSF],[1],[Define to 1 if your system 
has `cosf'.])])
 AC_CHECK_LIB(m, trunc, [AC_DEFINE([HAVE_TRUNC],[1],[Define to 1 if your system 
has `trunc'.])])
 AC_CHECK_LIB(m, exp10, [AC_DEFINE([HAVE_EXP10],[1],[Define to 1 if your system 
has 'exp10'.])])
-AC_FUNC_MKTIME
+#AC_FUNC_MKTIME
 
 AH_BOTTOM([
 #ifndef HAVE_TRUNC
@@ -150,25 +150,25 @@
 dnl The order of the GR_ macros determines the order of compilation
 subdirs="config"
 GRC_GNURADIO_CORE
-#GRC_GNURADIO_EXAMPLES
-##GRC_USRP
-#GRC_GR_USRP                   dnl this must come after GRC_USRP
-#GRC_GR_AUDIO_ALSA
-#GRC_GR_AUDIO_JACK
-#GRC_GR_AUDIO_OSS
-#GRC_GR_AUDIO_OSX              dnl ***NOT TESTED***
-#GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
-#GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
-#GRC_GR_ATSC
-#GRC_GR_COMEDI
-#GRC_GR_ERROR_CORRECTING_CODES
-#GRC_GR_GSM_FR_VOCODER
-#GRC_GR_RADAR
-#GRC_GR_RADIO_ASTRONOMY
-#GRC_GR_VIDEO_SDL
-#GRC_GR_WXGUI
-#GRC_PMT
-#GRC_GR_TRELLIS
+GRC_GNURADIO_EXAMPLES
+GRC_USRP
+GRC_GR_USRP                    dnl this must come after GRC_USRP
+GRC_GR_AUDIO_ALSA
+GRC_GR_AUDIO_JACK
+GRC_GR_AUDIO_OSS
+GRC_GR_AUDIO_OSX               dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
+GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
+GRC_GR_ATSC
+GRC_GR_COMEDI
+GRC_GR_ERROR_CORRECTING_CODES
+GRC_GR_GSM_FR_VOCODER
+GRC_GR_RADAR
+GRC_GR_RADIO_ASTRONOMY
+GRC_GR_VIDEO_SDL
+GRC_GR_WXGUI
+GRC_PMT
+GRC_GR_TRELLIS
 GRC_EZDOP
 GRC_GR_EZDOP                   dnl this must come after GRC_EZDOP
 


Property changes on: 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Copied: 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am 
(from rev 3226, 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am.proto)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am    
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am    
    2006-08-09 14:48:30 UTC (rev 3227)
@@ -0,0 +1,55 @@
+# Copyright 2006 Johnathan Corgan.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+# 
+# This software 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.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+include $(top_srcdir)/Makefile.common
+
+bin_PROGRAMS = hunter
+hunter_SOURCES = \
+                 calibrate.cpp \
+                 doppler.cpp   \
+                 gps.cpp       \
+                 histogram.cpp \
+                 hunter.cpp    \
+                 hunterapp.cpp \
+                 hunter.xrc    \
+                 known.cpp     \
+                 resource.cpp  \
+                 sample.cpp    \
+                 samplelog.cpp \
+                 search.cpp    \
+                 serial.cpp    \
+                 settings.cpp  \
+                 spherical.cpp \
+                 tactical.cpp
+
+INCLUDES = $(EZDOP_INCLUDES)
+
+# wxWindows configuration
+WXCONFIG = /usr/bin/wx-config
+hunter_CXXFLAGS = `$(WXCONFIG) --cxxflags`
+LIBS += `$(WXCONFIG) --libs`
+
+# right now this option is disabled in configure.ac
+#if HAVE_LIBFTD2XX
+#hunter_LDADD = $(FTD2XX)/FTD2XX.lib
+#hunter_CXXFLAGS += -I$(FTD2XX)
+#endif
+
+# TODO: get LIBFTD2XX into same system as LIBFTDI
+hunter_LDADD = $(FTDI_LIBS)
+
+resource.cpp: $(top_srcdir)/ezdop/src/host/hunter/hunter.xrc
+       wxrc -c -o $(top_builddir)/ezdop/src/host/hunter/resource.cpp 
$(top_srcdir)/ezdop/src/host/hunter/hunter.xrc

Deleted: 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/Makefile.am.proto

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/doppler.cpp
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/doppler.cpp    
    2006-08-09 06:38:07 UTC (rev 3226)
+++ 
gnuradio/branches/developers/jcorgan/ezdop/ezdop/src/host/hunter/doppler.cpp    
    2006-08-09 14:48:30 UTC (rev 3227)
@@ -19,7 +19,7 @@
 // Application level includes
 #include "doppler.h"
 #include "util.h"
-#include "dopctrl.h"
+#include <dopctrl.h>
 
 // wxWidgets includes
 #include <wx/log.h>
@@ -28,11 +28,6 @@
 // System level includes
 #include <cmath>
 
-// TODO: Update with actual id's once established for product
-#define EZDOP_VENDORID  0x0403
-#define EZDOP_PRODUCTID 0x6001
-#define BAUDRATE        250000     // Fixed in EZ Doppler hardware design
-#define BBDIR           0x16       // Bits 4=RESET 2=SCK 1=MOSI 0=MISO, MISO 
is input
 #define SAMPLERATE      8000
 #define QUANTUM         0.2        // Sample period in seconds
 #define MAXSAMPLE       0x3FF      // 12 bit ADC
@@ -232,12 +227,12 @@
 
     // Set FTDI chipset baudrate for bitbang
 #if HAVE_FTDI_H
-       if (ftdi_set_baudrate(m_device, BAUDRATE)) {
+       if (ftdi_set_baudrate(m_device, EZDOP_BAUDRATE)) {
            wxLogWarning(_T("ftdi_set_baudrate: %s"), m_device->error_str);
            return false;
     }
 #elif HAVE_LIBFTD2XX
-       if ((m_status = FT_SetBaudRate(m_handle, BAUDRATE)) != FT_OK) {
+       if ((m_status = FT_SetBaudRate(m_handle, EZDOP_BAUDRATE)) != FT_OK) {
                wxLogError(_T("FT_SetBaudRate failed: %i"), m_status);
                return false;
        }
@@ -246,7 +241,7 @@
     // Toggle DTR (-->AVR RESET)
 #if HAVE_FTDI_H
     // Enable bitbang
-       if (ftdi_enable_bitbang(m_device, BBDIR)) {
+       if (ftdi_enable_bitbang(m_device, EZDOP_BBDIR)) {
            wxLogWarning(_T("ftdi_enable_bitbang: %s"), m_device->error_str);
                return false;
        }
@@ -300,7 +295,7 @@
     wxASSERT(m_online);
     // TODO: flush stream data
 
-    if (!send_byte(CMD_START) || !send_byte(CMD_STREAM))
+    if (!send_byte(EZDOP_CMD_ROTATE) || !send_byte(EZDOP_CMD_STREAM))
         return false;
         
     m_thread = new DopplerBackground(m_gui, this);
@@ -320,7 +315,7 @@
     }
     
     m_thread = NULL;
-    return (send_byte(CMD_STROFF) && send_byte(CMD_STOP));
+    return (send_byte(EZDOP_CMD_STROFF) && send_byte(EZDOP_CMD_STOP));
 }
 
 bool EZDoppler::SelectRotationRate(int n)
@@ -329,7 +324,7 @@
     wxASSERT(n >= 0 && n < 6);
 
     unsigned char rate = rotation_rates[n];
-    if (send_byte(CMD_RATE) &&         send_byte(rate)) {
+    if (send_byte(EZDOP_CMD_RATE) && send_byte(rate)) {
         m_selected_rate = n;
         m_in_phase = 0.0;
         m_quadrature = 0.0;


Property changes on: gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src
___________________________________________________________________
Name: svn:ignore
   + Makfile
Makefile.in



Property changes on: gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src/lib
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: 
gnuradio/branches/developers/jcorgan/ezdop/gr-ezdop/src/python
___________________________________________________________________
Name: svn:ignore
   + Makefile.in