Merge lp:~ricmm/powerd/add-sensors-proximity-call into lp:powerd

[Ricardo Mendoza]

  * Provide initial sensors control
  * Turn screen off when in call and proximity = NEAR

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/powerd-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/36/rebuild

review: Needs Fixing (continuous-integration)

[Michael Frey (mfrey)]

tested, works great.

review: Approve

[lp:~ricmm/powerd/add-sensors-proximity-call]

26. By Ricardo Mendoza on 2013-05-30

Add platform-api dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/powerd-ci/40/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Working fine, as expected.

Needs newer platform-api for it to build.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-25 01:24:31 +0000
+++ CMakeLists.txt	2013-05-30 01:44:23 +0000
@@ -28,6 +28,7 @@
   src/display.c
   src/powerd-object.c
   src/power-request.c
+  src/powerd-sensors.cpp
   src/${GDBUS_NAME}.c
 )
 
@@ -79,6 +80,8 @@
   ${GUDEV_LIBRARIES}
   ${GIO_LIBRARIES}
   ${GIO-UNIX_LIBRARIES}
+  ${PHABLET_LIBRARIES}
+  "-lubuntu_application_api"
 )
 
 install(

=== modified file 'debian/control'
--- debian/control	2013-05-20 15:46:01 +0000
+++ debian/control	2013-05-30 01:44:23 +0000
@@ -8,7 +8,8 @@
                libgudev-1.0-dev,
                libhybris-dev,
                libgles2-mesa-dev,
-               python
+               python,
+               libplatform-api1-dev
 Standards-Version: 3.9.3
 Vcs-Bzr: lp:powerd
 

=== added file 'src/powerd-sensors.cpp'
--- src/powerd-sensors.cpp	1970-01-01 00:00:00 +0000
+++ src/powerd-sensors.cpp	2013-05-30 01:44:23 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * Ricardo Mendoza: [e-mail]
+ *
+ * This file is part of powerd.
+ *
+ * powerd is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * powerd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "powerd-internal.h"
+#include "powerd-sensors.h"
+
+#include <ubuntu/application/sensors/proximity.h>
+
+UASensorsProximity* prox_sensor;
+
+void on_new_proximity_event(UASProximityEvent *event, void *context)
+{
+    switch (uas_proximity_event_get_distance(event))
+    {
+        case U_PROXIMITY_NEAR:
+        {
+            powerd_set_display_state(POWERD_DISPLAY_OFF);
+            break;
+        }
+        case U_PROXIMITY_FAR:
+        {
+            powerd_set_display_state(POWERD_DISPLAY_ON);
+            break;
+        }
+    }
+}
+
+void powerd_sensors_proximity_enable(void)
+{
+    ua_sensors_proximity_enable(prox_sensor);
+}
+
+void powerd_sensors_proximity_disable(void)
+{
+    ua_sensors_proximity_disable(prox_sensor);
+}
+
+void powerd_sensors_init(void)
+{
+    prox_sensor = ua_sensors_proximity_new();
+
+    ua_sensors_proximity_set_reading_cb(prox_sensor,
+                                        on_new_proximity_event,
+                                        NULL);
+}

=== added file 'src/powerd-sensors.h'
--- src/powerd-sensors.h	1970-01-01 00:00:00 +0000
+++ src/powerd-sensors.h	2013-05-30 01:44:23 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * Ricardo Mendoza: [e-mail]
+ *
+ * This file is part of powerd.
+ *
+ * powerd is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * powerd is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __POWERD_SENSORS_H__
+#define __POWERD_SENSORS_H__
+
+void powerd_sensors_init(void);
+void powerd_sensors_proximity_enable(void);
+void powerd_sensors_proximity_disable(void);
+
+#endif /* __POWERD_SENSORS_H */

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-05-25 01:24:31 +0000
+++ src/powerd.cpp	2013-05-30 01:44:23 +0000
@@ -38,6 +38,7 @@
 #include "powerd-internal.h"
 #include "powerd-object.h"
 #include "powerd-dbus.h"
+#include "powerd-sensors.h"
 
 #include <hybris/input/input_stack_compatibility_layer.h>
 #include <hybris/input/input_stack_compatibility_layer_codes_key.h>
@@ -203,6 +204,7 @@
             g_warning("Request for active state failed");
         }
         powerd_set_display_state(POWERD_DISPLAY_ON);
+        powerd_sensors_proximity_enable();
     }
     else if (!strcmp(signal_name, "CallRemoved")) {
         g_debug("Call over, dropping active state request");
@@ -210,6 +212,7 @@
         if (!ret)
             g_warning("Internal system state request cookie invalid: %d\n",
                       ofono_call_request_cookie);
+        powerd_sensors_proximity_disable();
     }
 }
 
@@ -259,6 +262,7 @@
     libsuspend_init(0);
     power_request_init();
     powerd_display_init();
+    powerd_sensors_init();
 
     main_loop = g_main_loop_new (NULL, FALSE);
     signal(SIGTERM, sigterm_quit);