Merge branch 'jb42094_button_backlight_override' into 'master'

Add D-Bus constants for button backlight mode See merge request mer-core/mce-dev!9
sailfishos · Nov 21, 2018 · 5cbcf35 · 5cbcf35
2 parents e8f7117 + 7ff2bfb
commit 5cbcf35
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+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

diff --git a/include/mce/dbus-names.h b/include/mce/dbus-names.h
@@ -1031,6 +1031,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

diff --git a/include/mce/mode-names.h b/include/mce/mode-names.h
@@ -703,7 +703,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-/** TKLock status replies from SystemUI
+/** @name TKLock status replies from SystemUI
  *
  *@{
  */
@@ -736,4 +736,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_ */
diff --git a/mce.pc b/mce.pc
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 
 Name: mce
 Description: Mode Control Entity
-Version: 1.25.0
+Version: 1.26.0
 Requires:
 Libs:
 Cflags: -I${includedir}
diff --git a/rpm/mce-headers.spec b/rpm/mce-headers.spec
@@ -1,6 +1,6 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.25.0
+Version:    1.26.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2