* Re: [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init
2014-01-21 17:14 ` [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init Chase Maupin
@ 2014-01-21 15:55 ` Denys Dmytriyenko
2014-01-21 17:11 ` Maupin, Chase
0 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2014-01-21 15:55 UTC (permalink / raw)
To: Chase Maupin; +Cc: meta-arago
On Tue, Jan 21, 2014 at 11:14:17AM -0600, Chase Maupin wrote:
> * Add the ts-calibrate-init package for everything except dra7xx
> which does not require calibration for its touchscreen.
>
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
> .../packagegroup-arago-tisdk-matrix.bb | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
> index 220d77f..8a717ba 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
> @@ -1,6 +1,6 @@
> DESCRIPTION = "Task to include Matrix v2"
> LICENSE = "MIT"
> -PR = "r26"
> +PR = "r27"
>
> inherit packagegroup
>
> @@ -49,6 +49,7 @@ MATRIX_APPS_append_omap3 = " \
> matrix-multimedia-demo-h264dec \
> matrix-multimedia-demo-mpeg4aacdec \
> matrix-multimedia-demo-mpeg4dec \
> + ts-calibrate-init \
> "
>
> MATRIX_APPS_append_ti33x = " \
> @@ -65,6 +66,7 @@ MATRIX_APPS_append_ti33x = " \
> matrix-gui-clocks \
> \
> matrix-gui-wifi-demos \
> + ts-calibrate-init \
> "
>
> MATRIX_APPS_append_ti43x = " \
> @@ -78,8 +80,12 @@ MATRIX_APPS_append_ti43x = " \
> matrix-gui-generic-pm \
> matrix-gui-pm-demos-suspend \
> matrix-gui-clocks \
> - \
> matrix-gui-wifi-demos \
> + ts-calibrate-init \
> +"
> +
> +MATRIX_APPS_append_omap5-evm = " \
> + ts-calibrate-init \
OMAP5 uEVM doesn't have touchscreen, does it?
> "
>
> MATRIX_APPS_append_omap-a15 = " \
> --
> 1.7.0.4
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate
2014-01-21 17:14 [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate Chase Maupin
@ 2014-01-21 15:58 ` Denys Dmytriyenko
2014-01-21 17:11 ` Maupin, Chase
2014-01-21 17:14 ` [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init Chase Maupin
2014-01-21 17:14 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
2 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2014-01-21 15:58 UTC (permalink / raw)
To: Chase Maupin; +Cc: meta-arago
On Tue, Jan 21, 2014 at 11:14:16AM -0600, Chase Maupin wrote:
> * Add a package that will run ts_calibrate if needed. This
> will allow separating this logic from the matrix init script
> since it is not always needed and allow others to use it for
> their own systems without requiring matrix.
>
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
> .../recipes-graphics/tslib/ts-calibrate-init/init | 50 ++++++++++++++++++++
> .../tslib/ts-calibrate-init_1.0.bb | 29 +++++++++++
> 2 files changed, 79 insertions(+), 0 deletions(-)
> create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
> create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
>
> diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
> new file mode 100644
> index 0000000..26ea581
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
> @@ -0,0 +1,50 @@
> +#!/bin/sh
> +# Copyright (C) {2013} Texas Instruments Incorporated - http://www.ti.com/
> +#
> +# This program 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 2.
> +#
> +# This program is distributed "as is" WITHOUT ANY WARRANTY of any
> +# kind, whether express or implied; without even the implied warranty
> +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +
> +tsfile=/etc/pointercal
> +
> +# First let's check if we even see a touchscreen device node. If not
> +# then bail out.
> +if [ ! -e /dev/input/touchscreen0 ]
> +then
> + exit
> +fi
> +
> +# Check if the SD card is mounted and the first partition is
> +# vfat. If so let's write the pointercal file there so that if
> +# someone messes up calibration they can just delete the file from
> +# any system and reboot the board.
> +
> +#TODO how can we find the SD card and not eMMC? can we look for a "boot"
> +# LABEL?
> +mount | grep /media/mmcblk0p1 | grep vfat > /dev/null 2>&1
> +if [ "$?" = "0" ]
> +then
> + tsfile=/media/mmcblk0p1/pointercal
> + export TSLIB_CALIBFILE=$tsfile
> +fi
> +
> +if [ ! -f $tsfile ] ; then
> + echo -n "Calibrating touchscreen (first time only)"
> + ts_calibrate
> + echo "."
> +
> + # If we create a pointercal file and it was not in /etc/pointercal
> + # let's copy it there as well if it does not already exist. This is so
> + # that running other applications that look for /etc/pointercal and
> + # without TSLIB_CALIBFILE set will still get the right calibration.
> + # TODO: can we just globally export TSLIB_CALIBFILE?
> + if [ ! -f /etc/pointercal -a -f $tsfile ]
> + then
> + cp $tsfile /etc/pointercal
> + fi
> +fi
> diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
> new file mode 100644
> index 0000000..7fdbc26
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
> @@ -0,0 +1,29 @@
> +# This recipe installs an init script that can be used to invoke ts_calibrate
> +# on systems that need this done during the boot sequence.
Should it RDEPENDS on tslib/ts_calibrate binary that is used in the initscript?
> +DESCRIPTION = "TS calibration init script"
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60"
> +
> +PR = "r0"
> +
> +S = "${WORKDIR}"
> +
> +INITSCRIPT_NAME = "ts-calibrate"
> +
> +# Start this init script early enough for other processes to be started later
> +# in the init sequence
> +INITSCRIPT_PARAMS = "start 96 2 3 4 5 ."
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +inherit update-rc.d
> +
> +SRC_URI = "file://init"
> +
> +do_install(){
> + # Install the init script
> + # TODO: replace init script with systemd files
> + install -d ${D}${sysconfdir}/init.d
> + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ts-calibrate
> +}
> --
> 1.7.0.4
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate
2014-01-21 15:58 ` Denys Dmytriyenko
@ 2014-01-21 17:11 ` Maupin, Chase
0 siblings, 0 replies; 7+ messages in thread
From: Maupin, Chase @ 2014-01-21 17:11 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Tuesday, January 21, 2014 9:59 AM
>To: Maupin, Chase
>Cc: meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 1/3] ts-calibrate-init: Add init
>package to run ts_calibrate
>
>On Tue, Jan 21, 2014 at 11:14:16AM -0600, Chase Maupin wrote:
>> * Add a package that will run ts_calibrate if needed. This
>> will allow separating this logic from the matrix init script
>> since it is not always needed and allow others to use it for
>> their own systems without requiring matrix.
>>
>> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
>> ---
>> .../recipes-graphics/tslib/ts-calibrate-init/init | 50
>++++++++++++++++++++
>> .../tslib/ts-calibrate-init_1.0.bb | 29
>+++++++++++
>> 2 files changed, 79 insertions(+), 0 deletions(-)
>> create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-
>calibrate-init/init
>> create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-
>calibrate-init_1.0.bb
>>
>> diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-
>calibrate-init/init b/meta-arago-extras/recipes-graphics/tslib/ts-
>calibrate-init/init
>> new file mode 100644
>> index 0000000..26ea581
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-
>init/init
>> @@ -0,0 +1,50 @@
>> +#!/bin/sh
>> +# Copyright (C) {2013} Texas Instruments Incorporated -
>http://www.ti.com/
>> +#
>> +# This program 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 2.
>> +#
>> +# This program is distributed "as is" WITHOUT ANY WARRANTY of
>any
>> +# kind, whether express or implied; without even the implied
>warranty
>> +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
>the
>> +# GNU General Public License for more details.
>> +
>> +tsfile=/etc/pointercal
>> +
>> +# First let's check if we even see a touchscreen device node.
>If not
>> +# then bail out.
>> +if [ ! -e /dev/input/touchscreen0 ]
>> +then
>> + exit
>> +fi
>> +
>> +# Check if the SD card is mounted and the first partition is
>> +# vfat. If so let's write the pointercal file there so that if
>> +# someone messes up calibration they can just delete the file
>from
>> +# any system and reboot the board.
>> +
>> +#TODO how can we find the SD card and not eMMC? can we look
>for a "boot"
>> +# LABEL?
>> +mount | grep /media/mmcblk0p1 | grep vfat > /dev/null 2>&1
>> +if [ "$?" = "0" ]
>> +then
>> + tsfile=/media/mmcblk0p1/pointercal
>> + export TSLIB_CALIBFILE=$tsfile
>> +fi
>> +
>> +if [ ! -f $tsfile ] ; then
>> + echo -n "Calibrating touchscreen (first time only)"
>> + ts_calibrate
>> + echo "."
>> +
>> + # If we create a pointercal file and it was not in
>/etc/pointercal
>> + # let's copy it there as well if it does not already exist.
>This is so
>> + # that running other applications that look for
>/etc/pointercal and
>> + # without TSLIB_CALIBFILE set will still get the right
>calibration.
>> + # TODO: can we just globally export TSLIB_CALIBFILE?
>> + if [ ! -f /etc/pointercal -a -f $tsfile ]
>> + then
>> + cp $tsfile /etc/pointercal
>> + fi
>> +fi
>> diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-
>calibrate-init_1.0.bb b/meta-arago-extras/recipes-
>graphics/tslib/ts-calibrate-init_1.0.bb
>> new file mode 100644
>> index 0000000..7fdbc26
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-
>init_1.0.bb
>> @@ -0,0 +1,29 @@
>> +# This recipe installs an init script that can be used to
>invoke ts_calibrate
>> +# on systems that need this done during the boot sequence.
>
>Should it RDEPENDS on tslib/ts_calibrate binary that is used in
>the initscript?
Good point. I'll fix that.
>
>
>> +DESCRIPTION = "TS calibration init script"
>> +
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM =
>"file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afd
>cc6c60"
>> +
>> +PR = "r0"
>> +
>> +S = "${WORKDIR}"
>> +
>> +INITSCRIPT_NAME = "ts-calibrate"
>> +
>> +# Start this init script early enough for other processes to be
>started later
>> +# in the init sequence
>> +INITSCRIPT_PARAMS = "start 96 2 3 4 5 ."
>> +
>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>> +
>> +inherit update-rc.d
>> +
>> +SRC_URI = "file://init"
>> +
>> +do_install(){
>> + # Install the init script
>> + # TODO: replace init script with systemd files
>> + install -d ${D}${sysconfdir}/init.d
>> + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ts-
>calibrate
>> +}
>> --
>> 1.7.0.4
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init
2014-01-21 15:55 ` Denys Dmytriyenko
@ 2014-01-21 17:11 ` Maupin, Chase
0 siblings, 0 replies; 7+ messages in thread
From: Maupin, Chase @ 2014-01-21 17:11 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Tuesday, January 21, 2014 9:55 AM
>To: Maupin, Chase
>Cc: meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 2/3] package-group-tisdk-matrix:
>add ts-calibrate-init
>
>On Tue, Jan 21, 2014 at 11:14:17AM -0600, Chase Maupin wrote:
>> * Add the ts-calibrate-init package for everything except dra7xx
>> which does not require calibration for its touchscreen.
>>
>> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
>> ---
>> .../packagegroup-arago-tisdk-matrix.bb | 10
>++++++++--
>> 1 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-arago-distro/recipes-
>core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-
>arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-
>matrix.bb
>> index 220d77f..8a717ba 100644
>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-tisdk-matrix.bb
>> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-tisdk-matrix.bb
>> @@ -1,6 +1,6 @@
>> DESCRIPTION = "Task to include Matrix v2"
>> LICENSE = "MIT"
>> -PR = "r26"
>> +PR = "r27"
>>
>> inherit packagegroup
>>
>> @@ -49,6 +49,7 @@ MATRIX_APPS_append_omap3 = " \
>> matrix-multimedia-demo-h264dec \
>> matrix-multimedia-demo-mpeg4aacdec \
>> matrix-multimedia-demo-mpeg4dec \
>> + ts-calibrate-init \
>> "
>>
>> MATRIX_APPS_append_ti33x = " \
>> @@ -65,6 +66,7 @@ MATRIX_APPS_append_ti33x = " \
>> matrix-gui-clocks \
>> \
>> matrix-gui-wifi-demos \
>> + ts-calibrate-init \
>> "
>>
>> MATRIX_APPS_append_ti43x = " \
>> @@ -78,8 +80,12 @@ MATRIX_APPS_append_ti43x = " \
>> matrix-gui-generic-pm \
>> matrix-gui-pm-demos-suspend \
>> matrix-gui-clocks \
>> - \
>> matrix-gui-wifi-demos \
>> + ts-calibrate-init \
>> +"
>> +
>> +MATRIX_APPS_append_omap5-evm = " \
>> + ts-calibrate-init \
>
>OMAP5 uEVM doesn't have touchscreen, does it?
No it doesn't. Another one for me to fix :)
>
>
>> "
>>
>> MATRIX_APPS_append_omap-a15 = " \
>> --
>> 1.7.0.4
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate
@ 2014-01-21 17:14 Chase Maupin
2014-01-21 15:58 ` Denys Dmytriyenko
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Chase Maupin @ 2014-01-21 17:14 UTC (permalink / raw)
To: meta-arago
* Add a package that will run ts_calibrate if needed. This
will allow separating this logic from the matrix init script
since it is not always needed and allow others to use it for
their own systems without requiring matrix.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
.../recipes-graphics/tslib/ts-calibrate-init/init | 50 ++++++++++++++++++++
.../tslib/ts-calibrate-init_1.0.bb | 29 +++++++++++
2 files changed, 79 insertions(+), 0 deletions(-)
create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
create mode 100644 meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
new file mode 100644
index 0000000..26ea581
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init/init
@@ -0,0 +1,50 @@
+#!/bin/sh
+# Copyright (C) {2013} Texas Instruments Incorporated - http://www.ti.com/
+#
+# This program 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 2.
+#
+# This program is distributed "as is" WITHOUT ANY WARRANTY of any
+# kind, whether express or implied; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+tsfile=/etc/pointercal
+
+# First let's check if we even see a touchscreen device node. If not
+# then bail out.
+if [ ! -e /dev/input/touchscreen0 ]
+then
+ exit
+fi
+
+# Check if the SD card is mounted and the first partition is
+# vfat. If so let's write the pointercal file there so that if
+# someone messes up calibration they can just delete the file from
+# any system and reboot the board.
+
+#TODO how can we find the SD card and not eMMC? can we look for a "boot"
+# LABEL?
+mount | grep /media/mmcblk0p1 | grep vfat > /dev/null 2>&1
+if [ "$?" = "0" ]
+then
+ tsfile=/media/mmcblk0p1/pointercal
+ export TSLIB_CALIBFILE=$tsfile
+fi
+
+if [ ! -f $tsfile ] ; then
+ echo -n "Calibrating touchscreen (first time only)"
+ ts_calibrate
+ echo "."
+
+ # If we create a pointercal file and it was not in /etc/pointercal
+ # let's copy it there as well if it does not already exist. This is so
+ # that running other applications that look for /etc/pointercal and
+ # without TSLIB_CALIBFILE set will still get the right calibration.
+ # TODO: can we just globally export TSLIB_CALIBFILE?
+ if [ ! -f /etc/pointercal -a -f $tsfile ]
+ then
+ cp $tsfile /etc/pointercal
+ fi
+fi
diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
new file mode 100644
index 0000000..7fdbc26
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
@@ -0,0 +1,29 @@
+# This recipe installs an init script that can be used to invoke ts_calibrate
+# on systems that need this done during the boot sequence.
+DESCRIPTION = "TS calibration init script"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60"
+
+PR = "r0"
+
+S = "${WORKDIR}"
+
+INITSCRIPT_NAME = "ts-calibrate"
+
+# Start this init script early enough for other processes to be started later
+# in the init sequence
+INITSCRIPT_PARAMS = "start 96 2 3 4 5 ."
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit update-rc.d
+
+SRC_URI = "file://init"
+
+do_install(){
+ # Install the init script
+ # TODO: replace init script with systemd files
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ts-calibrate
+}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init
2014-01-21 17:14 [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate Chase Maupin
2014-01-21 15:58 ` Denys Dmytriyenko
@ 2014-01-21 17:14 ` Chase Maupin
2014-01-21 15:55 ` Denys Dmytriyenko
2014-01-21 17:14 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
2 siblings, 1 reply; 7+ messages in thread
From: Chase Maupin @ 2014-01-21 17:14 UTC (permalink / raw)
To: meta-arago
* Add the ts-calibrate-init package for everything except dra7xx
which does not require calibration for its touchscreen.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
.../packagegroup-arago-tisdk-matrix.bb | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 220d77f..8a717ba 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r26"
+PR = "r27"
inherit packagegroup
@@ -49,6 +49,7 @@ MATRIX_APPS_append_omap3 = " \
matrix-multimedia-demo-h264dec \
matrix-multimedia-demo-mpeg4aacdec \
matrix-multimedia-demo-mpeg4dec \
+ ts-calibrate-init \
"
MATRIX_APPS_append_ti33x = " \
@@ -65,6 +66,7 @@ MATRIX_APPS_append_ti33x = " \
matrix-gui-clocks \
\
matrix-gui-wifi-demos \
+ ts-calibrate-init \
"
MATRIX_APPS_append_ti43x = " \
@@ -78,8 +80,12 @@ MATRIX_APPS_append_ti43x = " \
matrix-gui-generic-pm \
matrix-gui-pm-demos-suspend \
matrix-gui-clocks \
- \
matrix-gui-wifi-demos \
+ ts-calibrate-init \
+"
+
+MATRIX_APPS_append_omap5-evm = " \
+ ts-calibrate-init \
"
MATRIX_APPS_append_omap-a15 = " \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] matrix-gui: remove ts_calibrate from init
2014-01-21 17:14 [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate Chase Maupin
2014-01-21 15:58 ` Denys Dmytriyenko
2014-01-21 17:14 ` [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init Chase Maupin
@ 2014-01-21 17:14 ` Chase Maupin
2 siblings, 0 replies; 7+ messages in thread
From: Chase Maupin @ 2014-01-21 17:14 UTC (permalink / raw)
To: meta-arago
* touchscreen calibration has been moved to a separate package
since it is not required for all devices.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
.../recipes-core/matrix/matrix-gui/init | 25 +-------------------
.../recipes-core/matrix/matrix-gui_2.0.bb | 2 +-
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/init b/meta-arago-extras/recipes-core/matrix/matrix-gui/init
index 5e1f741..dab7dc6 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui/init
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/init
@@ -9,7 +9,6 @@ test -x "$matrixgui" || exit 0
export TSLIB_TSDEVICE=/dev/input/touchscreen0
export QWS_MOUSE_PROTO=Auto
-tsfile=/etc/pointercal
case "$1" in
start)
@@ -24,32 +23,10 @@ case "$1" in
# in the kernel. This should have no impact on cortex-A8 devices.
echo 2 > /proc/cpu/alignment
- # Do not try to calibrate the touchscreen if it doesn't exist.
+ # Set the QWS_MOUSE_PROTO for touchscreen if it exists
if [ -e /dev/input/touchscreen0 ]
then
export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
- # Check if the SD card is mounted and the first partition is
- # vfat. If so let's write the pointercal file there so that if
- # someone messes up calibration they can just delete the file from
- # any system and reboot the board.
- mount | grep /media/mmcblk0p1 | grep vfat > /dev/null 2>&1
- if [ "$?" = "0" ]
- then
- tsfile=/media/mmcblk0p1/pointercal
- export TSLIB_CALIBFILE=$tsfile
- fi
-
- if [ ! -f $tsfile ] ; then
- echo -n "Calibrating touchscreen (first time only)"
- ts_calibrate
- echo "."
- # If we create a pointercal file and it was not in /etc/pointercal
- # let's copy it there as well if it does not already exist.
- if [ ! -f /etc/pointercal -a -f $tsfile ]
- then
- cp $tsfile /etc/pointercal
- fi
- fi
fi
#Clear out the the tmp and lock directory
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 54359e5..fa1f1e0 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"
SECTION = "multimedia"
-PR = "r13"
+PR = "r14"
INITSCRIPT_NAME = "matrix-gui-2.0"
INITSCRIPT_PARAMS = "defaults 97"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-01-21 17:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-21 17:14 [PATCH 1/3] ts-calibrate-init: Add init package to run ts_calibrate Chase Maupin
2014-01-21 15:58 ` Denys Dmytriyenko
2014-01-21 17:11 ` Maupin, Chase
2014-01-21 17:14 ` [PATCH 2/3] package-group-tisdk-matrix: add ts-calibrate-init Chase Maupin
2014-01-21 15:55 ` Denys Dmytriyenko
2014-01-21 17:11 ` Maupin, Chase
2014-01-21 17:14 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.