diff options
| author | Julien STAUB <atsju2@yahoo.fr> | 2015-04-08 18:57:22 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-04-09 02:24:20 +0000 |
| commit | 327ec9cb3b5d107da0ac9173a9f55f21175735b5 (patch) | |
| tree | c04de010c277f5b0121ee0d712dfced0d9c57b3a /epan/dissectors/packet-zbee-zcl-meas-sensing.c | |
| parent | e243b0041328980a9bbd43bb8a8166d7422f9096 (diff) | |
zigbee: correct zcl meas sensing
corrected the relative humidity measurement 0.00 to 100.00 values.
Previous version had bug for example 0.01% -> display 0.1%
Change-Id: I3955d36d1f2a1334ef7baab4fd854f13950d1951
Reviewed-on: https://code.wireshark.org/review/7983
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-meas-sensing.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-meas-sensing.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 044de17411..22b991c730 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -533,7 +533,7 @@ decode_temp_meas_value(gchar *s, gint16 value) if (value == (gint16)ZBEE_ZCL_ATTR_ID_TEMP_MEAS_INVALID_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Invalid value"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [\302\260C]", value/100, value%100); + g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f [\302\260C]", value/100.0); return; } /*decode_temp_meas_value*/ @@ -557,7 +557,7 @@ decode_temp_meas_min_value(gchar *s, gint16 value) (value > (gint16)ZBEE_ZCL_ATTR_ID_TEMP_MEAS_MIN_HI_VALUE) ) g_snprintf(s, ITEM_LABEL_LENGTH, "Out of range"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [\302\260C]", value/100, value%100); + g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f [\302\260C]", value/100.0); return; } /*decode_temp_meas_min_value*/ @@ -580,7 +580,7 @@ decode_temp_meas_max_value(gchar *s, gint16 value) if (value < (gint16)ZBEE_ZCL_ATTR_ID_TEMP_MEAS_MAX_LO_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Out of range"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [\302\260C]", value/100, value%100); + g_snprintf(s, ITEM_LABEL_LENGTH, "%.2f [\302\260C]", value/100.0); return; } /*decode_temp_meas_max_value*/ @@ -1214,7 +1214,7 @@ decode_relhum_meas_value(gchar *s, guint16 value) if (value == ZBEE_ZCL_ATTR_ID_RELHUM_MEAS_INVALID_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Invalid value"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [%c]", value/100, value%100, '%'); + g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%02d [%%]", value/100, value%100); return; } /*decode_relhum_meas_value*/ @@ -1237,7 +1237,7 @@ decode_relhum_meas_min_value(gchar *s, guint16 value) if (value > ZBEE_ZCL_ATTR_ID_RELHUM_MEAS_MIN_HI_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Out of range"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [%c]", value/100, value%100, '%'); + g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%02d [%%]", value/100, value%100); return; } /*decode_relhum_meas_min_value*/ @@ -1260,7 +1260,7 @@ decode_relhum_meas_max_value(gchar *s, guint16 value) if (value > ZBEE_ZCL_ATTR_ID_RELHUM_MEAS_MAX_HI_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Out of range"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [%c]", value/100, value%100, '%'); + g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%02d [%%]", value/100, value%100); return; } /*decode_relhum_meas_max_value*/ @@ -1283,7 +1283,7 @@ decode_relhum_meas_tolerance(gchar *s, guint16 value) if (value > ZBEE_ZCL_ATTR_ID_RELHUM_MEAS_TOL_HI_VALUE) g_snprintf(s, ITEM_LABEL_LENGTH, "Out of range"); else - g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%d [%c]", value/100, value%100, '%'); + g_snprintf(s, ITEM_LABEL_LENGTH, "%d.%02d [%%]", value/100, value%100); return; } /*decode_relhum_meas_tolerance*/ |