[garmindev] 05/12: Imported Upstream version 0.3.3

[Jaromír Mikeš]

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

mira-guest pushed a commit to branch master
in repository garmindev.

commit 3d79e8113efb8e547f44b75a181d5c73db784ade
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Apr 25 17:27:48 2015 +0200

    Imported Upstream version 0.3.3
---
 CMakeLists.txt                  |  2 +-
 changelog.txt                   |  8 ++++++++
 src/EtrexLegendC/CMakeLists.txt |  1 +
 src/EtrexLegendC/loader.cpp     | 13 +++++++++++++
 svn-commit.tmp                  | 14 --------------
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98da923..ab629a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(VER_MINOR     17)
 #this one is for the release version
 set(PACKAGE_VER_MAJOR     0)
 set(PACKAGE_VER_MINOR     3)
-set(PACKAGE_VER_PATCH     2)
+set(PACKAGE_VER_PATCH     3)
 
 
 add_definitions(-DVER_MAJOR=${VER_MAJOR} -DVER_MINOR=${VER_MINOR})
diff --git a/changelog.txt b/changelog.txt
index f8ade59..6065844 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+--- 2010.02.06 ---
+
+Request #10:
+Add support for GPSMap60C
+
+
+
 --- 2010.01.23 ---
 
 Bug     #8:
@@ -52,3 +59,4 @@ Initial Release
 
 
 
+
diff --git a/src/EtrexLegendC/CMakeLists.txt b/src/EtrexLegendC/CMakeLists.txt
index c4f4190..ac072fc 100644
--- a/src/EtrexLegendC/CMakeLists.txt
+++ b/src/EtrexLegendC/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(EtrexLegendC garmin ${LIBUSB_LIBRARIES} pthread)
 set(ALIASES
     EtrexVistaC
     GPSMap60CS
+    GPSMap60C
     GPSMap76CS
 )
 
diff --git a/src/EtrexLegendC/loader.cpp b/src/EtrexLegendC/loader.cpp
index a2be2aa..0560a11 100644
--- a/src/EtrexLegendC/loader.cpp
+++ b/src/EtrexLegendC/loader.cpp
@@ -48,6 +48,19 @@ extern "C" WIN_EXPORT Garmin::IDevice * initEtrexLegendC(const char * version)
 }
 
 
+extern "C" WIN_EXPORT Garmin::IDevice * initGPSMap60C(const char * version)
+{
+    if(strncmp(version,INTERFACE_VERSION,5) != 0) {
+        return 0;
+    }
+    if(EtrexLegendC::device == 0) {
+        EtrexLegendC::device = new EtrexLegendC::CDevice();
+    }
+    EtrexLegendC::device->devname = "GPSMap60C";
+    EtrexLegendC::device->devid   = 0x0123;
+    return EtrexLegendC::device;
+}
+
 extern "C" WIN_EXPORT Garmin::IDevice * initGPSMap60CS(const char * version)
 {
     if(strncmp(version,INTERFACE_VERSION,5) != 0) {
diff --git a/svn-commit.tmp b/svn-commit.tmp
deleted file mode 100644
index 1e0b680..0000000
--- a/svn-commit.tmp
+++ /dev/null
@@ -1,14 +0,0 @@
-add fixes for OSX and big endian stuff
--- Diese und die folgenden Zeilen werden ignoriert --
-
-M    cmake/Modules/FindUSB.cmake
-M    src/CUSB_MacOSX.cpp
-M    src/EtrexH/CDevice.cpp
-M    src/CSerial.cpp
-M    src/GPSMap76/CDevice.cpp
-M    src/EtrexLegendC/CDevice.cpp
-M    src/CTcp.cpp
-M    src/Platform.h
-M    src/GPSMap60CSx/CDevice.cpp
-M    src/CUSB.cpp
-M    src/CMakeLists.txt

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