* [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate
@ 2013-12-04 22:37 Chase Maupin
2013-12-04 22:37 ` [PATCH 2/3] package-group-tisdk-matrix: add matrix-gui-tscal Chase Maupin
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Chase Maupin @ 2013-12-04 22:37 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.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
.../recipes-core/matrix/matrix-gui-tscal/init | 43 ++++++++++++++++++++
.../recipes-core/matrix/matrix-gui-tscal_1.0.bb | 25 +++++++++++
2 files changed, 68 insertions(+), 0 deletions(-)
create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init
create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init
new file mode 100644
index 0000000..e8d9197
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init
@@ -0,0 +1,43 @@
+#!/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
+
+# 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-core/matrix/matrix-gui-tscal_1.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
new file mode 100644
index 0000000..9156a6a
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Matrix GUI TS calibration init script"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60"
+
+PR = "r0"
+
+S = "${WORKDIR}"
+
+INITSCRIPT_NAME = "matrix-gui-tscal"
+# Start this init script before the matrix gui launches
+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/matrix-gui-tscal
+}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] package-group-tisdk-matrix: add matrix-gui-tscal
2013-12-04 22:37 [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Chase Maupin
@ 2013-12-04 22:37 ` Chase Maupin
2013-12-04 22:37 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
2013-12-05 0:31 ` [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Cooper Jr., Franklin
2 siblings, 0 replies; 7+ messages in thread
From: Chase Maupin @ 2013-12-04 22:37 UTC (permalink / raw)
To: meta-arago
* Add the matrix-gui-tscal 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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 c3143d3..f6d2495 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 = "r23"
+PR = "r24"
inherit packagegroup
@@ -49,6 +49,7 @@ MATRIX_APPS_append_omap3 = " \
matrix-multimedia-demo-h264dec \
matrix-multimedia-demo-mpeg4aacdec \
matrix-multimedia-demo-mpeg4dec \
+ matrix-gui-tscal \
"
MATRIX_APPS_append_ti33x = " \
@@ -66,6 +67,7 @@ MATRIX_APPS_append_ti33x = " \
\
matrix-gui-wifi-demos \
matrix-gui-bluetooth-demos \
+ matrix-gui-tscal \
"
# matrix-gui-wifi-battleship-demo
@@ -82,6 +84,11 @@ MATRIX_APPS_append_ti43x = " \
matrix-gui-generic-pm \
matrix-gui-pm-demos-suspend \
matrix-gui-clocks \
+ matrix-gui-tscal \
+"
+
+MATRIX_APPS_append_omap5-evm = " \
+ matrix-gui-tscal \
"
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
2013-12-04 22:37 [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Chase Maupin
2013-12-04 22:37 ` [PATCH 2/3] package-group-tisdk-matrix: add matrix-gui-tscal Chase Maupin
@ 2013-12-04 22:37 ` Chase Maupin
2013-12-05 0:31 ` [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Cooper Jr., Franklin
2 siblings, 0 replies; 7+ messages in thread
From: Chase Maupin @ 2013-12-04 22:37 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
* Re: [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate
2013-12-04 22:37 [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Chase Maupin
2013-12-04 22:37 ` [PATCH 2/3] package-group-tisdk-matrix: add matrix-gui-tscal Chase Maupin
2013-12-04 22:37 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
@ 2013-12-05 0:31 ` Cooper Jr., Franklin
2013-12-05 1:38 ` Denys Dmytriyenko
2013-12-05 12:52 ` Maupin, Chase
2 siblings, 2 replies; 7+ messages in thread
From: Cooper Jr., Franklin @ 2013-12-05 0:31 UTC (permalink / raw)
To: Maupin, Chase, meta-arago@arago-project.org
Can we change the name of this recipe to reflect that it's a ts_calibrate init script and that it has no relationship with matrix-gui? Probably put it at recipes-graphics/ since that is the directory where tslib is located in.
Another option:
Looking at tslib there is already a script called tslib.sh that looks like it has a similar purpose. That script is located at /etc/profile.d/ which is meant for Application Environment variables to be set. So would simply overriding this file with our script work?
Qt has a similar file in /etc/profile.d called qte.sh. So we could even take the Qt portion (matrix/matrix-gui/init) and override this file. This way configuring Qt to work with our touchscreen isn't coupled with Matrix but rather Qt itself.
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Maupin, Chase
> Sent: Wednesday, December 04, 2013 4:37 PM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init package to run
> ts_calibrate
>
> * 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.
>
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
> .../recipes-core/matrix/matrix-gui-tscal/init | 43 ++++++++++++++++++++
> .../recipes-core/matrix/matrix-gui-tscal_1.0.bb | 25 +++++++++++
> 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 meta-
> arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-
> tscal_1.0.bb
>
> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init b/meta-
> arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> new file mode 100644
> index 0000000..e8d9197
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> @@ -0,0 +1,43 @@
> +#!/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
> +
> +# 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-core/matrix/matrix-gui-tscal_1.0.bb
> b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
> new file mode 100644
> index 0000000..9156a6a
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
> @@ -0,0 +1,25 @@
> +DESCRIPTION = "Matrix GUI TS calibration init script"
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM =
> "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60
> "
> +
> +PR = "r0"
> +
> +S = "${WORKDIR}"
> +
> +INITSCRIPT_NAME = "matrix-gui-tscal"
> +# Start this init script before the matrix gui launches
> +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/matrix-gui-tscal
> +}
> --
> 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] matrix-gui-tscal: Add init package to run ts_calibrate
2013-12-05 0:31 ` [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Cooper Jr., Franklin
@ 2013-12-05 1:38 ` Denys Dmytriyenko
2014-01-20 21:35 ` Maupin, Chase
2013-12-05 12:52 ` Maupin, Chase
1 sibling, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2013-12-05 1:38 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
That is what I was thinking myself - whether it should be named anything
matrix-specific or not...
I haven't looked at those env scripts yet, so not sure about the second
option. But I like the idea, if it works.
--
Denys
On Thu, Dec 05, 2013 at 12:31:16AM +0000, Cooper Jr., Franklin wrote:
> Can we change the name of this recipe to reflect that it's a ts_calibrate
> init script and that it has no relationship with matrix-gui? Probably put it
> at recipes-graphics/ since that is the directory where tslib is located in.
>
> Another option:
>
> Looking at tslib there is already a script called tslib.sh that looks like
> it has a similar purpose. That script is located at /etc/profile.d/ which is
> meant for Application Environment variables to be set. So would simply
> overriding this file with our script work?
>
> Qt has a similar file in /etc/profile.d called qte.sh. So we could even take
> the Qt portion (matrix/matrix-gui/init) and override this file. This way
> configuring Qt to work with our touchscreen isn't coupled with Matrix but
> rather Qt itself.
>
> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Maupin, Chase
> > Sent: Wednesday, December 04, 2013 4:37 PM
> > To: meta-arago@arago-project.org
> > Subject: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init package to run
> > ts_calibrate
> >
> > * 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.
> >
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> > .../recipes-core/matrix/matrix-gui-tscal/init | 43 ++++++++++++++++++++
> > .../recipes-core/matrix/matrix-gui-tscal_1.0.bb | 25 +++++++++++
> > 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 meta-
> > arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> > create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-
> > tscal_1.0.bb
> >
> > diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init b/meta-
> > arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> > new file mode 100644
> > index 0000000..e8d9197
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal/init
> > @@ -0,0 +1,43 @@
> > +#!/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
> > +
> > +# 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-core/matrix/matrix-gui-tscal_1.0.bb
> > b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
> > new file mode 100644
> > index 0000000..9156a6a
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
> > @@ -0,0 +1,25 @@
> > +DESCRIPTION = "Matrix GUI TS calibration init script"
> > +
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM =
> > "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afdcc6c60
> > "
> > +
> > +PR = "r0"
> > +
> > +S = "${WORKDIR}"
> > +
> > +INITSCRIPT_NAME = "matrix-gui-tscal"
> > +# Start this init script before the matrix gui launches
> > +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/matrix-gui-tscal
> > +}
> > --
> > 1.7.0.4
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> 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] matrix-gui-tscal: Add init package to run ts_calibrate
2013-12-05 0:31 ` [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Cooper Jr., Franklin
2013-12-05 1:38 ` Denys Dmytriyenko
@ 2013-12-05 12:52 ` Maupin, Chase
1 sibling, 0 replies; 7+ messages in thread
From: Maupin, Chase @ 2013-12-05 12:52 UTC (permalink / raw)
To: Cooper Jr., Franklin, meta-arago@arago-project.org
>-----Original Message-----
>From: Cooper Jr., Franklin
>Sent: Wednesday, December 04, 2013 6:31 PM
>To: Maupin, Chase; meta-arago@arago-project.org
>Subject: RE: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init
>package to run ts_calibrate
>
>Can we change the name of this recipe to reflect that it’s a
>ts_calibrate init script and that it has no relationship with
>matrix-gui? Probably put it at recipes-graphics/ since that is the
>directory where tslib is located in.
>
>Another option:
>
>Looking at tslib there is already a script called tslib.sh that
>looks like it has a similar purpose. That script is located at
>/etc/profile.d/ which is meant for Application Environment
>variables to be set. So would simply overriding this file with our
>script work?
>
I'll have to check on this. I don't think I'll get to it this week but maybe.
>Qt has a similar file in /etc/profile.d called qte.sh. So we could
>even take the Qt portion (matrix/matrix-gui/init) and override
>this file. This way configuring Qt to work with our touchscreen
>isn't coupled with Matrix but rather Qt itself.
>
>> -----Original Message-----
>> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> bounces@arago-project.org] On Behalf Of Maupin, Chase
>> Sent: Wednesday, December 04, 2013 4:37 PM
>> To: meta-arago@arago-project.org
>> Subject: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init
>package to run
>> ts_calibrate
>>
>> * 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.
>>
>> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
>> ---
>> .../recipes-core/matrix/matrix-gui-tscal/init | 43
>++++++++++++++++++++
>> .../recipes-core/matrix/matrix-gui-tscal_1.0.bb | 25
>+++++++++++
>> 2 files changed, 68 insertions(+), 0 deletions(-) create mode
>100644 meta-
>> arago-extras/recipes-core/matrix/matrix-gui-tscal/init
>> create mode 100644 meta-arago-extras/recipes-
>core/matrix/matrix-gui-
>> tscal_1.0.bb
>>
>> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal/init b/meta-
>> arago-extras/recipes-core/matrix/matrix-gui-tscal/init
>> new file mode 100644
>> index 0000000..e8d9197
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal/init
>> @@ -0,0 +1,43 @@
>> +#!/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
>> +
>> +# 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-core/matrix/matrix-gui-
>tscal_1.0.bb
>> b/meta-arago-extras/recipes-core/matrix/matrix-gui-tscal_1.0.bb
>> new file mode 100644
>> index 0000000..9156a6a
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal_1.0.bb
>> @@ -0,0 +1,25 @@
>> +DESCRIPTION = "Matrix GUI TS calibration init script"
>> +
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM =
>>
>"file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afd
>cc6c60
>> "
>> +
>> +PR = "r0"
>> +
>> +S = "${WORKDIR}"
>> +
>> +INITSCRIPT_NAME = "matrix-gui-tscal"
>> +# Start this init script before the matrix gui launches
>> +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/matrix-gui-tscal
>> +}
>> --
>> 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] matrix-gui-tscal: Add init package to run ts_calibrate
2013-12-05 1:38 ` Denys Dmytriyenko
@ 2014-01-20 21:35 ` Maupin, Chase
0 siblings, 0 replies; 7+ messages in thread
From: Maupin, Chase @ 2014-01-20 21:35 UTC (permalink / raw)
To: Dmytriyenko, Denys, Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Wednesday, December 04, 2013 7:38 PM
>To: Cooper Jr., Franklin
>Cc: Maupin, Chase; meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init
>package to run ts_calibrate
>
>That is what I was thinking myself - whether it should be named
>anything
>matrix-specific or not...
Sorry I just got around to this. I can change the name.
>
>I haven't looked at those env scripts yet, so not sure about the
>second
>option. But I like the idea, if it works.
I don't see this working. The issue is that the files in /etc/profile.d are not run until you log into the console. We want ts_calibrate to run on boot up if needed without needing a console login.
>
>--
>Denys
>
>
>On Thu, Dec 05, 2013 at 12:31:16AM +0000, Cooper Jr., Franklin
>wrote:
>> Can we change the name of this recipe to reflect that it's a
>ts_calibrate
>> init script and that it has no relationship with matrix-gui?
>Probably put it
>> at recipes-graphics/ since that is the directory where tslib is
>located in.
>>
>> Another option:
>>
>> Looking at tslib there is already a script called tslib.sh that
>looks like
>> it has a similar purpose. That script is located at
>/etc/profile.d/ which is
>> meant for Application Environment variables to be set. So would
>simply
>> overriding this file with our script work?
>>
>> Qt has a similar file in /etc/profile.d called qte.sh. So we
>could even take
>> the Qt portion (matrix/matrix-gui/init) and override this file.
>This way
>> configuring Qt to work with our touchscreen isn't coupled with
>Matrix but
>> rather Qt itself.
>>
>> > -----Original Message-----
>> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> > bounces@arago-project.org] On Behalf Of Maupin, Chase
>> > Sent: Wednesday, December 04, 2013 4:37 PM
>> > To: meta-arago@arago-project.org
>> > Subject: [meta-arago] [PATCH 1/3] matrix-gui-tscal: Add init
>package to run
>> > ts_calibrate
>> >
>> > * 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.
>> >
>> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
>> > ---
>> > .../recipes-core/matrix/matrix-gui-tscal/init | 43
>++++++++++++++++++++
>> > .../recipes-core/matrix/matrix-gui-tscal_1.0.bb | 25
>+++++++++++
>> > 2 files changed, 68 insertions(+), 0 deletions(-) create
>mode 100644 meta-
>> > arago-extras/recipes-core/matrix/matrix-gui-tscal/init
>> > create mode 100644 meta-arago-extras/recipes-
>core/matrix/matrix-gui-
>> > tscal_1.0.bb
>> >
>> > diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal/init b/meta-
>> > arago-extras/recipes-core/matrix/matrix-gui-tscal/init
>> > new file mode 100644
>> > index 0000000..e8d9197
>> > --- /dev/null
>> > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal/init
>> > @@ -0,0 +1,43 @@
>> > +#!/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
>> > +
>> > +# 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-core/matrix/matrix-gui-
>tscal_1.0.bb
>> > b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal_1.0.bb
>> > new file mode 100644
>> > index 0000000..9156a6a
>> > --- /dev/null
>> > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>tscal_1.0.bb
>> > @@ -0,0 +1,25 @@
>> > +DESCRIPTION = "Matrix GUI TS calibration init script"
>> > +
>> > +LICENSE = "GPLv2"
>> > +LIC_FILES_CHKSUM =
>> >
>"file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb7988afd
>cc6c60
>> > "
>> > +
>> > +PR = "r0"
>> > +
>> > +S = "${WORKDIR}"
>> > +
>> > +INITSCRIPT_NAME = "matrix-gui-tscal"
>> > +# Start this init script before the matrix gui launches
>> > +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/matrix-gui-tscal
>> > +}
>> > --
>> > 1.7.0.4
>> >
>> > _______________________________________________
>> > meta-arago mailing list
>> > meta-arago@arago-project.org
>> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> 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
end of thread, other threads:[~2014-01-20 21:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-04 22:37 [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Chase Maupin
2013-12-04 22:37 ` [PATCH 2/3] package-group-tisdk-matrix: add matrix-gui-tscal Chase Maupin
2013-12-04 22:37 ` [PATCH 3/3] matrix-gui: remove ts_calibrate from init Chase Maupin
2013-12-05 0:31 ` [PATCH 1/3] matrix-gui-tscal: Add init package to run ts_calibrate Cooper Jr., Franklin
2013-12-05 1:38 ` Denys Dmytriyenko
2014-01-20 21:35 ` Maupin, Chase
2013-12-05 12:52 ` Maupin, Chase
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.