[EGIT] [core/efl] master 02/03: eeze/sensor/fake: Finally fix fake module to send out correct ecore events.

[Stefan Schmidt - Enlightenment Git]

stefan pushed a commit to branch master.

commit bc93fd6aa7b14a5935d03e7d6ca30d596dbcffc6
Author: Stefan Schmidt <s.schm...@samsung.com>
Date:   Thu Mar 28 13:52:58 2013 +0000

    eeze/sensor/fake: Finally fix fake module to send out correct ecore events.
    
    Sensor type is completely different from event type.
---
 src/modules/eeze/sensor/fake/fake.c | 44 ++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/modules/eeze/sensor/fake/fake.c 
b/src/modules/eeze/sensor/fake/fake.c
index 6123458..b8ccc2f 100644
--- a/src/modules/eeze/sensor/fake/fake.c
+++ b/src/modules/eeze/sensor/fake/fake.c
@@ -114,30 +114,48 @@ fake_async_read(Eeze_Sensor_Type sensor_type, void 
*user_data EINA_UNUSED)
         return EINA_FALSE;
      }
 
+   /* Default values for sensor objects with three data points */
+   obj->accuracy = -1;
+   obj->data[0] = 7;
+   obj->data[1] = 23;
+   obj->data[2] = 42;
+   gettimeofday(&tv, NULL);
+   obj->timestamp = ((tv.tv_sec * 1000000) + tv.tv_usec);
+
    switch (sensor_type)
      {
       case EEZE_SENSOR_TYPE_ACCELEROMETER:
+        ecore_event_add(EEZE_SENSOR_EVENT_ACCELEROMETER, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_MAGNETIC:
+        ecore_event_add(EEZE_SENSOR_EVENT_MAGNETIC, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_ORIENTATION:
+        ecore_event_add(EEZE_SENSOR_EVENT_ORIENTATION, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_GYROSCOPE:
-        obj->accuracy = -1;
-        obj->data[0] = 7;
-        obj->data[1] = 23;
-        obj->data[2] = 42;
-        gettimeofday(&tv, NULL);
-        obj->timestamp = ((tv.tv_sec * 1000000) + tv.tv_usec);
-        ecore_event_add(sensor_type, obj, NULL, NULL);
+        ecore_event_add(EEZE_SENSOR_EVENT_GYROSCOPE, obj, NULL, NULL);
         break;
-
       case EEZE_SENSOR_TYPE_LIGHT:
+        /* Reset values that are not used for sensor object with one data 
point */
+        obj->data[1] = 0;
+        obj->data[2] = 0;
+        ecore_event_add(EEZE_SENSOR_EVENT_LIGHT, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_PROXIMITY:
+        obj->data[1] = 0;
+        obj->data[2] = 0;
+        ecore_event_add(EEZE_SENSOR_EVENT_PROXIMITY, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_BAROMETER:
+        obj->data[1] = 0;
+        obj->data[2] = 0;
+        ecore_event_add(EEZE_SENSOR_EVENT_BAROMETER, obj, NULL, NULL);
+        break;
       case EEZE_SENSOR_TYPE_TEMPERATURE:
-        obj->accuracy = -1;
-        obj->data[0] = 7;
-        gettimeofday(&tv, NULL);
-        obj->timestamp = ((tv.tv_sec * 1000000) + tv.tv_usec);
-        ecore_event_add(sensor_type, obj, NULL, NULL);
+        obj->data[1] = 0;
+        obj->data[2] = 0;
+        ecore_event_add(EEZE_SENSOR_EVENT_TEMPERATURE, obj, NULL, NULL);
         break;
 
       default:

-- 

------------------------------------------------------------------------------
Own the Future-Intel&reg; Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game 
on Steam. $5K grand prize plus 10 genre and skill prizes. 
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d