> @Linus: patch attached. Sorry about that.
Forgot to commit one file...
Berthold
>From 27562a715bdd4955f665d376d2103efc2e236142 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoe...@mail.tuwien.ac.at>
Date: Wed, 1 Nov 2017 10:16:51 +0100
Subject: [PATCH] Fix model number of the Scubapro Aladin Sport Matrix.
The model number was wrong. Mea culpa.
Signed-off-by: Berthold Stoeger <bstoe...@mail.tuwien.ac.at>
---
src/descriptor.c | 2 +-
src/scubapro_g2.c | 2 +-
src/uwatec_smart_parser.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/descriptor.c b/src/descriptor.c
index b1b6dd1..0df6ca0 100644
--- a/src/descriptor.c
+++ b/src/descriptor.c
@@ -140,7 +140,7 @@ static const dc_descriptor_t g_descriptors[] = {
/* Scubapro G2 */
#ifdef USBHID
{"Scubapro", "G2", DC_FAMILY_UWATEC_G2, 0x32}, // BLE
- {"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0xa5}, // BLE
+ {"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0x17}, // BLE
#endif
/* Reefnet */
{"Reefnet", "Sensus", DC_FAMILY_REEFNET_SENSUS, 1},
diff --git a/src/scubapro_g2.c b/src/scubapro_g2.c
index dc1d221..04a83a2 100644
--- a/src/scubapro_g2.c
+++ b/src/scubapro_g2.c
@@ -35,7 +35,7 @@
#define RX_PACKET_SIZE 64
#define TX_PACKET_SIZE 32
-#define ALADINSPORTMATRIX 0xa5
+#define ALADINSPORTMATRIX 0x17
typedef struct scubapro_g2_device_t {
dc_device_t base;
diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c
index 95a28fa..e0726e4 100644
--- a/src/uwatec_smart_parser.c
+++ b/src/uwatec_smart_parser.c
@@ -41,6 +41,7 @@
#define ALADINTEC2G 0x13
#define SMARTCOM 0x14
#define ALADIN2G 0x15
+#define ALADINSPORTMATRIX 0x17
#define SMARTTEC 0x18
#define GALILEOTRIMIX 0x19
#define SMARTZ 0x1C
@@ -48,7 +49,6 @@
#define CHROMIS 0x24
#define MANTIS2 0x26
#define G2 0x32
-#define ALADINSPORTMATRIX 0xa5
#define UNSUPPORTED 0xFFFFFFFF
--
2.14.1
_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
