From 688f0d3bc0aff300842869fb79487acaebf75bda Mon Sep 17 00:00:00 2001
From: Stefan Wahren <info@lategoodbye.de>
Date: Sun, 21 Oct 2012 23:24:04 +0200
Subject: [PATCH] Added product name mapping for Elvaco meters

---
 mbus/mbus-protocol.c | 30 ++++++++++++++++++++++++++++++
 mbus/mbus-protocol.h |  1 +
 2 files changed, 31 insertions(+)

diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
index 3c94b16..1876444 100755
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@@ -817,6 +817,36 @@ mbus_data_product_name(mbus_data_variable_header *header)
                     break;
             }
         }
+        else if (manufacturer == MBUS_VARIABLE_DATA_MAN_ELV)
+        {
+            switch (header->version)
+            {
+                case 0x14:
+                case 0x15:
+                case 0x16:
+                case 0x17:
+                case 0x18:
+                case 0x19:
+                case 0x1A:
+                case 0x1B:
+                case 0x1C:
+                case 0x1D:
+                    strcpy(buff, "Elvaco CMa10");
+                    break;
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                    strcpy(buff,"Elvaco CMa11");
+                    break;
+            }
+        }
         else if (manufacturer == MBUS_VARIABLE_DATA_MAN_SLB) 
         {
             switch (header->version)
diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h
index c1473a3..f23d72c 100755
--- a/mbus/mbus-protocol.h
+++ b/mbus/mbus-protocol.h
@@ -476,6 +476,7 @@ typedef struct _mbus_data_secondary_address {
 #define MBUS_VARIABLE_DATA_MAN_AMT              0x05B4
 #define MBUS_VARIABLE_DATA_MAN_EFE              0x14C5
 #define MBUS_VARIABLE_DATA_MAN_ELS              0x1593
+#define MBUS_VARIABLE_DATA_MAN_ELV              0x1596
 #define MBUS_VARIABLE_DATA_MAN_EMH              0x15A8
 #define MBUS_VARIABLE_DATA_MAN_HYD              0x2324
 #define MBUS_VARIABLE_DATA_MAN_KAM              0x2C2D