battery: change macros to configurable values

- Hard coded macros are changed to the configurable values.
  The values are defined in battery.conf

- Initial battery capacity is set to -1 to avoid
  real power off situation.

Change-Id: I54664266c45a3f5286eba82f617198c5a92dedd5
Signed-off-by: taeyoung <ty317.kim@samsung.com>

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index cad1bf7..572c8d0 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -398,13 +398,13 @@ static void battery_level_send_system_event(int bat_percent)
        const char *str;
        static const char *prev;
 
-       if (bat_percent > BATTERY_LEVEL_CHECK_FULL)
+       if (bat_percent > battery_info.normal)
                str = EVT_VAL_BATTERY_LEVEL_FULL;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_HIGH)
+       else if (bat_percent > battery_info.warning)
                str = EVT_VAL_BATTERY_LEVEL_HIGH;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_LOW)
+       else if (bat_percent > battery_info.critical)
                str = EVT_VAL_BATTERY_LEVEL_LOW;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_CRITICAL)
+       else if (bat_percent > battery_info.poweroff)
                str = EVT_VAL_BATTERY_LEVEL_CRITICAL;
        else
                str = EVT_VAL_BATTERY_LEVEL_EMPTY;
@@ -434,13 +434,13 @@ static void change_lowbat_level(int bat_percent)
                return;
        }
 
-       if (bat_percent > BATTERY_LEVEL_CHECK_FULL)
+       if (bat_percent > battery_info.normal)
                now = VCONFKEY_SYSMAN_BAT_LEVEL_FULL;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_HIGH)
+       else if (bat_percent > battery_info.warning)
                now = VCONFKEY_SYSMAN_BAT_LEVEL_HIGH;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_LOW)
+       else if (bat_percent > battery_info.critical)
                now = VCONFKEY_SYSMAN_BAT_LEVEL_LOW;
-       else if (bat_percent > BATTERY_LEVEL_CHECK_CRITICAL)
+       else if (bat_percent > battery_info.poweroff)
                now = VCONFKEY_SYSMAN_BAT_LEVEL_CRITICAL;
        else
                now = VCONFKEY_SYSMAN_BAT_LEVEL_EMPTY;

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index bd98f9a..dcd632f 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -1238,6 +1238,8 @@ static void power_supply_init(void *data)
 {
        int ret;
 
+       battery.capacity = -1;
+
        if (battery_dev) {
                if (battery_dev->register_changed_event)
                        battery_dev->register_changed_event(battery_changed, NULL);