[mce] Add charging hysteresis control D-Bus constants. JB#58372

Constants related to exposing charging hysteresis control on D-Bus.

Signed-off-by: Martin Kampas <martin.kampas@jolla.com>

Makefile

@@ -31,11 +31,11 @@ distclean:: clean
 
 DESTDIR    ?= /tmp/test-mce-dev
 
-PCDIR      := /usr/lib/pkgconfig
+PCDIR      ?= /usr/lib/pkgconfig
 INCLUDEDIR := /usr/include/mce
 
-INSTALL_DIR  := install --mode=755 --directory
-INSTALL_DATA := install --mode=644
+INSTALL_DIR  := install -m 755 -d
+INSTALL_DATA := install -m 644
 
 
 # ----------------------------------------------------------------------------

debian/changelog

@@ -1,3 +1,39 @@
+mce-dev (1.30.0) unstable; urgency=low
+
+  * [mce] Add charging hysteresis state D-Bus constants. JB#40062
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 22 Feb 2022 04:19:53 +0200
+
+mce-dev (1.29.0) unstable; urgency=low
+
+  * [mce] Add mouse availability state D-Bus constants. JB#55866
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Mon, 25 Oct 2021 18:09:15 +0300
+
+mce-dev (1.28.3) unstable; urgency=low
+
+  * [mce-dev] Set rpm build arch to noarch
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 01 Sep 2020 11:42:42 +0300
+
+mce-dev (1.28.2) unstable; urgency=low
+
+  * [aarch64] Specify pcdir with use of libdir. Contributes to JB#49681
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 25 May 2020 16:43:30 +0300
+
+mce-dev (1.28.1) unstable; urgency=low
+
+  * [mce-dev] Make the makefile compatible with Busybox
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 07 Apr 2020 09:20:57 +0300
+
+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

include/mce/dbus-names.h

@@ -4,8 +4,8 @@
  * <p>
  * This file is part of mce-dev
  * <p>
- * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2013-2019 Jolla Ltd.
+ * Copyright (c) 2004 - 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2013 - 2022 Jolla Ltd.
  * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
@@ -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
@@ -893,6 +919,122 @@
  */
 # define MCE_CHARGER_TYPE_SIG             "charger_type_ind"
 
+/** Query current charging hysteresis mode
+ *
+ * @since mce 1.112.0
+ *
+ * @return string: charging hysteresis policy state, one of:
+ * - #MCE_CHARGING_MODE_DISABLE
+ * - #MCE_CHARGING_MODE_ENABLE
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS_AFTER_FULL
+ */
+# define MCE_CHARGING_MODE_GET           "get_charging_mode"
+
+/** Set charging hysteresis mode
+ *
+ * @since mce 1.112.0
+ *
+ * @param string: charging hysteresis policy mode, one of:
+ * - #MCE_CHARGING_MODE_DISABLE
+ * - #MCE_CHARGING_MODE_ENABLE
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS_AFTER_FULL
+ *
+ * @return boolean: success, or error reply in case of failure
+ */
+# define MCE_CHARGING_MODE_SET           "set_charging_mode"
+
+/** Signal that indicates that charging hysteresis mode has changed
+ *
+ * Charging hysteresis policy decision.
+ *
+ * @since mce 1.112.0
+ *
+ * @param string: charging hysteresis policy mode, one of:
+ * - #MCE_CHARGING_MODE_DISABLE
+ * - #MCE_CHARGING_MODE_ENABLE
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS
+ * - #MCE_CHARGING_MODE_APPLY_THRESHOLDS_AFTER_FULL
+ */
+# define MCE_CHARGING_MODE_SIG           "charging_mode_ind"
+
+/** Query current charging hysteresis limit to enable charging
+ *
+ * @since mce 1.112.0
+ *
+ * @return int: charging hysteresis limit to enable charging
+ */
+# define MCE_CHARGING_LIMIT_ENABLE_GET   "get_charging_limit_enable"
+
+/** Set charging hysteresis limit to enable charging
+ *
+ * @since mce 1.112.0
+ *
+ * @param int: charging hysteresis limit to enable charging
+ *
+ * @return boolean: success, or error reply in case of failure
+ */
+# define MCE_CHARGING_LIMIT_ENABLE_SET   "set_charging_limit_enable"
+
+/** Signal that indicates that charging hysteresis limit to enable charging has changed
+ *
+ * @since mce 1.112.0
+ *
+ * @param int: charging hysteresis limit to enable charging
+ */
+# define MCE_CHARGING_LIMIT_ENABLE_SIG   "charging_limit_enable_ind"
+
+/** Query current charging hysteresis limit to disable charging
+ *
+ * @since mce 1.112.0
+ *
+ * @return int: charging hysteresis limit to disable charging
+ */
+# define MCE_CHARGING_LIMIT_DISABLE_GET   "get_charging_limit_disable"
+
+/** Set charging hysteresis limit to disable charging
+ *
+ * @since mce 1.112.0
+ *
+ * @param int: charging hysteresis limit to disable charging
+ *
+ * @return boolean: success, or error reply in case of failure
+ */
+# define MCE_CHARGING_LIMIT_DISABLE_SET   "set_charging_limit_disable"
+
+/** Signal that indicates that charging hysteresis limit to disable charging has changed
+ *
+ * @since mce 1.112.0
+ *
+ * @param int: charging hysteresis limit to disable charging
+ */
+# define MCE_CHARGING_LIMIT_DISABLE_SIG   "charging_limit_disable_ind"
+
+/** Query current charging hysteresis state
+ *
+ * @since mce 1.110.0
+ *
+ * @return string: charging hysteresis policy state, one of:
+ * - #MCE_CHARGING_STATE_UNKNOWN
+ * - #MCE_CHARGING_STATE_ENABLED
+ * - #MCE_CHARGING_STATE_DISABLED
+ */
+# define MCE_CHARGING_STATE_GET           "get_charging_state"
+
+/** Signal that indicates that charging hysteresis state has changed
+ *
+ * Charging hysteresis policy decision.
+ *
+ * @since mce 1.110.0
+ *
+ * @param string: charging hysteresis policy state, one of:
+ * - #MCE_CHARGING_STATE_UNKNOWN
+ * - #MCE_CHARGING_STATE_ENABLED
+ * - #MCE_CHARGING_STATE_DISABLED
+ */
+# define MCE_CHARGING_STATE_SIG           "charging_state_ind"
+
 /*@}*/
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1127,6 +1269,44 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability
+ *
+ *@{
+ */
+
+/** Query HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * Used for example in evaluating whether mouse pointer
+ * should be shown or not.
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_GET      "mouse_available_state_req"
+
+/** Notify changes in HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_SIG      "mouse_available_state_ind"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Sliding Keyboard State

include/mce/mode-names.h

@@ -4,8 +4,8 @@
  * <p>
  * This file is part of mce-dev
  * <p>
- * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2012-2019 Jolla Ltd.
+ * Copyright (c) 2004 - 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2012 - 2022 Jolla Ltd.
  * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
@@ -482,9 +482,69 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charging Hysteresis Mode Constants
+ *
+ *@{
+ */
+
+/** Charging hysteresis policy is to keep charger enabled (default behavior)
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_CHARGING_MODE_ENABLE               "enable"
+
+/** Charging hysteresis policy is to keep charger disabled
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_CHARGING_MODE_DISABLE              "disable"
+
+/** Charging hysteresis policy is to apply thresholds
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_CHARGING_MODE_APPLY_THRESHOLDS     "apply-thresholds"
+
+/** Charging hysteresis policy is to apply thresholds once fully charged
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_CHARGING_MODE_APPLY_THRESHOLDS_AFTER_FULL  "apply-thresholds-after-full"
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charging Hysteresis State Constants
+ *
+ *@{
+ */
+
+/** Charging hysteresis policy state is not known
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_UNKNOWN              "unknown"
+
+/** Charging hysteresis policy allows charging
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_ENABLED              "enabled"
+
+/** Charging hysteresis policy denies charging
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_DISABLED             "disabled"
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Status Constants
+ *
+ * These values match legacy maemo (bme) battery status values.
  *
  *@{
  */
@@ -521,6 +581,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
@@ -583,6 +692,32 @@
 # define MCE_HARDWARE_KEYBOARD_NOT_AVAILABLE     "not-available"
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability Constants
+ *
+ *@{
+ */
+
+/** Hardware Mouse availability is not known
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_UNDEF                "undef"
+
+/** Hardware Mouse is available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_AVAILABLE            "available"
+
+/** Hardware Mouse is not available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_NOT_AVAILABLE        "not-available"
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Feedback Event Name Constants

mce.pc

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

rpm/mce-headers.spec

@@ -1,11 +1,12 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.27.0
+Version:    1.30.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
 URL:        https://git.sailfishos.org/mer-core/mce-dev
 Source0:    %{name}-%{version}.tar.bz2
+BuildArch:  noarch
 BuildRequires:  doxygen
 
 %description
@@ -31,7 +32,7 @@ make doc
 
 %install
 rm -rf %{buildroot}
-%make_install
+make install PCDIR=%{_libdir}/pkgconfig DESTDIR=%{?buildroot}
 install -d %{buildroot}/%{_docdir}/mce-doc/html/
 install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/