Change power profile parameters to double

- Because real parameters are floating point

Change-Id: Id49cfa3b5601bad8d26287ac842b85c0d89c56e4
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/config/bm_power_profile_params.json b/config/bm_power_profile_params.json
index 932eae9..2d3a4f5 100644 (file)
--- a/config/bm_power_profile_params.json
+++ b/config/bm_power_profile_params.json
@@ -1,47 +1,47 @@
 {
        "wifi": {
-               "p_wifi_rssi_0": 10,
-               "p_wifi_rssi_1": 20,
-               "p_wifi_rssi_2": 30,
-               "p_wifi_rssi_3": 40,
-               "p_wifi_rssi_4": 50,
-               "p_wifi_scan": 60,
-               "p_wifi_idle": 70,
-               "p_wifi_rx": 80,
-               "p_wifi_tx": 90
+               "p_wifi_rssi_0": 10.12345,
+               "p_wifi_rssi_1": 20.12345,
+               "p_wifi_rssi_2": 30.12345,
+               "p_wifi_rssi_3": 40.12345,
+               "p_wifi_rssi_4": 50.12345,
+               "p_wifi_scan": 60.12345,
+               "p_wifi_idle": 70.12345,
+               "p_wifi_rx": 80.12345,
+               "p_wifi_tx": 90.12345
        },
        "bluetooth": {
-               "p_bt_idle": 10,
-               "p_bt_scan": 12,
-               "p_bt_connected": 13,
-               "p_bt_rx": 14,
-               "p_bt_tx": 15
+               "p_bt_idle": 10.12345,
+               "p_bt_scan": 12.12345,
+               "p_bt_connected": 13.12345,
+               "p_bt_rx": 14.12345,
+               "p_bt_tx": 15.12345
        },
        "device_network": {
-               "p_dnw_sig_strength_0": 20,
-               "p_dnw_sig_strength_1": 21,
-               "p_dnw_sig_strength_2": 22,
-               "p_dnw_sig_strength_3": 23,
-               "p_dnw_sig_strength_4": 24,
-               "p_dnw_sig_strength_5": 25,
-               "p_dnw_sig_strength_6": 26,
-               "p_dnw_rx": 21,
-               "p_dnw_tx": 22
+               "p_dnw_sig_strength_0": 20.12345,
+               "p_dnw_sig_strength_1": 21.12345,
+               "p_dnw_sig_strength_2": 22.12345,
+               "p_dnw_sig_strength_3": 23.12345,
+               "p_dnw_sig_strength_4": 24.12345,
+               "p_dnw_sig_strength_5": 25.12345,
+               "p_dnw_sig_strength_6": 26.12345,
+               "p_dnw_rx": 21.12345,
+               "p_dnw_tx": 22.12345
        },
        "display": {
-               "p_dp_high": 30,
-               "p_dp_medium": 31,
-               "p_dp_low": 32
+               "p_dp_high": 30.12345,
+               "p_dp_medium": 31.12345,
+               "p_dp_low": 32.12345
        },
        "gps_sensor": {
-               "p_gps_inuse": 40
+               "p_gps_inuse": 40.12345
        },
        "hrm_Sensor": {
-               "p_hrm_inuse": 50
+               "p_hrm_inuse": 50.12345
        },
        "cpu": {
-               "p_cpu_user": 60,
-               "p_cpu_system": 61
+               "p_cpu_user": 60.12345,
+               "p_cpu_system": 61.12345
        },
        "battery": {
                "p_battery": 500

diff --git a/include/bm_config_parser.h b/include/bm_config_parser.h
index 99e2281..cfe2ebf 100644 (file)
--- a/include/bm_config_parser.h
+++ b/include/bm_config_parser.h
@@ -28,24 +28,24 @@
 extern "C" {
 #endif
 
-int bm_get_wifi_power_params(int *rssi_l0, int *rssi_l1, int *rssi_l2, int *rssi_l3, int *rssi_l4,
-                                       int *scan, int *idle, int *rx, int *tx);
+int bm_get_wifi_power_params(double *rssi_l0, double *rssi_l1, double *rssi_l2, double *rssi_l3, double *rssi_l4,
+                                       double *scan, double *idle, double *rx, double *tx);
 
-int bm_get_blutooth_power_params(int *idle, int *scan, int *connected, int *rx, int *tx);
+int bm_get_blutooth_power_params(double *idle, double *scan, double *connected, double *rx, double *tx);
 
-int bm_get_device_network_power_params(int *signal_strength0, int *signal_strength1, int *signal_strength2,
-                                               int *signal_strength3, int *signal_strength4, int *signal_strength5,
-                                                       int *signal_strength6, int *rx, int *tx);
+int bm_get_device_network_power_params(double *signal_strength0, double *signal_strength1, double *signal_strength2,
+                                               double *signal_strength3, double *signal_strength4, double *signal_strength5,
+                                                       double *signal_strength6, double *rx, double *tx);
 
-int bm_get_display_power_params(int *high, int *medium, int *low);
+int bm_get_display_power_params(double *high, double *medium, double *low);
 
 #ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN
-int bm_get_gps_sensor_power_params(int *gps_use);
+int bm_get_gps_sensor_power_params(double *gps_use);
 
-int bm_get_hrm_sensor_power_params(int *hrm_use);
+int bm_get_hrm_sensor_power_params(double *hrm_use);
 #endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM_PLUGIN */
 
-int bm_get_cpu_power_params(int *fg, int *bg);
+int bm_get_cpu_power_params(double *fg, double *bg);
 
 int bm_get_battery_power_params(int *battery);
 

diff --git a/src/bm_config_parser.c b/src/bm_config_parser.c
index 0d5112e..62d4b7e 100644 (file)
--- a/src/bm_config_parser.c
+++ b/src/bm_config_parser.c
@@ -64,15 +64,15 @@ END:
        return NULL;
 }
 
-int bm_get_wifi_power_params(int *rssi_l0, int *rssi_l1, int *rssi_l2, int *rssi_l3,
-                                       int *rssi_l4, int *scan, int *idle, int *rx, int *tx)
+int bm_get_wifi_power_params(double *rssi_l0, double *rssi_l1, double *rssi_l2, double *rssi_l3,
+                                       double *rssi_l4, double *scan, double *idle, double *rx, double *tx)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(rssi_l0);
        BM_CHECK_INPUT_PARAM(rssi_l1);
@@ -98,53 +98,53 @@ int bm_get_wifi_power_params(int *rssi_l0, int *rssi_l1, int *rssi_l2, int *rssi
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_wifi_rssi_0", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rssi_0", &jdouble);
+       if (!jdouble)
                goto END;
-       *rssi_l0 = json_object_get_int(jint);
+       *rssi_l0 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_rssi_1", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rssi_1", &jdouble);
+       if (!jdouble)
                goto END;
-       *rssi_l1 = json_object_get_int(jint);
+       *rssi_l1 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_rssi_2", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rssi_2", &jdouble);
+       if (!jdouble)
                goto END;
-       *rssi_l2 = json_object_get_int(jint);
+       *rssi_l2 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_rssi_3", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rssi_3", &jdouble);
+       if (!jdouble)
                goto END;
-       *rssi_l3 = json_object_get_int(jint);
+       *rssi_l3 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_rssi_4", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rssi_4", &jdouble);
+       if (!jdouble)
                goto END;
-       *rssi_l4 = json_object_get_int(jint);
+       *rssi_l4 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_scan", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_scan", &jdouble);
+       if (!jdouble)
                goto END;
-       *scan = json_object_get_int(jint);
+       *scan = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_idle", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_idle", &jdouble);
+       if (!jdouble)
                goto END;
-       *idle = json_object_get_int(jint);
+       *idle = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_rx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_rx", &jdouble);
+       if (!jdouble)
                goto END;
-       *rx = json_object_get_int(jint);
+       *rx = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_wifi_tx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_wifi_tx", &jdouble);
+       if (!jdouble)
                goto END;
-       *tx = json_object_get_int(jint);
+       *tx = json_object_get_double(jdouble);
 
-       _DBG("wifi power params - rssi_0[%d], rssi_1[%d], rssi_2[%d], \
-               rssi_3[%d], rssi_4[%d], scan[%d], idle[%d], rx[%d], tx[%d]", \
+       _DBG("wifi power params - rssi_0[%lf], rssi_1[%lf], rssi_2[%lf], \
+               rssi_3[%lf], rssi_4[%lf], scan[%lf], idle[%lf], rx[%lf], tx[%lf]", \
                *rssi_l0, *rssi_l1, *rssi_l2, *rssi_l3, *rssi_l4, *scan, \
                *idle, *rx, *tx);
 
@@ -158,14 +158,14 @@ END:
        return ret;
 }
 
-int bm_get_blutooth_power_params(int *idle, int *scan, int *connected, int *rx, int *tx)
+int bm_get_blutooth_power_params(double *idle, double *scan, double *connected, double *rx, double *tx)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(idle);
        BM_CHECK_INPUT_PARAM(scan);
@@ -187,33 +187,33 @@ int bm_get_blutooth_power_params(int *idle, int *scan, int *connected, int *rx,
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_bt_idle", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_bt_idle", &jdouble);
+       if (!jdouble)
                goto END;
-       *idle = json_object_get_int(jint);
+       *idle = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_bt_scan", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_bt_scan", &jdouble);
+       if (!jdouble)
                goto END;
-       *scan = json_object_get_int(jint);
+       *scan = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_bt_connected", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_bt_connected", &jdouble);
+       if (!jdouble)
                goto END;
-       *connected = json_object_get_int(jint);
+       *connected = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_bt_rx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_bt_rx", &jdouble);
+       if (!jdouble)
                goto END;
-       *rx = json_object_get_int(jint);
+       *rx = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_bt_tx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_bt_tx", &jdouble);
+       if (!jdouble)
                goto END;
-       *tx = json_object_get_int(jint);
+       *tx = json_object_get_double(jdouble);
 
-       _DBG("bluetooth power params - idle[%d], scan[%d], connected[%d], \
-               rx[%d], tx[%d]", *idle, *scan, *connected, *rx, *tx);
+       _DBG("bluetooth power params - idle[%lf], scan[%lf], connected[%lf], \
+               rx[%lf], tx[%lf]", *idle, *scan, *connected, *rx, *tx);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
 END:
@@ -225,16 +225,16 @@ END:
        return ret;
 }
 
-int bm_get_device_network_power_params(int *signal_strength0, int *signal_strength1, int *signal_strength2,
-                                       int *signal_strength3, int *signal_strength4, int *signal_strength5,
-                                       int *signal_strength6, int *rx, int *tx)
+int bm_get_device_network_power_params(double *signal_strength0, double *signal_strength1, double *signal_strength2,
+                                       double *signal_strength3, double *signal_strength4, double *signal_strength5,
+                                       double *signal_strength6, double *rx, double *tx)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(signal_strength0);
        BM_CHECK_INPUT_PARAM(signal_strength1);
@@ -260,54 +260,54 @@ int bm_get_device_network_power_params(int *signal_strength0, int *signal_streng
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_0", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_0", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength0 = json_object_get_int(jint);
+       *signal_strength0 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_1", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_1", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength1 = json_object_get_int(jint);
+       *signal_strength1 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_2", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_2", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength2 = json_object_get_int(jint);
+       *signal_strength2 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_3", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_3", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength3 = json_object_get_int(jint);
+       *signal_strength3 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_4", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_4", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength4 = json_object_get_int(jint);
+       *signal_strength4 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_5", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_5", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength5 = json_object_get_int(jint);
+       *signal_strength5 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_6", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_sig_strength_6", &jdouble);
+       if (!jdouble)
                goto END;
-       *signal_strength6 = json_object_get_int(jint);
+       *signal_strength6 = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_rx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_rx", &jdouble);
+       if (!jdouble)
                goto END;
-       *rx = json_object_get_int(jint);
+       *rx = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dnw_tx", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dnw_tx", &jdouble);
+       if (!jdouble)
                goto END;
-       *tx = json_object_get_int(jint);
+       *tx = json_object_get_double(jdouble);
 
-       _DBG("device-network power params - signal_strength0[%d], signal_strength1[%d], signal_strength2[%d], \
-               signal_strength3[%d], signal_strength4[%d], signal_strength5[%d], signal_strength6[%d], rx[%d], \
-               tx[%d]", *signal_strength0, *signal_strength1, *signal_strength2, *signal_strength3, \
+       _DBG("device-network power params - signal_strength0[%lf], signal_strength1[%lf], signal_strength2[%lf], \
+               signal_strength3[%lf], signal_strength4[%lf], signal_strength5[%lf], signal_strength6[%lf], rx[%lf], \
+               tx[%lf]", *signal_strength0, *signal_strength1, *signal_strength2, *signal_strength3, \
                *signal_strength4, *signal_strength5, *signal_strength6, *rx, *tx);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
@@ -320,14 +320,14 @@ END:
        return ret;
 }
 
-int bm_get_display_power_params(int *high, int *medium, int *low)
+int bm_get_display_power_params(double *high, double *medium, double *low)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(high);
        BM_CHECK_INPUT_PARAM(medium);
@@ -347,22 +347,22 @@ int bm_get_display_power_params(int *high, int *medium, int *low)
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_dp_high", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dp_high", &jdouble);
+       if (!jdouble)
                goto END;
-       *high = json_object_get_int(jint);
+       *high = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dp_medium", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dp_medium", &jdouble);
+       if (!jdouble)
                goto END;
-       *medium = json_object_get_int(jint);
+       *medium = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_dp_low", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_dp_low", &jdouble);
+       if (!jdouble)
                goto END;
-       *low = json_object_get_int(jint);
+       *low = json_object_get_double(jdouble);
 
-       _DBG("display power params - high[%d], medium[%d], low[%d]",
+       _DBG("display power params - high[%lf], medium[%lf], low[%lf]",
                        *high, *medium, *low);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
@@ -376,14 +376,14 @@ END:
 }
 
 #ifdef DISABLE_FEATURE_DATA_FROM_GPS_HRM
-int bm_get_gps_sensor_power_params(int *gps_use)
+int bm_get_gps_sensor_power_params(double *gps_use)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(gps_use);
 
@@ -401,12 +401,12 @@ int bm_get_gps_sensor_power_params(int *gps_use)
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_gps_inuse", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_gps_inuse", &jdouble);
+       if (!jdouble)
                goto END;
-       *gps_use = json_object_get_int(jint);
+       *gps_use = json_object_get_double(jdouble);
 
-       _DBG("gps-sensor power params - gps[%d]", *gps_use);
+       _DBG("gps-sensor power params - gps[%lf]", *gps_use);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
 END:
@@ -418,14 +418,14 @@ END:
        return ret;
 }
 
-int bm_get_hrm_sensor_power_params(int *hrm_use)
+int bm_get_hrm_sensor_power_params(double *hrm_use)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(hrm_use);
 
@@ -443,12 +443,12 @@ int bm_get_hrm_sensor_power_params(int *hrm_use)
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_hrm_inuse", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_hrm_inuse", &jdouble);
+       if (!jdouble)
                goto END;
-       *hrm_use = json_object_get_int(jint);
+       *hrm_use = json_object_get_double(jdouble);
 
-       _DBG("hrm-sensor power params - gps[%d]", *hrm_use);
+       _DBG("hrm-sensor power params - gps[%lf]", *hrm_use);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
 END:
@@ -461,14 +461,14 @@ END:
 }
 #endif /* DISABLE_FEATURE_DATA_FROM_GPS_HRM */
 
-int bm_get_cpu_power_params(int *user, int *system)
+int bm_get_cpu_power_params(double *user, double *system)
 {
        ENTER;
 
        int ret = BATTERY_MONITOR_ERROR_INTERNAL;
 
        char *contents = NULL;
-       json_object *jmain = NULL, *jint = NULL, *jvalue = NULL;
+       json_object *jmain = NULL, *jdouble = NULL, *jvalue = NULL;
 
        BM_CHECK_INPUT_PARAM(user);
        BM_CHECK_INPUT_PARAM(system);
@@ -487,17 +487,17 @@ int bm_get_cpu_power_params(int *user, int *system)
        if (!jvalue)
                goto END;
 
-       json_object_object_get_ex(jvalue, "p_cpu_user", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_cpu_user", &jdouble);
+       if (!jdouble)
                goto END;
-       *user = json_object_get_int(jint);
+       *user = json_object_get_double(jdouble);
 
-       json_object_object_get_ex(jvalue, "p_cpu_system", &jint);
-       if (!jint)
+       json_object_object_get_ex(jvalue, "p_cpu_system", &jdouble);
+       if (!jdouble)
                goto END;
-       *system = json_object_get_int(jint);
+       *system = json_object_get_double(jdouble);
 
-       _DBG("cpu power params - user[%d], system[%d]", *user, *system);
+       _DBG("cpu power params - user[%lf], system[%lf]", *user, *system);
 
        ret = BATTERY_MONITOR_ERROR_NONE;
 END:

diff --git a/src/bm_power_engine.c b/src/bm_power_engine.c
index f9bdd67..331704e 100644 (file)
--- a/src/bm_power_engine.c
+++ b/src/bm_power_engine.c
@@ -609,13 +609,13 @@ int bm_ble_calc_power_and_commit(bm_bluetooth_st *handle, bool mode)
        }
 
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_bt_idle = 0, sP_power_bt_scan = 0, sP_power_bt_conn = 0, sP_power_bt_tx = 0, sP_power_bt_rx = 0;
+       double sP_power_bt_idle = 0, sP_power_bt_scan = 0, sP_power_bt_conn = 0, sP_power_bt_tx = 0, sP_power_bt_rx = 0;
 
        ret_val = bm_get_blutooth_power_params(&sP_power_bt_idle, &sP_power_bt_scan, &sP_power_bt_conn, &sP_power_bt_rx, &sP_power_bt_tx);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get bt power params");
 
-       _DBG("received bt power params - idle[%d], scan[%d], connected[%d], rx[%d], tx[%d]",
+       _DBG("received bt power params - idle[%lf], scan[%lf], connected[%lf], rx[%lf], tx[%lf]",
                        sP_power_bt_idle, sP_power_bt_scan, sP_power_bt_conn, sP_power_bt_tx, sP_power_bt_rx);
        /* BT power consumption Level - 1 at the Resource Level */
        long int P_power_bt = 0, P_power_data = 0, P_power_conn = 0;
@@ -833,16 +833,16 @@ int bm_wifi_calc_power_and_commit(bm_wifi_st *handle, bool mode)
        }
 
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_wf_idle = 0, sP_power_wf_scan = 0, sP_power_wf_tl0 = 0, sP_power_wf_tl1 = 0, sP_power_wf_tl2 = 0;
-       int sP_power_wf_tl3 = 0, sP_power_wf_tl4 = 0, sP_power_wf_tx = 0, sP_power_wf_rx = 0;
+       double sP_power_wf_idle = 0, sP_power_wf_scan = 0, sP_power_wf_tl0 = 0, sP_power_wf_tl1 = 0, sP_power_wf_tl2 = 0;
+       double sP_power_wf_tl3 = 0, sP_power_wf_tl4 = 0, sP_power_wf_tx = 0, sP_power_wf_rx = 0;
 
        ret_val = bm_get_wifi_power_params(&sP_power_wf_tl0, &sP_power_wf_tl1, &sP_power_wf_tl2, &sP_power_wf_tl3,
                                &sP_power_wf_tl4, &sP_power_wf_scan, &sP_power_wf_idle, &sP_power_wf_rx, &sP_power_wf_tx);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get wifi power params");
 
-       _DBG("received wifi power params - rssi_0[%d], rssi_1[%d], rssi_2[%d], rssi_3[%d], rssi_4[%d], scan[%d], \
-                       idle[%d], rx[%d], tx[%d]", sP_power_wf_tl0, sP_power_wf_tl1, sP_power_wf_tl2, sP_power_wf_tl3,
+       _DBG("received wifi power params - rssi_0[%lf], rssi_1[%lf], rssi_2[%lf], rssi_3[%lf], rssi_4[%lf], scan[%lf], \
+                       idle[%lf], rx[%lf], tx[%lf]", sP_power_wf_tl0, sP_power_wf_tl1, sP_power_wf_tl2, sP_power_wf_tl3,
                        sP_power_wf_tl4, sP_power_wf_scan, sP_power_wf_idle, sP_power_wf_rx, sP_power_wf_tx);
 
        tl0 /= 1000; tl1 /= 1000; tl2 /= 1000; tl3 /= 1000;  tl4 /= 1000;
@@ -1035,13 +1035,13 @@ int bm_cpu_calc_power_and_commit(bm_cpu_st *handle, bool mode)
                }
        }
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_cpu_user = 0, sP_power_cpu_system = 0;
+       double sP_power_cpu_user = 0, sP_power_cpu_system = 0;
 
        ret_val = bm_get_cpu_power_params(&sP_power_cpu_user, &sP_power_cpu_system);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get cpu power params");
 
-       _DBG("received cpu power params - user[%d]\n, system[%d]\n", sP_power_cpu_user, sP_power_cpu_system);
+       _DBG("received cpu power params - user[%lf]\n, system[%lf]\n", sP_power_cpu_user, sP_power_cpu_system);
        /* CPU power consumption Level - 1 at the Resource Level */
        long int P_power_cpu = 0, P_power_user = 0, P_power_system = 0;
        _DBG("%ld %ld %lf", uTime, sTime, onTime);
@@ -1188,13 +1188,13 @@ int bm_display_calc_power_and_commit(bm_display_st *handle, bool mode)
        }
 
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_dp_low = 0, sP_power_dp_med = 0, sP_power_dp_high = 0;
+       double sP_power_dp_low = 0, sP_power_dp_med = 0, sP_power_dp_high = 0;
 
        ret_val = bm_get_display_power_params(&sP_power_dp_high, &sP_power_dp_med, &sP_power_dp_low);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get cpu power params");
 
-       _DBG("received display power params - high[%d], medium[%d], low[%d]", sP_power_dp_high, sP_power_dp_med, sP_power_dp_low);
+       _DBG("received display power params - high[%lf], medium[%lf], low[%lf]", sP_power_dp_high, sP_power_dp_med, sP_power_dp_low);
        /* Display power consumption Level - 1 at the Resource Level */
        lowTime /= 1000; medTime /= 1000; highTime /= 1000; onTime /= 1000;
        long int P_power_disp = 0, P_power_on = 0;
@@ -1350,15 +1350,15 @@ int bm_device_network_calc_power_and_commit(bm_device_network_st *handle, bool m
        }
 
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_dn_tl0 = 0, sP_power_dn_tl1 = 0, sP_power_dn_tl2 = 0, sP_power_dn_tl3 = 0, sP_power_dn_tl4 = 0,
+       double sP_power_dn_tl0 = 0, sP_power_dn_tl1 = 0, sP_power_dn_tl2 = 0, sP_power_dn_tl3 = 0, sP_power_dn_tl4 = 0,
        sP_power_dn_tl5 = 0, sP_power_dn_tl6 = 0, sP_power_dn_tx = 0, sP_power_dn_rx = 0;
 
        ret_val = bm_get_device_network_power_params(&sP_power_dn_tl0, &sP_power_dn_tl1, &sP_power_dn_tl2, &sP_power_dn_tl3,
                        &sP_power_dn_tl4, &sP_power_dn_tl5, &sP_power_dn_tl6, &sP_power_dn_rx, &sP_power_dn_tx);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get cpu power params");
-       _DBG("received device-network power params - signal_0[%d]\n, signal_1[%d]\n, signal_2[%d]\n, \
-                       signal_3[%d]\n, signal_4[%d]\n, signal_5[%d]\n, signal_6[%d]\n, rx[%d]\n, tx[%d]\n",
+       _DBG("received device-network power params - signal_0[%lf]\n, signal_1[%lf]\n, signal_2[%lf]\n, \
+                       signal_3[%lf]\n, signal_4[%lf]\n, signal_5[%lf]\n, signal_6[%lf]\n, rx[%lf]\n, tx[%lf]\n",
                        sP_power_dn_tl0, sP_power_dn_tl1, sP_power_dn_tl2, sP_power_dn_tl3, sP_power_dn_tl4, sP_power_dn_tl5,
                        sP_power_dn_tl6, sP_power_dn_rx, sP_power_dn_tx);
 
@@ -1513,13 +1513,13 @@ int bm_gps_calc_power_and_commit(bm_gps_st *handle)
        }
 
        /* Read standard Rated Values from Device Spec File/Power Profile File */
-       int sP_power_gps_conn = 0;
+       double sP_power_gps_conn = 0;
 
        ret_val = bm_get_gps_sensor_power_params(&sP_power_gps_conn);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get gps-sensor power params");
 
-       _DBG("gps-sensor power params - gps[%d]", sP_power_gps_conn);
+       _DBG("gps-sensor power params - gps[%lf]", sP_power_gps_conn);
        /* GPS power consumption Level - 1 at the Resource Level */
        int P_power_gps = 0, P_power_conn = 0;
        P_power_conn = ((sP_power_gps_conn * sesTime));
@@ -1651,14 +1651,14 @@ int bm_hrm_calc_power_and_commit(bm_hrm_sensor_st *handle)
                }
        }
 
-       int sP_power_hrm_conn = 0;
+       double sP_power_hrm_conn = 0;
 
        /* read hrm-sensor power params */
        ret_val = bm_get_hrm_sensor_power_params(&sP_power_hrm_conn);
        if (ret_val != BATTERY_MONITOR_ERROR_NONE)
                _ERR("failed to get hrm-sensor power params");
 
-       _DBG("hrm-sensor power params - gps[%d]", sP_power_hrm_conn);
+       _DBG("hrm-sensor power params - gps[%lf]", sP_power_hrm_conn);
 
        /* apply power calculation on the hash-map data*/