From 316ec12fefea01eda8ebe066535e22c9652a9afc Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Sat, 3 Nov 2007 20:00:14 +0000
Subject: [PATCH] Added a test to dump the entire memory of the dive computer.

---
 suunto_test.c | 103 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 86 insertions(+), 17 deletions(-)

diff --git a/suunto_test.c b/suunto_test.c
index d6addb7..70e8fbd 100644
--- a/suunto_test.c
+++ b/suunto_test.c
@@ -3,20 +3,10 @@
 #include "suunto.h"
 #include "serial.h"
 
-int main(int argc, char *argv[])
+
+int test_dump_sdm16 (const char* name, const char* filename)
 {
 	unsigned char data[SUUNTO_VYPER_MEMORY_SIZE] = {0};
-
-#ifdef _WIN32
-	const char* name = "COM1";
-#else
-	const char* name = "/dev/ttyS0";
-#endif
-
-	if (argc > 1) {
-		name = argv[1];
-	}
-
 	vyper *device = NULL;
 
 	printf ("suunto_vyper_open\n");
@@ -35,25 +25,25 @@ int main(int argc, char *argv[])
 	}
 
 	printf ("suunto_vyper_read_memory\n");
-	rc = suunto_vyper_read_memory (device, 0x24, data, 1);
+	rc = suunto_vyper_read_memory (device, 0x24, data + 0x24, 1);
 	if (rc != 0) {
 		fprintf (stderr, "%s:%d: Cannot identify computer.\n",__FILE__,__LINE__);
 		suunto_vyper_close (device);
 		return 1;
 	}
-	rc = suunto_vyper_read_memory (device, 0x1E, data, 14);
+	rc = suunto_vyper_read_memory (device, 0x1E, data + 0x1E, 14);
 	if (rc != 0) {
 		fprintf (stderr, "Cannot read memory.\n");
 		suunto_vyper_close (device);
 		return 1;
 	}
-	rc = suunto_vyper_read_memory (device, 0x2C, data, 32);
+	rc = suunto_vyper_read_memory (device, 0x2C, data + 0x2C, 32);
 	if (rc != 0) {
 		fprintf (stderr, "Cannot read memory.\n");
 		suunto_vyper_close (device);
 		return 1;
 	}
-	rc = suunto_vyper_read_memory (device, 0x53, data, 30);
+	rc = suunto_vyper_read_memory (device, 0x53, data + 0x53, 30);
 	if (rc != 0) {
 		fprintf (stderr, "Cannot read memory.\n");
 		suunto_vyper_close (device);
@@ -62,17 +52,27 @@ int main(int argc, char *argv[])
 
 	printf ("suunto_vyper_read_dive\n");
 	int ndives = 0;
+	int offset = 0x71;
 	do {
 		fprintf (stderr, "Reading dive #%d.\n", ndives + 1);
-		rc = suunto_vyper_read_dive (device, data, sizeof (data), (ndives == 0));
+		rc = suunto_vyper_read_dive (device, data + offset, sizeof (data) - offset, (ndives == 0));
 		if (rc == -1) {
 			fprintf (stderr, "Cannot read dive.\n");
 			suunto_vyper_close (device);
 			return 1;
 		}
+		fprintf (stderr, "Returned %i bytes at offset 0x%04x.\n", rc, offset);
 		ndives++;
+		offset += rc;
 	} while (rc > 0);
 
+	printf ("Dumping data\n");
+	FILE *fp = fopen (filename, "w");
+	if (fp != NULL) {
+		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fclose (fp);
+	}
+
 	printf ("suunto_vyper_close\n");
 	rc = suunto_vyper_close (device);
 	if (rc != 0) {
@@ -82,3 +82,72 @@ int main(int argc, char *argv[])
 
 	return 0;
 }
+
+int test_dump_memory (const char* name, const char* filename)
+{
+	unsigned char data[SUUNTO_VYPER_MEMORY_SIZE] = {0};
+	vyper *device = NULL;
+
+	printf ("suunto_vyper_open\n");
+	int rc = suunto_vyper_open (&device, name);
+	if (rc != 0) {
+		fprintf (stderr, "%s:%d: Error opening serial port.\n",__FILE__,__LINE__);
+		return 1;
+	}
+
+	printf ("suunto_vyper_detect_interface\n");
+	rc = suunto_vyper_detect_interface (device);
+	if (rc != 0) {
+		fprintf (stderr, "%s:%d: Interface not found.\n",__FILE__,__LINE__);
+		suunto_vyper_close (device);
+		return 1;
+	}
+
+	printf ("suunto_vyper_read_memory\n");
+	rc = suunto_vyper_read_memory (device, 0x00, data, sizeof (data));
+	if (rc != 0) {
+		fprintf (stderr, "Cannot read memory.\n");
+		suunto_vyper_close (device);
+		return 1;
+	}
+
+	printf ("Dumping data\n");
+	FILE* fp = fopen (filename, "w");
+	if (fp != NULL) {
+		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fclose (fp);
+	}
+
+	printf ("suunto_vyper_close\n");
+	rc = suunto_vyper_close (device);
+	if (rc != 0) {
+		fprintf (stderr, "Cannot close device.");
+		return 1;
+	}
+
+	return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+#ifdef _WIN32
+	const char* name = "COM1";
+#else
+	const char* name = "/dev/ttyS0";
+#endif
+
+	if (argc > 1) {
+		name = argv[1];
+	}
+
+	int a = test_dump_sdm16 (name, "PROFILE.VPR");
+	int b = test_dump_memory (name, "PROFILE.DMP");
+	
+	printf ("\nSUMMARY\n");
+	printf ("-------\n");
+	printf ("test_dump_sdm16:  %s\n", a == 0 ? "SUCCESS" : "FAILED");
+	printf ("test_dump_memory: %s\n", b == 0 ? "SUCCESS" : "FAILED");
+
+	return 0;
+}