Compare commits

...

10 Commits

Author SHA1 Message Date
Simo Piiroinen
64c420aa28 Bump mce-dev version to 1.27.0 2019-08-26 09:38:03 +03:00
spiiroin
74b1d5e065 Merge branch 'jb38667_charger_type' into 'master'
Add charger type D-Bus constants

See merge request mer-core/mce-dev!11
2019-08-26 06:36:09 +00:00
Simo Piiroinen
5ee3ef6125 [mce] Add charger type D-Bus constants. JB#38667
Constants related to exposing charger type on D-Bus.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
2019-08-23 14:29:37 +03:00
Simo Piiroinen
03a4de12e5 Bump mce-dev version to 1.26.1 2019-06-25 10:13:10 +03:00
pvuorela
26c6abec6a Merge branch 'jb33684' into 'master'
[mce-dev] fix license and website. Contributes to JB#33684

See merge request mer-core/mce-dev!10
2019-06-24 14:17:25 +00:00
MikeSalmela
3a043c11ce [mce-dev] fix url. Contributes to JB#33684 2019-06-17 09:45:46 +03:00
spiiroin
5cbcf356be Merge branch 'jb42094_button_backlight_override' into 'master'
Add D-Bus constants for button backlight mode

See merge request mer-core/mce-dev!9
2018-11-21 06:28:57 +00:00
Simo Piiroinen
7ff2bfbe8c Bump mce-dev version to 1.26.0 2018-11-20 12:43:47 +02:00
Simo Piiroinen
2fea21d391 [mce] Add missing Doxygen group name tag
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
2018-11-20 12:40:55 +02:00
Simo Piiroinen
41bbc89b27 [mce] Add D-Bus constants for button backlight mode. JB#42094
Available in mce >= 1.98.0

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
2018-11-20 12:40:16 +02:00
5 changed files with 150 additions and 6 deletions

19
debian/changelog vendored
View File

@@ -1,3 +1,22 @@
mce-dev (1.27.0) unstable; urgency=low
* [mce] Add charger type D-Bus constants. JB#38667
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Mon, 26 Aug 2019 09:36:42 +0300
mce-dev (1.26.1) unstable; urgency=low
* [mce-dev] fix url. Contributes to JB#33684
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 25 Jun 2019 10:11:01 +0300
mce-dev (1.26.0) unstable; urgency=low
* [mce] Add D-Bus constants for button backlight mode. JB#42094
* [mce] Add missing Doxygen group name tag
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 20 Nov 2018 12:42:26 +0200
mce-dev (1.25.0) unstable; urgency=low
* [mce] Add blanking pause related D-Bus constants. JB#41340

View File

@@ -5,7 +5,8 @@
* This file is part of mce-dev
* <p>
* Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
* Copyright (C) 2013-2017 Jolla Ltd.
* Copyright (C) 2013-2019 Jolla Ltd.
* Copyright (c) 2019 Open Mobile Platform LLC.
* <p>
* @author David Weinehall <david.weinehall@nokia.com>
* @author Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
@@ -862,6 +863,36 @@
*/
# define MCE_BATTERY_LEVEL_SIG "battery_level_ind"
/** Query current charger type
*
* @since mce 1.102.0
*
* @return string: current charger type, one of:
* - #MCE_CHARGER_TYPE_NONE
* - #MCE_CHARGER_TYPE_USB
* - #MCE_CHARGER_TYPE_DCP
* - #MCE_CHARGER_TYPE_HVDCP
* - #MCE_CHARGER_TYPE_CDP
* - #MCE_CHARGER_TYPE_WIRELESS
* - #MCE_CHARGER_TYPE_OTHER
*/
# define MCE_CHARGER_TYPE_GET "get_charger_type"
/** Signal that indicates that charger type has changed
*
* @since mce 1.102.0
*
* @param charger_type string: current charger type, one of:
* - #MCE_CHARGER_TYPE_NONE
* - #MCE_CHARGER_TYPE_USB
* - #MCE_CHARGER_TYPE_DCP
* - #MCE_CHARGER_TYPE_HVDCP
* - #MCE_CHARGER_TYPE_CDP
* - #MCE_CHARGER_TYPE_WIRELESS
* - #MCE_CHARGER_TYPE_OTHER
*/
# define MCE_CHARGER_TYPE_SIG "charger_type_ind"
/*@}*/
/////////////////////////////////////////////////////////////////////////////
@@ -1031,6 +1062,21 @@
*/
# define MCE_BUTTON_BACKLIGHT_CHANGE_REQ "req_button_backlight_change"
/** Request button backlight mode change
*
* @since mce 1.98.0
*
* For use from the CSD application button backlight verification test.
*
* Allows bypassing of the button backlight policy and explicitly turn
* the backlight on or off.
*
* @param mode int32: #MCE_BUTTON_BACKLIGHT_MODE_OFF,
* #MCE_BUTTON_BACKLIGHT_MODE_ON, or
* #MCE_BUTTON_BACKLIGHT_MODE_POLICY
*/
# define MCE_BUTTON_BACKLIGHT_MODE_REQ "req_button_backlight_mode"
/** Indication for change of button backlight state
*
* @since mce 1.90.0

View File

@@ -5,7 +5,8 @@
* This file is part of mce-dev
* <p>
* Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
* Copyright (C) 2012-2017 Jolla Ltd.
* Copyright (C) 2012-2019 Jolla Ltd.
* Copyright (c) 2019 Open Mobile Platform LLC.
* <p>
* @author David Weinehall <david.weinehall@nokia.com>
* @author Tapio Rantala <ext-tapio.rantala@nokia.com>
@@ -430,6 +431,57 @@
/*@}*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Charger Type Constants
*
*@{
*/
/** No charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_NONE "none"
/** Standard down port (pc/hub) charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_USB "usb"
/** Dedicated charging port (wall) charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_DCP "dcp"
/** High voltage DCP charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_HVDCP "hvdcp"
/** Charging Downstream Port charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_CDP "cdp"
/** Wireless charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_WIRELESS "wireless"
/** Other kind of charger is active
*
* @since mce 1.102.0
*/
# define MCE_CHARGER_TYPE_OTHER "other"
/*@}*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Battery Status Constants
@@ -703,7 +755,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** TKLock status replies from SystemUI
/** @name TKLock status replies from SystemUI
*
*@{
*/
@@ -736,4 +788,31 @@
/*@}*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/** @name Button backlight operation modes
*
*@{
*/
/** Button backlight should be turned off
*
* @since mce 1.98.0
*/
#define MCE_BUTTON_BACKLIGHT_MODE_OFF 0
/** Button backlight should be turned on
*
* @since mce 1.98.0
*/
#define MCE_BUTTON_BACKLIGHT_MODE_ON 1
/** Button backlight should be turned on/off according to policy
*
* @since mce 1.98.0
*/
#define MCE_BUTTON_BACKLIGHT_MODE_POLICY 2
/*@}*/
#endif /* MCE_MODE_NAMES_H_ */

2
mce.pc
View File

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

View File

@@ -1,10 +1,10 @@
Name: mce-headers
Summary: Development files for mce
Version: 1.25.0
Version: 1.27.0
Release: 1
Group: Development/Libraries
License: LGPLv2
URL: https://github.com/nemomobile/mce-dev
URL: https://git.sailfishos.org/mer-core/mce-dev
Source0: %{name}-%{version}.tar.bz2
BuildRequires: doxygen