Merge branch 'jb42094_button_backlight_override' into 'master'

Add D-Bus constants for button backlight mode See merge request mer-core/mce-dev!9
Bump mce-dev version to 1.26.0
2018-11-21 06:28:57 +00:00 · 2018-11-20 12:43:47 +02:00 · 2018-11-20 12:40:55 +02:00 · 2018-11-20 12:40:16 +02:00 · 2018-03-20 10:09:03 +02:00 · 2018-03-20 08:06:50 +00:00
8 changed files with 2127 additions and 679 deletions
--- a/46
+++ b/46
@@ -272,22 +272,6 @@ SUBGROUPING            = YES

 TYPEDEF_HIDES_STRUCT   = NO

-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -396,7 +380,7 @@ INLINE_INFO            = YES
 # alphabetically by member name. If set to NO the members will appear in 
 # declaration order.

-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO

 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
 # brief documentation of file, namespace and class members alphabetically 
@@ -466,12 +450,6 @@ MAX_INITIALIZER_LINES  = 30

 SHOW_USED_FILES        = YES

-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
 # This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
@@ -564,7 +542,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.

-INPUT                  = 
+INPUT                  = include/mce

 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -792,12 +770,6 @@ HTML_FOOTER            =

 HTML_STYLESHEET        = 

-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -1133,18 +1105,6 @@ GENERATE_XML           = NO

 XML_OUTPUT             = xml

-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1354,7 +1314,7 @@ HAVE_DOT               = NO
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
 # containing the font.

-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           =

 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.
--- a/80
+++ b/80
@@ -5,38 +5,68 @@
 # Author: David Weinehall <david.weinehall@nokia.com>
 # Modified by: Ilya Dogolazky, Tuomo Tanskanen

-INSTALL_DIR := install -d
+# ----------------------------------------------------------------------------
+# TOP LEVEL TARGETS
+# ----------------------------------------------------------------------------
+
+.PHONY: build doc install clean distclean mostlyclean
+
+build::
+
+doc::
+
+install::
+
+mostlyclean::
+	$(RM) *.bak *~
+	$(RM) mce/include/*.bak mce/include/*~
+
+clean:: mostlyclean
+
+distclean:: clean
+
+# ----------------------------------------------------------------------------
+# INSTALL CONFIG
+# ----------------------------------------------------------------------------
+
+DESTDIR    ?= /tmp/test-mce-dev
+
+PCDIR      := /usr/lib/pkgconfig
+INCLUDEDIR := /usr/include/mce
+
+INSTALL_DIR  := install --mode=755 --directory
 INSTALL_DATA := install --mode=644

-DOXYGEN := doxygen

-PCDIR := $(DESTDIR)/usr/lib/pkgconfig
-INCLUDEDIR := $(DESTDIR)/usr/include/mce
+# ----------------------------------------------------------------------------
+# FILES TO BUILD / INSTALL
+# ----------------------------------------------------------------------------

-TOPDIR := $(shell /bin/pwd)
-INCDIR := $(TOPDIR)/include/mce
-DOCDIR := $(TOPDIR)/doc
+PCFILE  += mce.pc
+INCLUDE_FILES += include/mce/dbus-names.h
+INCLUDE_FILES += include/mce/mode-names.h

-PCFILE  := mce.pc
-INCLUDE_FILES := $(INCDIR)/dbus-names.h $(INCDIR)/mode-names.h
+# ----------------------------------------------------------------------------
+# DOCUMENTATION RULES
+# ----------------------------------------------------------------------------

-.PHONY: doc
-doc:	doc/warnings
+doc::	doc/doxygen.log

-doc/warnings: $(INCLUDE_FILES) Doxyfile
-	@if [ ! -d "$(DOCDIR)" ]; then mkdir "$(DOCDIR)"; fi
-	@$(DOXYGEN) 2> $(TOPDIR)/doc/warnings > /dev/null
+doc/doxygen.log: $(INCLUDE_FILES) Doxyfile
+	mkdir -p doc
+	doxygen 1> $@ # stdout=noise stderr=warnings

-clean:
-	@if [ x"$(DOCDIR)" != x"" ]; then	\
-		rm -rf "$(DOCDIR)";		\
-	fi
+clean::
+	$(RM) -rf doc

-.PHONY: install
-install: doc
-	$(INSTALL_DIR) $(PCDIR) $(INCLUDEDIR)				&&\
-	$(INSTALL_DATA) $(PCFILE) $(PCDIR)				&&\
-	$(INSTALL_DATA) $(INCLUDE_FILES) $(INCLUDEDIR)
+# ----------------------------------------------------------------------------
+# INSTALL RULES
+# ----------------------------------------------------------------------------

-.PHONY: distclean
-distclean: clean
+install::
+	# package config files
+	$(INSTALL_DIR) $(DESTDIR)$(PCDIR)
+	$(INSTALL_DATA) $(PCFILE) $(DESTDIR)$(PCDIR)/
+	# header files
+	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $(INCLUDE_FILES) $(DESTDIR)$(INCLUDEDIR)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,63 @@
+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
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 20 Mar 2018 10:07:37 +0200
+
+mce-dev (1.24.0) unstable; urgency=low
+
+  * [rpmbuild] Use _smp_mflags instead of jobs macro
+  * [makefile] Do not silence doxygen warnings
+  * [doxygen] Remove obsolete settings that cause warnings
+  * [doxygen] Do not sort member docs
+  * [doxygen] Do not scan the whole source tree
+  * [mce] Add missing methods and signals. MER#1854
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Fri, 24 Nov 2017 12:08:00 +0200
+
+mce-dev (1.23.0) unstable; urgency=low
+
+  * [mce] Add button backlight policy related D-Bus constants. JB#39838
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Fri, 06 Oct 2017 06:35:37 +0300
+
+mce-dev (1.22.0) unstable; urgency=low
+
+  * [mce] Add input policy related D-Bus constants. JB#38001
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 10 Apr 2017 15:22:37 +0300
+
+mce-dev (1.21.0) unstable; urgency=low
+
+  * [mce] Expose battery/charging data on D-Bus. Contributes to JB#37422
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 23 Jan 2017 11:58:37 +0200
+
+mce-dev (1.20.0) unstable; urgency=low
+
+  * [mce] Add method call for getting all mce settings. JB#34813
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Thu, 10 Nov 2016 08:27:14 +0200
+
+mce-dev (1.19.0) unstable; urgency=low
+
+  * [powerkey] Add method for ignoring incoming call. JB#20728
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Wed, 04 May 2016 12:54:34 +0300
+
+mce-dev (1.18.0) unstable; urgency=low
+
+  * [powerkey] Add constants for powerkey events. Fixes MER#1310
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 14 Sep 2015 11:44:27 +0300
+
 mce-dev (1.17.0) unstable; urgency=low

  * [mce] Add D-Bus constants for exposing display blanking policy.
--- a/include/mce/dbus-names.h
+++ b/include/mce/dbus-names.h
--- a/include/mce/mode-names.h
+++ b/include/mce/mode-names.h
@@ -4,9 +4,14 @@
 * <p>
 * This file is part of mce-dev
 * <p>
- * Copyright © 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2012-2017 Jolla Ltd.
 * <p>
 * @author David Weinehall <david.weinehall@nokia.com>
+ * @author Tapio Rantala <ext-tapio.rantala@nokia.com>
+ * @author Vesa Halttunen <vesa.halttunen@jollamobile.com>
+ * @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
+ * @author Kimmo Lindholm <kimmo.lindholm@eke.fi>
 *
 * These headers are free software; you can redistribute them
 * and/or modify them under the terms of the GNU Lesser General Public
@@ -21,223 +26,741 @@
 * License along with these headers.
 * If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef _MCE_MODE_NAMES_H_
-#define _MCE_MODE_NAMES_H_
+#ifndef  MCE_MODE_NAMES_H_
+# define MCE_MODE_NAMES_H_

-/**
- * Master switch; set - radios enabled, unset - radios disabled
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Radio State Constants
 *
- * @since v1.10.60
+ *@{
 */
-#define MCE_RADIO_STATE_MASTER		(1 << 0)
-/**
- * Cellular; set - enabled, unset - disabled
- *
- * @since v1.10.60
- */
-#define MCE_RADIO_STATE_CELLULAR	(1 << 1)
-/**
- * WLAN; set - enabled, unset - disabled
- *
- * @since v1.10.60
- */
-#define MCE_RADIO_STATE_WLAN		(1 << 2)
-/**
- * Bluetooth; set - enabled, unset - disabled
- *
- * @since v1.10.60
- */
-#define MCE_RADIO_STATE_BLUETOOTH	(1 << 3)
-/**
- * NFC; set - enabled, unset - disabled
- *
- * @since v1.10.93
- */
-#define MCE_RADIO_STATE_NFC		(1 << 4)
-/**
- * FM transmitter; set - enabled, unset - disabled
- *
- * @since v1.10.93
- */
-#define MCE_RADIO_STATE_FMTX		(1 << 5)

-/**
- * No ongoing call
+/** Master switch; set - radios enabled, unset - radios disabled
 *
- * @since v1.8.4
- */
-#define MCE_CALL_STATE_NONE			"none"
-/**
- * Call ringing
+ * @since mce 1.10.60
 *
- * @since v1.8.29
+ * @note Effectively is an alias for connman offline mode property.
+ *       Chamges to offline mode are reflected to mce master radio
+ *       bit and vise versa.
 */
-#define MCE_CALL_STATE_RINGING			"ringing"
-/**
- * Call on-going
+# define MCE_RADIO_STATE_MASTER                  (1 << 0)
+
+/** Cellular; set - enabled, unset - disabled
 *
- * @since v1.8.29
+ * @since mce 1.10.60
+ *
+ * @note Currently this exists for backwards compatibility only.
 */
-#define MCE_CALL_STATE_ACTIVE			"active"
-/**
- * Service operation on-going
- * use to prevent calls from being initiated;
+# define MCE_RADIO_STATE_CELLULAR                (1 << 1)
+
+/** WLAN; set - enabled, unset - disabled
+ *
+ * @since mce 1.10.60
+ *
+ * @note Currently this exists for backwards compatibility only.
+ */
+# define MCE_RADIO_STATE_WLAN                    (1 << 2)
+
+/** Bluetooth; set - enabled, unset - disabled
+ *
+ * @since mce 1.10.60
+ *
+ * @note Currently this exists for backwards compatibility only.
+ */
+# define MCE_RADIO_STATE_BLUETOOTH               (1 << 3)
+
+/** NFC; set - enabled, unset - disabled
+ *
+ * @since mce 1.10.93
+ *
+ * @note Currently this exists for backwards compatibility only.
+ */
+# define MCE_RADIO_STATE_NFC                     (1 << 4)
+
+/** FM transmitter; set - enabled, unset - disabled
+ *
+ * @since mce 1.10.93
+ *
+ * @note Currently this exists for backwards compatibility only.
+ */
+# define MCE_RADIO_STATE_FMTX                    (1 << 5)
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Call State Constants
+ *
+ *@{
+ */
+
+/** No ongoing call
+ *
+ * @since mce 1.8.4
+ */
+# define MCE_CALL_STATE_NONE                     "none"
+
+/** Call ringing
+ *
+ * @since mce 1.8.29
+ */
+# define MCE_CALL_STATE_RINGING                  "ringing"
+
+/** Call on-going
+ *
+ * @since mce 1.8.29
+ */
+# define MCE_CALL_STATE_ACTIVE                   "active"
+
+/** Service operation on-going
+ *
+ * @since mce 1.8.29
+ *
+ * @deprecated No longer in active use.
+ *
+ * Use to prevent calls from being initiated;
 * will not prevent emergency calls
- *
- * @since v1.8.29
 */
-#define MCE_CALL_STATE_SERVICE			"service"
+# define MCE_CALL_STATE_SERVICE                  "service"

-/**
- * Normal call
- *
- * @since v1.8.4
- */
-#define MCE_NORMAL_CALL				"normal"
-/**
- * Emergency call
- *
- * @since v1.8.4
- */
-#define MCE_EMERGENCY_CALL			"emergency"
+/*@}*/

-/**
- * Touchscreen/Keypad locked
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Call Type Constants
 *
- * @since v1.4.5
+ *@{
 */
-#define MCE_TK_LOCKED				"locked"
-/**
- * Touchscreen/Keypad silently locked
- *
- * @since v1.4.15
- */
-#define MCE_TK_SILENT_LOCKED			"silent-locked"
-/**
- * Touchscreen/Keypad locked with fadeout
- *
- * @since v1.4.15
- */
-#define MCE_TK_LOCKED_DIM			"locked-dim"
-/**
- * Touchscreen/Keypad locked with delay
- *
- * @since v1.12.2
- */
-#define MCE_TK_LOCKED_DELAY			"locked-delay"
-/**
- * Touchscreen/Keypad silently locked with fadeout
- *
- * @since v1.4.15
- */
-#define MCE_TK_SILENT_LOCKED_DIM		"silent-locked-dim"
-/**
- * Touchscreen/Keypad unlocked
- *
- * @since v1.4.5
- */
-#define MCE_TK_UNLOCKED				"unlocked"
-/**
- * Touchscreen/Keypad silently unlocked
- *
- * @since v1.6.33
- */
-#define MCE_TK_SILENT_UNLOCKED			"silent-unlocked"

-/**
- * Display state name for display on
+/** Normal call
 *
- * @since v1.5.21
+ * @since mce 1.8.4
 */
-#define MCE_DISPLAY_ON_STRING			"on"
-/**
- * Display state name for display dim
+# define MCE_NORMAL_CALL                         "normal"
+
+/** Emergency call
 *
- * @since v1.5.21
+ * @since mce 1.8.4
 */
-#define MCE_DISPLAY_DIM_STRING			"dimmed"
-/**
- * Display state name for display off
+# define MCE_EMERGENCY_CALL                      "emergency"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Touchscreen And Keypad Lock State Constants
 *
- * @since v1.5.21
+ *@{
+ */
+
+/** Touchscreen/Keypad locked
+ *
+ * @since mce 1.4.5
+ */
+# define MCE_TK_LOCKED                           "locked"
+
+/** Touchscreen/Keypad silently locked
+ *
+ * @since mce 1.4.15
+ *
+ * @deprecated Handled as an alias for #MCE_TK_LOCKED
+ */
+# define MCE_TK_SILENT_LOCKED                    "silent-locked"
+
+/** Touchscreen/Keypad locked with fadeout
+ *
+ * @since mce 1.4.15
+ *
+ * @deprecated Handled as an alias for #MCE_TK_LOCKED
+ */
+# define MCE_TK_LOCKED_DIM                       "locked-dim"
+
+/** Touchscreen/Keypad locked with delay
+ *
+ * @since mce 1.12.2
+ *
+ * @deprecated Handled as an alias for #MCE_TK_LOCKED
+ */
+# define MCE_TK_LOCKED_DELAY                     "locked-delay"
+
+/** Touchscreen/Keypad silently locked with fadeout
+ *
+ * @since mce 1.4.15
+ *
+ * @deprecated Handled as an alias for #MCE_TK_LOCKED
+ */
+# define MCE_TK_SILENT_LOCKED_DIM                "silent-locked-dim"
+
+/** Touchscreen/Keypad unlocked
+ *
+ * @since mce 1.4.5
+ */
+# define MCE_TK_UNLOCKED                         "unlocked"
+
+/** Touchscreen/Keypad silently unlocked
+ *
+ * @since mce 1.6.33
+ *
+ * @deprecated Handled as an alias for #MCE_TK_UNLOCKED
+ */
+# define MCE_TK_SILENT_UNLOCKED                  "silent-unlocked"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Display State Constants
+ *
+ *@{
+ */
+
+/** Display state name for display on
+ *
+ * @since mce 1.5.21
+ */
+# define MCE_DISPLAY_ON_STRING                   "on"
+
+/** Display state name for display dim
+ *
+ * @since mce 1.5.21
+ */
+# define MCE_DISPLAY_DIM_STRING                  "dimmed"
+
+/** Display state name for display off
+ *
+ * @since mce 1.5.21
+ */
+# define MCE_DISPLAY_OFF_STRING                  "off"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Blank Prevention State Constants
+ *
+ *@{
 */
-#define MCE_DISPLAY_OFF_STRING			"off"

 /** Blank prevent state name for active
 *
- * @since v1.51.0
+ * @since mce 1.51.0
 */
-#define MCE_PREVENT_BLANK_ACTIVE_STRING		"active"
+# define MCE_PREVENT_BLANK_ACTIVE_STRING         "active"
+
 /** Blank prevent state name for inactive
 *
- * @since v1.51.0
+ * @since mce 1.51.0
+ */
+# define MCE_PREVENT_BLANK_INACTIVE_STRING       "inactive"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Blanking Inhibit State Constants
+ *
+ *@{
 */
-#define MCE_PREVENT_BLANK_INACTIVE_STRING	"inactive"

 /** Blank inhibit state name for active
 *
- * @since v1.51.0
+ * @since mce 1.51.0
 */
-#define MCE_INHIBIT_BLANK_ACTIVE_STRING		"active"
+# define MCE_INHIBIT_BLANK_ACTIVE_STRING         "active"
+
 /** Blank inhibit state name for inactive
 *
- * @since v1.51.0
+ * @since mce 1.51.0
+ */
+# define MCE_INHIBIT_BLANK_INACTIVE_STRING       "inactive"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Blanking Policy State Constants
+ *
+ *@{
 */
-#define MCE_INHIBIT_BLANK_INACTIVE_STRING	"inactive"

 /** Default blanking policy active
 *
- * @since v1.55.0
+ * @since mce 1.55.0
 */
-#define MCE_BLANKING_POLICY_DEFAULT_STRING      "default"
+# define MCE_BLANKING_POLICY_DEFAULT_STRING      "default"

 /** Default blanking policy disabled due to notifications
 *
- * @since v1.55.0
+ * @since mce 1.55.0
 */
-#define MCE_BLANKING_POLICY_NOTIFICATION_STRING "notification"
+# define MCE_BLANKING_POLICY_NOTIFICATION_STRING "notification"

 /** Default blanking policy disabled due to alarm dialog state
 *
- * @since v1.55.0
+ * @since mce 1.55.0
 */
-#define MCE_BLANKING_POLICY_ALARM_STRING        "alarm"
+# define MCE_BLANKING_POLICY_ALARM_STRING        "alarm"

 /** Default blanking policy disabled due to call state
 *
- * @since v1.55.0
+ * @since mce 1.55.0
 */
-#define MCE_BLANKING_POLICY_CALL_STRING         "call"
+# define MCE_BLANKING_POLICY_CALL_STRING         "call"

 /** Default blanking policy is about to be restored
 *
- * @since v1.55.0
+ * @since mce 1.55.0
 */
-#define MCE_BLANKING_POLICY_LINGER_STRING       "linger"
+# define MCE_BLANKING_POLICY_LINGER_STRING       "linger"

-/**
- * CABC name for CABC disabled
- *
- * @since v1.8.88
- */
-#define MCE_CABC_MODE_OFF			"off"
-/**
- * CABC name for UI mode
- *
- * @since v1.8.88
- */
-#define MCE_CABC_MODE_UI			"ui"
-/**
- * CABC name for still image mode
- *
- * @since v1.8.88
- */
-#define MCE_CABC_MODE_STILL_IMAGE		"still-image"
-/**
- * CABC name for moving image mode
- *
- * @since v1.8.88
- */
-#define MCE_CABC_MODE_MOVING_IMAGE		"moving-image"
+/*@}*/

-#endif /* _MCE_MODE_NAMES_H_ */
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name CABC Mode Constants
+ *
+ *@{
+ */
+
+/** CABC name for CABC disabled
+ *
+ * @since mce 1.8.88
+ */
+# define MCE_CABC_MODE_OFF                       "off"
+
+/** CABC name for UI mode
+ *
+ * @since mce 1.8.88
+ */
+# define MCE_CABC_MODE_UI                        "ui"
+
+/** CABC name for still image mode
+ *
+ * @since mce 1.8.88
+ */
+# define MCE_CABC_MODE_STILL_IMAGE               "still-image"
+
+/** CABC name for moving image mode
+ *
+ * @since mce 1.8.88
+ */
+# define MCE_CABC_MODE_MOVING_IMAGE              "moving-image"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Power Key Trigger Constants
+ *
+ *@{
+ */
+
+/** Simulate single powerkey press
+ *
+ * @since mce 1.10.54
+ */
+# define MCE_POWERKEY_EVENT_SHORT_PRESS          (0u)
+
+/** Simulate long powerkey press
+ *
+ * @since mce 1.10.54
+ */
+# define MCE_POWERKEY_EVENT_LONG_PRESS           (1u)
+
+/** Simulate double powerkey press
+ *
+ * @since mce 1.10.54
+ */
+# define MCE_POWERKEY_EVENT_DOUBLE_PRESS         (2u)
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name USB Cable State Constants
+ *
+ *@{
+ */
+
+/** USB cable state is not known
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_USB_CABLE_STATE_UNKNOWN             "unknown"
+
+/** USB cable is connected
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_USB_CABLE_STATE_CONNECTED           "connected"
+
+/** USB cable is disconnected
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_USB_CABLE_STATE_DISCONNECTED        "disconnected"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charger State Constants
+ *
+ *@{
+ */
+
+/** Charger state is not known
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_CHARGER_STATE_UNKNOWN               "unknown"
+
+/** Charger is active
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_CHARGER_STATE_ON                    "on"
+
+/** Charger is inactive
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_CHARGER_STATE_OFF                   "off"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Battery Status Constants
+ *
+ *@{
+ */
+
+/** Battery status is not known
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_STATUS_UNKNOWN              "unknown"
+
+/** Battery is full
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_STATUS_FULL                 "full"
+
+/** Battery is neither full nor empty
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_STATUS_OK                   "ok"
+
+/** Battery is low on power
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_STATUS_LOW                  "low"
+
+/** Battery is empty
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_STATUS_EMPTY                "empty"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Battery Level Constants
+ *
+ *@{
+ */
+
+/** Battery level percentage is not known
+ *
+ * @since mce 1.86.0
+ */
+# define MCE_BATTERY_LEVEL_UNKNOWN               (-1)
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Input Policy State Constants
+ *
+ *@{
+ */
+
+/** Input events should be processed normally
+ *
+ * @since mce 1.87.0
+ */
+# define MCE_INPUT_POLICY_ENABLED                "enabled"
+
+/** Input events should be ignored
+ *
+ * @since mce 1.87.0
+ */
+# define MCE_INPUT_POLICY_DISABLED               "disabled"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Keyboard Availability Constants
+ *
+ *@{
+ */
+
+/** Hardware Keyboard availability is not known
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_HARDWARE_KEYBOARD_UNDEF             "undef"
+
+/** Hardware Keyboard is available
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_HARDWARE_KEYBOARD_AVAILABLE         "available"
+
+/** Hardware Keyboard is not available
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_HARDWARE_KEYBOARD_NOT_AVAILABLE     "not-available"
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Feedback Event Name Constants
+ *
+ *@{
+ */
+
+/** Notify that an application should handle powerkey press
+ *
+ * @since mce 1.26.0
+ *
+ * Normally MCE handles powerkey presses internally, however
+ * there are some exceptions - for example  during alarms and
+ * incoming calls - where reacting to power key press is
+ * delegated to application ui relevant to the context.
+ *
+ * See:
+ * - #MCE_ALARM_UI_FEEDBACK_SIG
+ * - #MCE_CALL_UI_FEEDBACK_SIG
+ */
+# define MCE_FEEDBACK_EVENT_POWERKEY             "powerkey"
+
+/** Notify that an application should handle device flipover
+ *
+ * @since mce 1.26.0
+ *
+ * While there are incoming calls or ringing alarms, MCE does
+ * device flipover detection. Reacting to such "sensor gestures"
+ * is delegated to application ui relevant to the context.
+ *
+ * See:
+ * - #MCE_ALARM_UI_FEEDBACK_SIG
+ * - #MCE_CALL_UI_FEEDBACK_SIG
+ */
+# define MCE_FEEDBACK_EVENT_FLIPOVER             "flipover"
+
+/** Request lockscreen ui to switch to device unlock view
+ *
+ * @since mce 1.37.0
+ *
+ * When MCE bumps into situation where removing tklock is
+ * requested while device is locked, it asks ui to switch
+ * into device unlock view instead of deactivating tklock.
+ *
+ * See:
+ * - #MCE_POWER_BUTTON_TRIGGER
+ *
+ * @note The "double-power-key" value is just unfortunate
+ *       historical artefact that can't be changed without
+ *       causing a D-Bus API break.
+ */
+# define MCE_FEEDBACK_EVENT_UNLOCK               "double-power-key"
+
+/** Notify lipstick about homekey presses
+ *
+ * @since mce 1.82.0
+ *
+ * Artefact from tk7001 adaptation: The fingerprint sensor
+ * doubles as home key. To facilitate "wakeup display and
+ * activate fingerprint sensor" type activity homekey
+ * handling is divided in two parts: 1st mce subjects the
+ * press to similar unblanking rules as what is done to
+ * the powerkey and then after/when display is powered up
+ * reaction to the homekey is delegated to lipstick.
+ *
+ * See:
+ * - #MCE_POWER_BUTTON_TRIGGER
+ */
+# define MCE_FEEDBACK_EVENT_HOMEKEY              "home-key"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Sliding Keyboard Availability Constants
+ *
+ * Used for example in evaluating whether virtual keyboard
+ * should be used or not.
+ *
+ * See:
+ * - #MCE_SLIDING_KEYBOARD_STATE_GET
+ * - #MCE_SLIDING_KEYBOARD_STATE_SIG
+ *
+ *@{
+ */
+
+/** Sliding Keyboard state is not known
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_SLIDING_KEYBOARD_UNDEF              "undef"
+
+/** Sliding Keyboard is opened
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_SLIDING_KEYBOARD_OPEN               "open"
+
+/** Sliding Keyboard is closed
+ *
+ * @since mce 1.39.0
+ */
+# define MCE_SLIDING_KEYBOARD_CLOSED             "closed"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Display Low Power Mode Constants
+ *
+ *@{
+ */
+
+/** Display Low Power Mode is Enabled
+ *
+ * @since mce 1.30.0
+ */
+# define MCE_LPM_UI_ENABLED                      "enabled"
+
+/** Display Low Power Mode is Disabled
+ *
+ * @since mce 1.30.0
+ */
+# define MCE_LPM_UI_DISABLED                     "disabled"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name System Memory Pressure Constants
+ *
+ *@{
+ */
+
+/** System memory use is at normal level
+ *
+ * @since mce 1.35.0
+ */
+# define MCE_MEMORY_LEVEL_NORMAL                 "normal"
+
+/** System memory use is above normal level
+ *
+ * @since mce 1.35.0
+ *
+ * Signifies: Unnecesary resources should be released.
+ */
+# define MCE_MEMORY_LEVEL_WARNING                "warning"
+
+/** System memory use is at critical level
+ *
+ * @since mce 1.35.0
+ *
+ * Signifies: Unnecessary processes should exit. Non-critical
+ * processes can be expected to get terminated by kernel side
+ * out of memory killer.
+ */
+# define MCE_MEMORY_LEVEL_CRITICAL               "critical"
+
+/** System memory use can't be evaluated
+ *
+ * @since mce 1.35.0
+ *
+ * Signifies: Kernel does not provide memnotify interface
+ * and/or memory use limits have not been defined in mce
+ * configuration.
+ */
+# define MCE_MEMORY_LEVEL_UNKNOWN                "unknown"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name TKLock status replies from SystemUI
+ *
+ *@{
+ */
+
+/** TKLock was unlocked by the user
+ *
+ * @since mce 1.10.92 (legacy)
+ */
+# define TKLOCK_UNLOCK                           1
+/** TKLock unlock attempt failed
+ *
+ * @since mce 1.10.92 (legacy)
+ *
+ * @deprecated Ignored by MCE
+ */
+# define TKLOCK_RETRY                            2
+
+/** Attempt to open TKLock timed out
+ *
+ * @since mce 1.10.92 (legacy)
+ *
+ * @deprecated Ignored by MCE
+ */
+# define TKLOCK_TIMEOUT                          3
+/** TKLock closed on request from mce
+ *
+ * @since mce 1.10.92 (legacy)
+ */
+# define TKLOCK_CLOSED                           4
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @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_ */
--- a/mce.pc
+++ b/mce.pc
@@ -3,7 +3,7 @@ includedir=${prefix}/include

 Name: mce
 Description: Mode Control Entity
-Version: 1.17.0
+Version: 1.26.0
 Requires:
 Libs:
 Cflags: -I${includedir}
--- a/rpm/mce-headers.spec
+++ b/rpm/mce-headers.spec
@@ -1,6 +1,6 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.17.0
+Version:    1.26.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
@@ -25,7 +25,8 @@ provided by the Mode Control Entity, and the signals emitted by it.
 %setup -q -n %{name}-%{version}

 %build
-make %{?jobs:-j%jobs}
+./verify_version
+make %{?_smp_mflags}
 make doc

 %install
--- a/25
+++ b/25
@@ -8,23 +8,34 @@ PC_VERS=$(grep '^Version:' $PC_PATH |sed -e 's/^.*:[[:space:]]*//')
 DEB_PATH=debian/changelog
 DEB_VERS=$(head -1 $DEB_PATH | sed -e 's/^.*(//' -e 's/).*$//')

-SPEC_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
-SPEC_VERS=$(grep '^Version:' $SPEC_PATH |sed -e 's/^.*:[[:space:]]*//')
+RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
+RPM_VERS=$(grep '^Version:' $RPM_PATH |sed -e 's/^.*:[[:space:]]*//')
+
+# Remove initial part of rpm version  that equals with version from pkgconfig
+RPM_XTRA=${RPM_VERS#$PC_VERS}
+# From that remove initial part that equals with version from spec-file
+RPM_XTRA=${RPM_XTRA#$RPM_VERS}
+# If the result is non-empty string, then OBS is doing
+# delta-after-matching-tag kind of build, which is ok.
+# But empty string means that spec and Makefile are completely
+# out of sync, which is bad.

 RES=0

-
 if [ "$DEB_VERS" != "$PC_VERS" ]; then
  echo >&2 "$PC_PATH $PC_VERS vs $DEB_PATH $DEB_VERS"
  RES=1
 fi

-if [ "$SPEC_VERS" != "$PC_VERS" ]; then
-  echo >&2 "$PC_PATH $PC_VERS vs $SPEC_PATH $SPEC_VERS"
-  RES=1
+if [ "$RPM_VERS" != "$PC_VERS" ]; then
+  if [ -z "$RPM_XTRA" ]; then
+    echo >&2 "$PC_PATH $PC_VERS vs $RPM_PATH $RPM_VERS"
+    RES=1
+  else
+    echo "(ignoring patch level in spec file: $RPM_XTRA)"
+  fi
 fi

-
 if [ $RES != 0 ]; then
  echo >&2 "Conflicting package versions"
 fi
Author	SHA1	Message	Date
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
Simo Piiroinen	e8f71174c9	Bump mce-dev version to 1.25.0	2018-03-20 10:09:03 +02:00
spiiroin	92c7aeea13	Merge branch 'jb41340_blanking_pause' into 'master' [mce] Add blanking pause related D-Bus constants See merge request !8	2018-03-20 08:06:50 +00:00
Simo Piiroinen	d56854bc87	[mce] Add blanking pause related D-Bus constants. JB#41340 Also update documentation for MCE_PREVENT_BLANK_REQ. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2018-03-19 12:47:17 +02:00
Simo Piiroinen	2789748227	Bump mce-dev version to 1.24.0	2017-11-24 12:09:38 +02:00
spiiroin	c0a97915db	Merge branch 'mer1854_do_not_hardcode' into 'master' Add missing D-Bus method call and signal names See merge request !7	2017-11-24 10:06:45 +00:00
Simo Piiroinen	c1f3964d19	[mce] Add missing methods and signals. MER#1854 Some methods and signals belonging to mce D-Bus interface are not declared in mce-dev package. And what is declared is not grouped in a manner that would make the context of constants clear. Add missing method/signal/argument constants. Group constants by context. Add references from methods/signals to relevant argument constants. Do not refer to glib types when explaining a D-Bus interfaces. Where needed update the explanatory comments. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-11-18 18:25:50 +02:00
Simo Piiroinen	255289d291	[doxygen] Do not scan the whole source tree Doxygen is rather verbose and scanning .git subdirectory produces a lot of noise. Limit scanning only to to subdirectories that have data for doxygen. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-11-18 18:16:03 +02:00
Simo Piiroinen	89eac9fffc	[doxygen] Do not sort member docs Things are grouped by association within source files. Sorting by name effectively breaks the grouping in the resulting documentation. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-11-18 18:16:03 +02:00
Simo Piiroinen	d279de8fc9	[doxygen] Remove obsolete settings that cause warnings Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-11-18 18:16:03 +02:00
Simo Piiroinen	b40c427c43	[makefile] Do not silence doxygen warnings Doxygen is noisy and can't be asked to be less verbose, but hiding all output from it to a log file hides any real issues it is facing. Redirect only stdout which is where doxygen writes progress noise, let warnings and such output to stderr stay visible. Also follow makefile conventions by adding standard make targets and using DESTDIR macro only in install rule. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-11-18 18:14:59 +02:00
Simo Piiroinen	f22c9e2467	[rpmbuild] Use _smp_mflags instead of jobs macro The "jobs" macro is non-standard and won't use multiple cores when building under mb2. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-10-10 15:31:15 +03:00
spiiroin	02a1953664	Merge branch 'jb39838_button_backlight' into 'master' Add button backlight policy related D-Bus constants See merge request !6	2017-10-06 10:18:03 +00:00
Simo Piiroinen	f47522c905	Bump mce-dev version to 1.23.0	2017-10-06 06:38:26 +03:00
Simo Piiroinen	18202c10ef	[mce] Add button backlight policy related D-Bus constants. JB#39838 Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-10-05 19:04:01 +03:00
Simo Piiroinen	a5ced91829	Bump mce-dev version to 1.22.0	2017-04-10 15:23:43 +03:00
spiiroin	edbd329a9e	Merge branch 'jb38001_volkey_policy' into 'master' Add input policy related D-Bus constants See merge request !5	2017-04-10 12:21:07 +00:00
Simo Piiroinen	1629e7c932	[mce] Add input policy related D-Bus constants. JB#38001 Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-04-06 12:49:39 +03:00
Simo Piiroinen	6ca93012d5	Bump mce-dev version to 1.21.0	2017-01-23 11:59:57 +02:00
spiiroin	accc1f4bde	Merge branch 'jb37422_expose_battery_data' into 'master' Expose battery/charging data on D-Bus See merge request !3	2017-01-23 09:57:18 +00:00
Simo Piiroinen	efb7efd024	[mce] Expose battery/charging data on D-Bus. Contributes to JB#37422 Add names of D-Bus method calls and signals related to querying and tracking of battery/charging related information. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2017-01-20 12:02:04 +02:00
Simo Piiroinen	780ae8245b	Bump mce-dev version to 1.20.0	2016-11-10 08:53:37 +02:00
Simo Piiroinen	5a8d06c02e	[build] Allow OBS builds without explicit version tag The mce-dev version information is recorded in several files. To keep these in sync, there is a script that will cause rpm builds to fail unless all of the places have the same version. While this is good for making sure releases do not end up using out of sync version numbers, it also makes it impossible to do builds in OBS without creating explicit version tag. The same way as mce itself already does, relax the version checking for spec file so that versions constructed from matching version + extra git hash identification are also accepted.	2016-11-10 08:53:12 +02:00
spiiroin	22a9feb64e	Merge branch 'jb34813_get_all_settings' into 'master' Add method call for getting all mce settings See merge request !2	2016-11-10 06:25:51 +00:00
Simo Piiroinen	5ea1f28ad7	[mce] Add method call for getting all mce settings. JB#34813	2016-11-09 14:02:43 +02:00
Simo Piiroinen	13e1c2b3c0	Bump mce-dev version to 1.19.0	2016-05-04 12:56:55 +03:00
spiiroin	34edc46e9e	Merge branch 'jb20728_blank_ignored_call' into 'master' Add D-Bus method for ignoring incoming call See merge request !1	2016-05-04 09:53:47 +00:00
Simo Piiroinen	358243f960	[powerkey] Add method for ignoring incoming call. JB#20728	2016-04-12 14:31:19 +03:00
Simo Piiroinen	e6e96ef67f	Bump mce-dev version to 1.18.0	2015-09-14 11:45:58 +03:00
Simo Piiroinen	002e5fd865	Merge pull request #11 from kimmoli/powerkeytriggers Add constants for powerkey events	2015-09-14 11:43:42 +03:00
Kimmo Lindholm	62d5ea325f	[powerkey] Add constants for powerkey events. Fixes MER#1310 New constants * MCE_POWERKEY_EVENT_SHORT_PRESS * MCE_POWERKEY_EVENT_LONG_PRESS * MCE_POWERKEY_EVENT_DOUBLE_PRESS	2015-09-13 21:03:22 +03:00