adjust a calibration position of the touch panel.

Change-Id: I9f4984b16297161b2059843c28de8cdb1c0e898f
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>

diff --git a/egalax_calibration.conf b/egalax_calibration.conf
index 7fe61e2..93c1952 100644 (file)
--- a/egalax_calibration.conf
+++ b/egalax_calibration.conf
@@ -1,6 +1,6 @@
 DWIDTH=1920
 DHEIGHT=1080
-POSITION1=1908*164
-POSITION2=127*175
-POSITION3=1874*1829
-POSITION4=149*1802
+POSITION1=1958*114
+POSITION2=77*125
+POSITION3=1924*1879
+POSITION4=99*1852

diff --git a/packaging/ico-uxf-device-input-controller.changes b/packaging/ico-uxf-device-input-controller.changes
index ff0eabd..24cf53e 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.changes
+++ b/packaging/ico-uxf-device-input-controller.changes
@@ -1,16 +1,22 @@
+* Tue Jun 04 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130603.172535@a56403f
+- 0.5.04 release.
+- Work around - adjust a calibration position of the touch panel.
+- The change of the package test program with the interface change of ico-uxf-weston-plugin.
+- Appoint that more than ico-uxf-weston-plugin-0.5.04 are necessary for spec file.
+
 * Fri May 24 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093314@de73166
 - 0.5.03 release
 - fixed Because there is a problem same as a bug appointed in TIVI-974([WLD]Failed to execute Ico-uxf-weston-plugin test script with error "No testlog directory")
   Create testlog directory in an examination script.
-  - Appoint that more than ico-uxf-weston-plugin-0.5.03 are necessary for spec file.
+- Appoint that more than ico-uxf-weston-plugin-0.5.03 are necessary for spec file.
 
 * Wed May 22 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093314@6b69154
 - 0.5.02 release
 - Fix for TIVI-831 - [WLD] Touch event always acted on previous location
 
 * Wed May 15 2013 Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp> accepted/2.0alpha-wayland/20130426.191411@68abf14
- - Bug Fix.
- - I68abf147:Correctly use autoconf to detect CFLAGS/LIBS
+- Bug Fix.
+- I68abf147:Correctly use autoconf to detect CFLAGS/LIBS
 
 * -------------------------------------------------------------------
 Fri Apr 26 19:12:45 UTC 2013 - tracy.graydon@intel.com
@@ -18,4 +24,3 @@ Fri Apr 26 19:12:45 UTC 2013 - tracy.graydon@intel.com
 
 * Fri Apr 26 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> de524fc
 - Import initial.
-

diff --git a/packaging/ico-uxf-device-input-controller.spec b/packaging/ico-uxf-device-input-controller.spec
index 4ce0560..004e9df 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.spec
+++ b/packaging/ico-uxf-device-input-controller.spec
@@ -1,6 +1,6 @@
 Name:       ico-uxf-device-input-controller
 Summary:    Device Input Controller
-Version:    0.5.03
+Version:    0.5.04
 Release:    1.1
 Group:      System/GUI
 License:    Apache License, Version 2.0
@@ -12,9 +12,9 @@ BuildRequires: pkgconfig(wayland-egl)
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(glesv2)
 BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.03
+BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.04
 Requires: weston >= 1.0
-Requires: ico-uxf-weston-plugin >= 0.5.03
+Requires: ico-uxf-weston-plugin >= 0.5.04
 
 %description
 Device Input Controller for ico-uxf-weston-plugin(Multi Input Manager)

diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c
index 8754ac4..223a2f3 100644 (file)
--- a/tests/test-homescreen.c
+++ b/tests/test-homescreen.c
@@ -1027,7 +1027,8 @@ animation_surface(struct display *display, char *buf)
         surfaceid = search_surface(display, args[0]);
         if (surfaceid >= 0) {
             print_log("HOMESCREEN: animation(%s,%08x,%s)", args[0], surfaceid, args[1]);
-            ico_window_mgr_set_animation(display->ico_window_mgr, surfaceid, args[1]);
+            ico_window_mgr_set_animation(display->ico_window_mgr, surfaceid,
+                                         ICO_WINDOW_MGR_ANIMATION_CHANGE_VISIBLE, args[1]);
         }
         else    {
             print_log("HOMESCREEN: Unknown surface(%s) at animation command", args[0]);

diff --git a/touch_egalax/ico_ictl-egalax_calibration.c b/touch_egalax/ico_ictl-egalax_calibration.c
index 731ccca..2c12c5f 100644 (file)
--- a/touch_egalax/ico_ictl-egalax_calibration.c
+++ b/touch_egalax/ico_ictl-egalax_calibration.c
@@ -15,7 +15,12 @@
 #include "ico_ictl-touch_egalax.h"
 
 /* Number of times to repeat a touch about each point   */
-#define CALIBCONF_READ_NUM    (5)
+#define CALIBCONF_READ_NUM  (5)
+#define XY_COORDNATE_DELTA  (50)
+
+/* Macro for adjust coordinate      */
+#define delta_add(x)    \
+    (x) > 256 ? (x) + XY_COORDNATE_DELTA : ((x) > XY_COORDNATE_DELTA ? (x) - XY_COORDNATE_DELTA : 0);
 
 static void print_usage(const char *pName);
 static char *find_event_device(void);
@@ -256,8 +261,8 @@ get_coordinates(int evfd)
     }
     sort_data(bufX, 0, CALIBCONF_READ_NUM - 1);
     sort_data(bufY, 0, CALIBCONF_READ_NUM - 1);
-    mPosX[0] = bufX[CALIBCONF_READ_NUM / 2];
-    mPosY[0] = bufY[CALIBCONF_READ_NUM / 2];
+    mPosX[0] = delta_add(bufX[CALIBCONF_READ_NUM / 2]);
+    mPosY[0] = delta_add(bufY[CALIBCONF_READ_NUM / 2]);
 
     CALIBRATION_PRINT("+------------------------------------------------+\n");
     CALIBRATION_PRINT("| Touch the Top-Right corner of the screen %d times\n",
@@ -270,8 +275,8 @@ get_coordinates(int evfd)
     }
     sort_data(bufX, 0, CALIBCONF_READ_NUM - 1);
     sort_data(bufY, 0, CALIBCONF_READ_NUM - 1);
-    mPosX[1] = bufX[CALIBCONF_READ_NUM / 2];
-    mPosY[1] = bufY[CALIBCONF_READ_NUM / 2];
+    mPosX[1] = delta_add(bufX[CALIBCONF_READ_NUM / 2]);
+    mPosY[1] = delta_add(bufY[CALIBCONF_READ_NUM / 2]);
 
     CALIBRATION_PRINT("+------------------------------------------------+\n");
     CALIBRATION_PRINT("| Touch the Bottom-Left corner of the screen %d times\n",
@@ -284,8 +289,8 @@ get_coordinates(int evfd)
     }
     sort_data(bufX, 0, CALIBCONF_READ_NUM - 1);
     sort_data(bufY, 0, CALIBCONF_READ_NUM - 1);
-    mPosX[2] = bufX[CALIBCONF_READ_NUM / 2];
-    mPosY[2] = bufY[CALIBCONF_READ_NUM / 2];
+    mPosX[2] = delta_add(bufX[CALIBCONF_READ_NUM / 2]);
+    mPosY[2] = delta_add(bufY[CALIBCONF_READ_NUM / 2]);
 
     CALIBRATION_PRINT("+------------------------------------------------+\n");
     CALIBRATION_PRINT("| Touch the Bottom-Right corner of the screen %d times\n",
@@ -298,8 +303,8 @@ get_coordinates(int evfd)
     }
     sort_data(bufX, 0, CALIBCONF_READ_NUM - 1);
     sort_data(bufY, 0, CALIBCONF_READ_NUM - 1);
-    mPosX[3] = bufX[CALIBCONF_READ_NUM / 2];
-    mPosY[3] = bufY[CALIBCONF_READ_NUM / 2];
+    mPosX[3] = delta_add(bufX[CALIBCONF_READ_NUM / 2]);
+    mPosY[3] = delta_add(bufY[CALIBCONF_READ_NUM / 2]);
 }
 
 /*--------------------------------------------------------------------------*/