[hamradio-commits] [dump1090] 263/373: Better Incorporate coaa.h

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit f50744b11b30876ea0d737eb684ccf1be3696064
Author: Malcolm Robb <Support at ATTAvionics.com>
Date:   Mon Sep 30 11:46:36 2013 +0100

    Better Incorporate coaa.h
---
 coaa1090.obj | Bin 19120 -> 18024 bytes
 dump1090.c   |   2 +-
 dump1090.h   |   7 +++++--
 ppup1090.c   |   4 ++--
 view1090.c   |   1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/coaa1090.obj b/coaa1090.obj
index eefd21a..f62c363 100644
Binary files a/coaa1090.obj and b/coaa1090.obj differ
diff --git a/dump1090.c b/dump1090.c
index 2778f31..6553ba2 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -27,7 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-
+#include "coaa.h"
 #include "dump1090.h"
 //
 // ============================= Utility functions ==========================
diff --git a/dump1090.h b/dump1090.h
index a3ec71b..399b049 100644
--- a/dump1090.h
+++ b/dump1090.h
@@ -37,7 +37,7 @@
 // MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
 // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
 //
-#define MODES_DUMP1090_VERSION     "1.07.2709.13"
+#define MODES_DUMP1090_VERSION     "1.07.2909.13"
 
 // ============================= Include files ==========================
 
@@ -64,7 +64,10 @@
 #endif
 
 // ============================= #defines ===============================
-
+//
+// If you have a valid coaa.h, these values will come from it. If not, 
+// then you can enter your own values in the #else section here
+//
 #ifdef USER_LATITUDE
     #define MODES_USER_LATITUDE_DFLT   (USER_LATITUDE)
     #define MODES_USER_LONGITUDE_DFLT  (USER_LONGITUDE)
diff --git a/ppup1090.c b/ppup1090.c
index c3ac3fe..f71091c 100644
--- a/ppup1090.c
+++ b/ppup1090.c
@@ -104,8 +104,8 @@ void ppup1090Init(void) {
     modesInitErrorInfo();
 
     // Setup the uploader - read the user paramaters from the coaa.h header file
-    coaa1090.fUserLat = USER_LATITUDE;
-    coaa1090.fUserLon = USER_LONGITUDE;
+    coaa1090.fUserLat = MODES_USER_LATITUDE_DFLT;
+    coaa1090.fUserLon = MODES_USER_LONGITUDE_DFLT;
     strcpy(coaa1090.strAuthCode,STR(USER_AUTHCODE));
     strcpy(coaa1090.strRegNo,   STR(USER_REGNO));
 
diff --git a/view1090.c b/view1090.c
index 5b34870..32289fc 100644
--- a/view1090.c
+++ b/view1090.c
@@ -27,6 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
+#include "coaa.h"
 #include "view1090.h"
 //
 // ============================= Utility functions ==========================

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git