Compare commits

...

3 Commits

Author SHA1 Message Date
Simo Piiroinen
4156ad426d Bump mce-dev version to 1.28.0 2019-10-08 13:01:09 +03:00
spiiroin
4990e6331c Merge branch 'jb44852_battery_state' into 'master'
Add charger state D-Bus constants

See merge request mer-core/mce-dev!12
2019-10-08 09:58:46 +00:00
Simo Piiroinen
b1bad1c065 [mce] Add charger state D-Bus constants. JB#44852
Constants related to exposing charger state on D-Bus.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
2019-10-07 12:57:10 +03:00
5 changed files with 85 additions and 2 deletions

6
debian/changelog vendored
View File

@@ -1,3 +1,9 @@
mce-dev (1.28.0) unstable; urgency=low
* [mce] Add charger state D-Bus constants. JB#44852
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 08 Oct 2019 12:59:35 +0300
mce-dev (1.27.0) unstable; urgency=low
* [mce] Add charger type D-Bus constants. JB#38667

View File

@@ -847,6 +847,32 @@
*/
# define MCE_BATTERY_STATUS_SIG "battery_status_ind"
/** Query current battery state
*
* @since mce 1.104.0
*
* @return string: current battery state, one of:
* - #MCE_BATTERY_STATE_UNKNOWN
* - #MCE_BATTERY_STATE_CHARGING
* - #MCE_BATTERY_STATE_DISCHARGING
* - #MCE_BATTERY_STATE_NOT_CHARGING
* - #MCE_BATTERY_STATE_FULL
*/
#define MCE_BATTERY_STATE_GET "get_battery_state"
/** Signal that indicates that battery state has changed
*
* @since mce 1.104.0
*
* @param battery_state string: current battery state, one of:
* - #MCE_BATTERY_STATE_UNKNOWN
* - #MCE_BATTERY_STATE_CHARGING
* - #MCE_BATTERY_STATE_DISCHARGING
* - #MCE_BATTERY_STATE_NOT_CHARGING
* - #MCE_BATTERY_STATE_FULL
*/
#define MCE_BATTERY_STATE_SIG "battery_state_ind"
/** Query current battery level
*
* @since mce 1.86.0

View File

@@ -485,6 +485,8 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Battery Status Constants
*
* These values match legacy maemo (bme) battery status values.
*
*@{
*/
@@ -521,6 +523,55 @@
/*@}*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Battery State Constants
*
* These values match linux power supply device status values.
*
*@{
*/
/** Battery state is not known
*
* @since mce 1.104.0
*/
# define MCE_BATTERY_STATE_UNKNOWN "unknown"
/** Battery is currently discharging
*
* Charger is disconnected, battery is discharging.
*
* @since mce 1.104.0
*/
# define MCE_BATTERY_STATE_DISCHARGING "discharging"
/** Battery is currently charging
*
* Charger is connected, battery is charging.
*
* @since mce 1.104.0
*/
# define MCE_BATTERY_STATE_CHARGING "charging"
/** Battery is not getting charged
*
* Charger is connected, battery is not getting charged.
*
* @since mce 1.104.0
*/
# define MCE_BATTERY_STATE_NOT_CHARGING "not_charging"
/** Battery is fully charged
*
* Charger is connected, battery is full.
*
* @since mce 1.104.0
*/
# define MCE_BATTERY_STATE_FULL "full"
/*@}*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Battery Level Constants

2
mce.pc
View File

@@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: mce
Description: Mode Control Entity
Version: 1.27.0
Version: 1.28.0
Requires:
Libs:
Cflags: -I${includedir}

View File

@@ -1,6 +1,6 @@
Name: mce-headers
Summary: Development files for mce
Version: 1.27.0
Version: 1.28.0
Release: 1
Group: Development/Libraries
License: LGPLv2