Added full driver elf2.

drivers/src/elf2.xmq

@@ -2,7 +2,7 @@
 driver {
     name           = elf2
     meter_type     = HeatMeter
-    default_fields = name,id,status,total_kwh,target_kwh,timestamp
+    default_fields = name,id,status,total_energy_kwh,timestamp
     detect {
         mvt = APA,42,04
     }
@@ -10,7 +10,62 @@ driver {
     use = on_time_h
     use = on_time_at_error_h
     field {
-        name     = total
+        name         = meter
+        quantity     = PointInTime
+        info         = 'Meter date when telegram was sent.'
+        display_unit = date
+        match {
+            measurement_type = Instantaneous
+            vif_range        = Date
+        }
+    }
+    field {
+        name     = t2_temperature
+        quantity = Temperature
+        info     = 'Temperature of returned water.'
+        match {
+            measurement_type = Instantaneous
+            vif_range        = ReturnTemperature
+        }
+    }
+    field {
+        name     = t1_temperature
+        quantity = Temperature
+        info     = 'Temperature of incoming water.'
+        match {
+            measurement_type = Instantaneous
+            vif_range        = FlowTemperature
+        }
+    }
+    field {
+        name     = current_power
+        quantity = Power
+        info     = 'Instantaneous power consumed.'
+        match {
+            measurement_type = Instantaneous
+            vif_range        = AnyPowerVIF
+        }
+    }
+    field {
+        name     = current_volume_flow
+        quantity = Flow
+        info     = 'Instantaneous water flow.'
+        match {
+            measurement_type = Instantaneous
+            vif_range        = VolumeFlow
+        }
+    }
+    field {
+        name     = total_volume
+        quantity = Volume
+        info     = 'Total volume of water used.'
+        match {
+            measurement_type = Instantaneous
+            vif_range        = AnyVolumeVIF
+        }
+    }
+    field {
+        name     = total_energy
         quantity = Energy
         info     = 'The total heat energy consumption recorded by this meter.'
         match {
@@ -132,7 +187,12 @@ driver {
                 value = 0x8000
                 test  = Set
             }
-
         }
     }
+    test {
+        args     = 'Heato elf2 23170428 NOKEY'
+        telegram = 684E4E68080172280417230106420455000000_0C7828041723026C103902FD1700000E0A6342693401000C13634630000A3B00000A2D00000A5A49020A5E44020C22762101003C2215000000047E17090000_4116
+        json     = '{"current_power_kw": 0,"current_volume_flow_m3h": 0,"fabrication_no": "23170428","id": "23170428","media": "heat","meter": "elf2","meter_date": "2024-09-16","name": "Heato","on_time_at_error_h": 15,"on_time_h": 12176,"status": "OK","t1_temperature_c": 24.9,"t2_temperature_c": 24.4,"timestamp": "1111-11-11T11:11:11Z","total_energy_kwh": 3741.507306,"total_volume_m3": 304.663}'
+        fields   = 'Heato;23170428;OK;3741.507306;1111-11-11 11:11.11'
+    }
 }

tests/generated_tests.xmq

@@ -1,10 +1,16 @@
-// Generated 2024-08-23_08:50
+// Generated 2024-09-16_10:02
 test {
     args     = 'AqWater aquastream 05933237 NOKEY'
     telegram = 4644B42557920410050E7237329305B42501075B0030252F2F_04130342000084101300000000046D0D30F62B441349180000426CFF2A02FD17000002FD74DB152F2F2F2F2F2F2F
     json     = '{"id": "05933237","media": "water","meter": "aquastream","meter_datetime": "2023-11-22 16:13","name": "AqWater","status": "OK","target_date": "2023-10-31","target_m3": 6.217,"timestamp": "1111-11-11T11:11:11Z","total_m3": 16.899,"total_tariff1_m3": 0,"battery_y": 15.328767}'
     fields   = 'AqWater;05933237;16.899;1111-11-11 11:11.11'
 }
+test {
+    args     = 'Heato elf2 23170428 NOKEY'
+    telegram = 684E4E68080172280417230106420455000000_0C7828041723026C103902FD1700000E0A6342693401000C13634630000A3B00000A2D00000A5A49020A5E44020C22762101003C2215000000047E17090000_4116
+    json     = '{"current_power_kw": 0,"current_volume_flow_m3h": 0,"fabrication_no": "23170428","id": "23170428","media": "heat","meter": "elf2","meter_date": "2024-09-16","name": "Heato","on_time_at_error_h": 15,"on_time_h": 12176,"status": "OK","t1_temperature_c": 24.9,"t2_temperature_c": 24.4,"timestamp": "1111-11-11T11:11:11Z","total_energy_kwh": 3741.507306,"total_volume_m3": 304.663}'
+    fields   = 'Heato;23170428;OK;3741.507306;1111-11-11 11:11.11'
+}
 test {
     args     = 'Gas elster 05105025 NOKEY'
     telegram = 3644A511640010253837722550100593158103E70020052F2F_0374E602000C137034220302FD74EE0F2F2F2F2F2F2F2F2F2F2F2F2F2F2F