aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl-se.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-02-25 17:33:06 +0100
committerMichael Mann <mmann78@netscape.net>2018-02-26 02:24:17 +0000
commit03718fee4dfc3a711532a9ddf9bf250255d2944c (patch)
tree058b03e4b503dc9b18b3c0a408161aacfa5d8306 /epan/dissectors/packet-zbee-zcl-se.c
parent331ffaf3238708fdc28a6fa903c4116210c3ee62 (diff)
zbee zcl se: fix duplicate entry
Field 'Attribute' (zbee_zcl_se.met.attr_id) has a conflicting entry in its value_string: 1045 is at indices 183 (Current Year Max Energy Carrier Demand) and 184 (Current Year Min Energy Carrier Demand)) Change-Id: I6ceb6091d6b37d9467f21037280f9d1251a103ff Reviewed-on: https://code.wireshark.org/review/26098 Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-se.c')
-rw-r--r--epan/dissectors/packet-zbee-zcl-se.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index 525c058fc5..f9aa139fbc 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -3995,7 +3995,7 @@ proto_reg_handoff_zbee_zcl_drlc(void)
XXX(ZBEE_ZCL_ATTR_ID_MET_CURRENT_MONTH_MAX_ENERGY_CARR_DEM, 0x0413, "Current Month Max Energy Carrier Demand" ) \
XXX(ZBEE_ZCL_ATTR_ID_MET_CURRENT_MONTH_MIN_ENERGY_CARR_DEM, 0x0414, "Current Month Min Energy Carrier Demand" ) \
XXX(ZBEE_ZCL_ATTR_ID_MET_CURRENT_YEAR_MAX_ENERGY_CARR_DEM, 0x0415, "Current Year Max Energy Carrier Demand" ) \
- XXX(ZBEE_ZCL_ATTR_ID_MET_CURRENT_YEAR_MIN_ENERGY_CARR_DEM, 0x0415, "Current Year Min Energy Carrier Demand" ) \
+ XXX(ZBEE_ZCL_ATTR_ID_MET_CURRENT_YEAR_MIN_ENERGY_CARR_DEM, 0x0416, "Current Year Min Energy Carrier Demand" ) \
XXX(ZBEE_ZCL_ATTR_ID_MET_PREV_2_DAY_CON_DEL, 0x0420, "Previous Day 2 Consumption Delivered" ) \
XXX(ZBEE_ZCL_ATTR_ID_MET_PREV_2_DAY_CON_RECV, 0x0421, "Previous Day 2 Consumption Received" ) \
XXX(ZBEE_ZCL_ATTR_ID_MET_PREV_3_DAY_CON_DEL, 0x0422, "Previous Day 3 Consumption Delivered" ) \