Merge lp:~bben-pub/igotu2gpx/igotu2gpx into lp:igotu2gpx

[Benjamin]

Fixes the bug for the years 2000 + n*16 due to the year being coded on 4 bits.

[Matija Nalis (mnalis)]

"2016 FIX" part doesn't work for me on GT-200 (Firmware version: 2.11, Model: GT-200) - it claims to have "Number of points: 7536640" on empty device which is way too much (and so download takes hours). Without this patch it correctly says "Number of points: 0"

[Benjamin (bben-pub)]

> "2016 FIX" part doesn't work for me on GT-200 (Firmware version: 2.11, Model:
> GT-200) - it claims to have "Number of points: 7536640" on empty device which
> is way too much (and so download takes hours). Without this patch it correctly
> says "Number of points: 0"

I believe the issue comes from the previous update on which I based my changes (which simply modify the dates). I used a fix to support GT600 devices as it's the one I have, but it may break the GT200 compatibility. Did you try to use that GT600 branch to check if it's true?

[Matija Nalis (mnalis)]

> > "2016 FIX" part doesn't work for me on GT-200 (Firmware version: 2.11,
> Model:
> > GT-200) - it claims to have "Number of points: 7536640" on empty device
> which
> > is way too much (and so download takes hours). Without this patch it
> correctly
> > says "Number of points: 0"
>
> I believe the issue comes from the previous update on which I based my changes
> (which simply modify the dates). I used a fix to support GT600 devices as it's
> the one I have, but it may break the GT200 compatibility. Did you try to use
> that GT600 branch to check if it's true?

the issue seems to be with
http://bazaar.launchpad.net/~bben-pub/igotu2gpx/igotu2gpx/revision/213
at file "src/lib/igotu/commands.cpp" where there is added command
"count += result.data()[0]<<16;" being unconditionally done. It probably should be executed only if GT-600 (or GT-200e?) is detected, a not for everybody else (like plain GT-200).

Unmerged revisions

213. By Benjamin on 2016-01-27

Fix for the GT600 + year 2016

212. By charles <charles@masterpingoo> on 2011-01-15

Added 'clean' command support for GT-200e / GT-600

=== modified file '.bzrignore'
--- .bzrignore	2010-07-05 12:58:10 +0000
+++ .bzrignore	2017-03-13 03:20:51 +0000
@@ -44,3 +44,6 @@
 /igotu2gpx-*.zip
 
 /debian/tmp/
+
+# MacOS X
+.DS_Store

=== modified file 'HACKING'
--- HACKING	2010-03-17 06:59:00 +0000
+++ HACKING	2017-03-13 03:20:51 +0000
@@ -347,6 +347,32 @@
 
 ----
   purge = false
+  blocks = 0x800
+  for i = blocks - 1; i > 0; --i:
+    if purge:
+      while UnknownWriteCommand2(0x0001) != 0x00:
+        pass
+    else:
+      if ReadCommand(i * 0x1000, 0x10) != rep(0xff, 0x10):
+        purge = true
+      else:
+        continue
+    UnknownWriteCommand1(0x00)
+    WriteCommand(0x20, i * 0x1000, '')
+  if purge:
+    UnknownPurgeCommand1(0x1e)
+    UnknownPurgeCommand1(0x1f)
+    while UnknownWriteCommand2(0x0001) != 0x00:
+      pass
+  UnknownPurgeCommand1(0x1e)
+  UnknownPurgeCommand1(0x1f)
+----
+
+GT-600, Firmware 5.24, @trip PC 3.2 1012.751
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+----
+  purge = false
   blocks = 0x200
   for i = blocks - 1; i > 0; --i:
     if purge:
@@ -360,10 +386,12 @@
     UnknownWriteCommand1(0x00)
     WriteCommand(0x20, i * 0x1000, '')
   if purge:
+    UnknownPurgeCommand1(0x1d)
     UnknownPurgeCommand1(0x1e)
     UnknownPurgeCommand1(0x1f)
     while UnknownWriteCommand2(0x0001) != 0x00:
       pass
+  UnknownPurgeCommand1(0x1d)
   UnknownPurgeCommand1(0x1e)
   UnknownPurgeCommand1(0x1f)
 ----
@@ -413,9 +441,9 @@
           0x80: LED flashing when valid data is recorded is disabled
   0x0004: uint8 max allowed time when button is pushed and start tracer mode?
   0x0005: uint8 initial timeout when button is pushed and start tracer mode?
-  0x0004: uint8 max allowed time when RTC power of GPS is lost (data/time is
+  0x0006: uint8 max allowed time when RTC power of GPS is lost (data/time is
           not a valid value)
-  0x0005: uint8 initial timeout when RTC power of GPS is lost (data/time is 
+  0x0007: uint8 initial timeout when RTC power of GPS is lost (data/time is 
           not a valid value)
   0x0008: uint8 schedule date offset: start date = utc date + offset
   0x0009..0x00ff: uint4 schedule table plans (1 if no schedule used,

=== modified file 'src/connections/serialconnection/serialconnection.cpp'
--- src/connections/serialconnection/serialconnection.cpp	2013-05-18 12:54:49 +0000
+++ src/connections/serialconnection/serialconnection.cpp	2017-03-13 03:20:51 +0000
@@ -26,6 +26,7 @@
 #else
 #include <cerrno>
 #include <fcntl.h>
+#include <unistd.h>
 #include <termios.h>
 #include <unistd.h>
 #endif

=== modified file 'src/lib/igotu/commands.cpp'
--- src/lib/igotu/commands.cpp	2013-05-18 12:54:49 +0000
+++ src/lib/igotu/commands.cpp	2017-03-13 03:20:51 +0000
@@ -126,7 +126,7 @@
             id = Gt120;
             break;
         case 0x17:
-            name = IgotuCommand::tr("GT-200e");
+            name = IgotuCommand::tr("GT-200e/GT-600");
             id = Gt200e;
             break;
         }
@@ -161,6 +161,8 @@
         throw Exception(IgotuCommand::tr("Response too short"));
     count = qFromBigEndian<quint16>(reinterpret_cast<const uchar*>
             (result.data() + 1));
+    count += result.data()[0]<<16;
+
     return result;
 }
 

=== modified file 'src/lib/igotu/igotucontrol.cpp'
--- src/lib/igotu/igotucontrol.cpp	2013-05-18 12:54:49 +0000
+++ src/lib/igotu/igotucontrol.cpp	2017-03-13 03:20:51 +0000
@@ -478,6 +478,7 @@
         model.sendAndReceive();
 
         unsigned blocks = 1;
+        bool run_UnknownPurgeCommand1_0x1d = false;
 
         switch (model.modelId()) {
         case ModelCommand::Gt100:
@@ -489,6 +490,10 @@
         case ModelCommand::Gt200:
             blocks = 0x100;
             break;
+        case ModelCommand::Gt200e:
+        	blocks = 0x800;
+        	run_UnknownPurgeCommand1_0x1d = true;
+        	break;
         default:
             throw Exception(IgotuControl::tr
                     ("%1: Unable to clear memory of this GPS tracker model. "
@@ -517,10 +522,14 @@
                     .sendAndReceive();
             }
             if (purgeBlocks) {
+            	if (run_UnknownPurgeCommand1_0x1d)
+            		UnknownPurgeCommand1(connection.get(), 0x1d).sendAndReceive();
                 UnknownPurgeCommand1(connection.get(), 0x1e).sendAndReceive();
                 UnknownPurgeCommand1(connection.get(), 0x1f).sendAndReceive();
                 waitForWrite();
             }
+            if (run_UnknownPurgeCommand1_0x1d)
+            	UnknownPurgeCommand1(connection.get(), 0x1d).sendAndReceive();
             UnknownPurgeCommand1(connection.get(), 0x1e).sendAndReceive();
             UnknownPurgeCommand1(connection.get(), 0x1f).sendAndReceive();
             emit commandRunning(blocks, blocks);

=== modified file 'src/lib/igotu/igotupoints.cpp'
--- src/lib/igotu/igotupoints.cpp	2013-05-18 12:54:49 +0000
+++ src/lib/igotu/igotupoints.cpp	2017-03-13 03:20:51 +0000
@@ -145,12 +145,24 @@
         (reinterpret_cast<const uchar*>(record.data()) + 4);
 
     return QDateTime
-        (QDate(2000 + ((date >> 20) & 0xf), (date >> 16) & 0xf,
+        (QDate(year((date >> 20) & 0xf), (date >> 16) & 0xf,
                (date >> 11) & 0x1f),
          QTime((date >> 6) & 0x1f, date & 0x3f, sec / 1000, sec % 1000),
          Qt::UTC);
 }
 
+int IgotuPoint::year(unsigned yearOffset) const
+{
+    const int currentYear = QDate::currentDate().year();
+    const int quotient = (currentYear - 2000) / 16;
+    int year = 2000 + 16 * quotient + yearOffset;
+
+    if (year > currentYear)
+        year -= 16;
+
+    return year;
+}
+
 QString IgotuPoint::dateTimeString(int utcOffset) const
 {
     const QDateTime date = dateTime().addSecs(utcOffset);

=== modified file 'src/lib/igotu/igotupoints.h'
--- src/lib/igotu/igotupoints.h	2013-05-18 12:54:49 +0000
+++ src/lib/igotu/igotupoints.h	2017-03-13 03:20:51 +0000
@@ -45,6 +45,7 @@
     bool isTrackStart() const;
 
     QDateTime dateTime() const;
+    int year(unsigned yearOffset) const;
     // offset in seconds
     QString humanDateTimeString(int utcOffset = 0) const;
     // offset in seconds