1 diff -uNdr QLandkarte.2007.03.16.old/src/device/EtrexLegend/CDevice.cpp QLandkarte.2007.03.16/src/device/EtrexLegend/CDevice.cpp
2 --- QLandkarte.2007.03.16.old/src/device/EtrexLegend/CDevice.cpp 2007-03-12 20:21:53.000000000 +0100
3 +++ QLandkarte.2007.03.16/src/device/EtrexLegend/CDevice.cpp 2007-03-24 20:34:45.000000000 +0100
8 - if(strncmp(serial->getProductString().c_str(), "eTrex Legend", 12) != 0){
9 - throw exce_t(errSync,"No eTrex Legend unit detected, according to ProductString. Please retry to select other device driver.");
10 + if(serial->getProductString().compare(0,devname.size(),devname) != 0){
11 + throw exce_t(errSync,"No "+devname+" unit detected, according to ProductString. Please retry to select other device driver.");
13 - if(serial->getProductId() != GRMN_ETREX_LEGEND){
14 - throw exce_t(errSync,"No eTrex Legend unit detected, according to ProductId. Please retry to select other device driver.");
15 + if(serial->getProductId() != devid){
16 + throw exce_t(errSync,"No "+devname+" unit detected, according to ProductId. Please retry to select other device driver.");
20 diff -uNdr QLandkarte.2007.03.16.old/src/device/EtrexLegend/CDevice.h QLandkarte.2007.03.16/src/device/EtrexLegend/CDevice.h
21 --- QLandkarte.2007.03.16.old/src/device/EtrexLegend/CDevice.h 2007-02-20 14:09:53.000000000 +0100
22 +++ QLandkarte.2007.03.16/src/device/EtrexLegend/CDevice.h 2007-03-24 20:13:22.000000000 +0100
28 + std::string devname;
33 diff -uNdr QLandkarte.2007.03.16.old/src/device/EtrexLegend/EtrexLegend.pro QLandkarte.2007.03.16/src/device/EtrexLegend/EtrexLegend.pro
34 --- QLandkarte.2007.03.16.old/src/device/EtrexLegend/EtrexLegend.pro 2007-03-04 11:56:33.000000000 +0100
35 +++ QLandkarte.2007.03.16/src/device/EtrexLegend/EtrexLegend.pro 2007-03-24 20:41:51.000000000 +0100
38 include(../../../common)
41 +INSTALLS += target target2
42 target.path = $${QLANDKARTE_LIBDIR}
43 TARGETDEPS += ../../../src/device/libgarmin.a
44 LIBS += ../../../src/device/libgarmin.a
47 SOURCES += CDevice.cpp \
50 +QMAKE_POST_LINK = cd ${DESTDIR} && ln -sf ${TARGET} libEtrexVista.so
51 +target2.path = $${QLANDKARTE_LIBDIR}
52 +target2.commands = cd ${INSTALL_ROOT}$${QLANDKARTE_LIBDIR} && ln -sf ${TARGET} libEtrexVista.so
53 diff -uNdr QLandkarte.2007.03.16.old/src/device/EtrexLegend/loader.cpp QLandkarte.2007.03.16/src/device/EtrexLegend/loader.cpp
54 --- QLandkarte.2007.03.16.old/src/device/EtrexLegend/loader.cpp 2007-02-20 14:09:53.000000000 +0100
55 +++ QLandkarte.2007.03.16/src/device/EtrexLegend/loader.cpp 2007-03-24 20:39:10.000000000 +0100
57 if(EtrexLegend::device == 0){
58 EtrexLegend::device = new EtrexLegend::CDevice();
60 + EtrexLegend::device->devname = "eTrex Legend";
61 + EtrexLegend::device->devid = 411;
62 + return EtrexLegend::device;
65 +extern "C" Garmin::IDevice * const initEtrexVista(const char * version)
67 + if(strncmp(version,INTERFACE_VERSION,5) != 0){
70 + if(EtrexLegend::device == 0){
71 + EtrexLegend::device = new EtrexLegend::CDevice();
73 + EtrexLegend::device->devname = "eTrex Vista";
74 + EtrexLegend::device->devid = 169;
75 return EtrexLegend::device;
77 diff -uNdr QLandkarte.2007.03.16.old/src/device/GPSMap60CSx/GPSMap60CSx.pro QLandkarte.2007.03.16/src/device/GPSMap60CSx/GPSMap60CSx.pro
78 --- QLandkarte.2007.03.16.old/src/device/GPSMap60CSx/GPSMap60CSx.pro 2007-03-24 20:07:46.000000000 +0100
79 +++ QLandkarte.2007.03.16/src/device/GPSMap60CSx/GPSMap60CSx.pro 2007-03-24 20:44:37.000000000 +0100
82 include(../../../common)
84 -INSTALLS += target target2 target3
85 +INSTALLS += target target2 target3 target4
86 target.path = $${QLANDKARTE_LIBDIR}
87 TARGETDEPS += ../../../src/device/libgarmin.a
88 LIBS += ../../../src/device/libgarmin.a
90 SOURCES += CDevice.cpp \
93 -QMAKE_POST_LINK = cd ${DESTDIR} && ln -sf ${TARGET} libGPSMap60Cx.so && ln -sf ${TARGET} libEtrexVentureCx.so
94 +QMAKE_POST_LINK = cd ${DESTDIR} && ln -sf ${TARGET} libGPSMap60Cx.so && ln -sf ${TARGET} libEtrexVentureCx.so \
95 + && ln -sf ${TARGET} libEtrexVistaCx.so
96 target2.path = $${QLANDKARTE_LIBDIR}
97 target2.commands = cd ${INSTALL_ROOT}$${QLANDKARTE_LIBDIR} && ln -sf ${TARGET} libGPSMap60Cx.so
99 target3.path = $${QLANDKARTE_LIBDIR}
100 -target3.commands = cd ${INSTALL_ROOT}$${QLANDKARTE_LIBDIR} && ln -sf ${TARGET} libEtrexVentureCx.so
101 \ No newline at end of file
102 +target3.commands = cd ${INSTALL_ROOT}$${QLANDKARTE_LIBDIR} && ln -sf ${TARGET} libEtrexVentureCx.so
104 +target4.path = $${QLANDKARTE_LIBDIR}
105 +target4.commands = cd ${INSTALL_ROOT}$${QLANDKARTE_LIBDIR} && ln -sf ${TARGET} libEtrexVistaCx.so
106 diff -uNdr QLandkarte.2007.03.16.old/src/device/GPSMap60CSx/loader.cpp QLandkarte.2007.03.16/src/device/GPSMap60CSx/loader.cpp
107 --- QLandkarte.2007.03.16.old/src/device/GPSMap60CSx/loader.cpp 2007-03-03 17:00:24.000000000 +0100
108 +++ QLandkarte.2007.03.16/src/device/GPSMap60CSx/loader.cpp 2007-03-24 20:43:25.000000000 +0100
111 return GPSMap60CSx::device;
114 +extern "C" Garmin::IDevice * const initEtrexVistaCx(const char * version)
116 + if(strncmp(version,INTERFACE_VERSION,5) != 0){
119 + if(GPSMap60CSx::device == 0){
120 + GPSMap60CSx::device = new GPSMap60CSx::CDevice();
122 + GPSMap60CSx::device->devname = "eTrex VistaCx";
123 + GPSMap60CSx::device->devid = 0x01a5;
125 + return GPSMap60CSx::device;