Moved files outside, added imageproc submenu

diff --git a/utility_apps/utility_imageproc/desc_utility_imageproc.html b/imageproc_demo/desc_imageproc_demo.html
similarity index 100%
rename from utility_apps/utility_imageproc/desc_utility_imageproc.html
rename to imageproc_demo/desc_imageproc_demo.html

diff --git a/imageproc_demo/imageproc_demo.desktop b/imageproc_demo/imageproc_demo.desktop
new file mode 100644 (file)
index 0000000..585e2ea
--- /dev/null
+++ b/imageproc_demo/imageproc_demo.desktop
@@ -0,0 +1,11 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Image Processing Demo
+GenericName=Image Processing Demo
+Icon=/usr/share/matrix-gui-2.0/apps/images/imageproc-icon.png
+Type=Application
+Exec=/usr/share/matrix-gui-2.0/apps/imageproc_demo/imageproc_demo.sh
+Categories=imageproc
+ProgramType=console
+X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/imageproc_demo/desc_imageproc_demo.html
+X-MATRIX-DisplayPriority=1

diff --git a/utility_apps/utility_imageproc/utility_imageproc.html b/imageproc_demo/imageproc_demo.html
similarity index 95%
rename from utility_apps/utility_imageproc/utility_imageproc.html
rename to imageproc_demo/imageproc_demo.html
index 44f3876d85bfda53e54ebcebff25bea8beae2d06..c14722c109b6fa0ee05163ecbd9f7d97d89421d5 100644 (file)
--- a/utility_apps/utility_imageproc/utility_imageproc.html
+++ b/imageproc_demo/imageproc_demo.html
@@ -25,7 +25,7 @@ return true;
 </table>
 <!--</div>-->
 <!--<div align="center">-->
-<form enctype="multipart/form-data" method="post" name="userinput" onsubmit="return CheckExtentionBMP();" action="apps/utility_imageproc/cgi-bin/image_processing_evmtci6638k2k_master.out"><br>
+<form enctype="multipart/form-data" method="post" name="userinput" onsubmit="return CheckExtentionBMP();" action="apps/imageproc_demo/cgi-bin/image_processing_evmtci6638k2k_master.out"><br>
 <table cellspacing="10">
 <tbody>
 <tr>

diff --git a/imageproc_demo/imageproc_demo.sh b/imageproc_demo/imageproc_demo.sh
new file mode 100644 (file)
index 0000000..f4afb6f
--- /dev/null
+++ b/imageproc_demo/imageproc_demo.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Module: utilities_main
+#
+# Description: This script is used to run the utilities application demo
+# 
+# Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+#
+#  Redistribution and use in source and binary forms, with or withou
+#  modification, are permitted provided that the following conditions
+#  are met:
+#
+#  Redistributions of source code must retain the above copyright
+#  notice, this list of conditions and the following disclaimer.
+#  
+#  Redistributions in binary form must reproduce the above copyright
+#  notice, this list of conditions and the following disclaimer in the
+#  documentation and/or other materials provided with the
+#  distribution.
+#
+#  Neither the name of Texas Instruments Incorporated nor the names of
+#  its contributors may be used to endorse or promote products derived
+#  from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+/usr/share/matrix-gui-2.0/apps/imageproc_demo/run_dsp.sh $2> /dev/null
+
+cat /usr/share/matrix-gui-2.0/apps/imageproc_demo/imageproc_demo.html

diff --git a/utility_apps/utility_imageproc/run_dsp.sh b/imageproc_demo/run_dsp.sh
similarity index 91%
rename from utility_apps/utility_imageproc/run_dsp.sh
rename to imageproc_demo/run_dsp.sh
index e76b3a498d9fbb666359997bfcfda6523c958fa0..ac1e45abcc4fa265aad1c101c0088f5d2ea3968d 100644 (file)
--- a/utility_apps/utility_imageproc/run_dsp.sh
+++ b/imageproc_demo/run_dsp.sh
@@ -1,4 +1,4 @@
-export SLAVE_DIR=/usr/share/matrix-gui-2.0/apps/utility_imageproc/bin
+export SLAVE_DIR=/usr/share/matrix-gui-2.0/apps/imageproc_demo/bin
 
 mpmcl reset dsp0
 mpmcl reset dsp1

diff --git a/images/utilities-imageproc.png b/images/imageproc-icon.png
similarity index 100%
rename from images/utilities-imageproc.png
rename to images/imageproc-icon.png

diff --git a/utility_apps/utility_imageproc/utility_imageproc.desktop b/utility_apps/utility_imageproc/utility_imageproc.desktop
deleted file mode 100644 (file)
index 830334f..0000000
--- a/utility_apps/utility_imageproc/utility_imageproc.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=Image Processing Demo
-GenericName=Image Processing Demo
-Icon=/usr/share/matrix-gui-2.0/apps/images/utilities-imageproc.png
-Type=Application
-Exec=/usr/share/matrix-gui-2.0/apps/utility_imageproc/utility_imageproc.sh
-Categories=utilities
-ProgramType=console
-X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/utility_imageproc/desc_utility_imageproc.html
-X-MATRIX-DisplayPriority=1

diff --git a/utility_apps/utility_imageproc/utility_imageproc.sh b/utility_apps/utility_imageproc/utility_imageproc.sh
deleted file mode 100644 (file)
index 76b6a98..0000000
--- a/utility_apps/utility_imageproc/utility_imageproc.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Module: utilities_main
-#
-# Description: This script is used to run the utilities application demo
-# 
-# Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
-#
-#  Redistribution and use in source and binary forms, with or withou
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#  
-#  Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the
-#  distribution.
-#
-#  Neither the name of Texas Instruments Incorporated nor the names of
-#  its contributors may be used to endorse or promote products derived
-#  from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-/usr/share/matrix-gui-2.0/apps/utility_imageproc/run_dsp.sh $2> /dev/null
-
-cat /usr/share/matrix-gui-2.0/apps/utility_imageproc/utility_imageproc.html

diff --git a/utility_apps/utility_eeprom/cgi-bin/eepromread.cgi b/utility_eeprom/cgi-bin/eepromread.cgi
similarity index 100%
rename from utility_apps/utility_eeprom/cgi-bin/eepromread.cgi
rename to utility_eeprom/cgi-bin/eepromread.cgi

diff --git a/utility_apps/utility_eeprom/cgi-bin/eepromwrite.cgi b/utility_eeprom/cgi-bin/eepromwrite.cgi
similarity index 100%
rename from utility_apps/utility_eeprom/cgi-bin/eepromwrite.cgi
rename to utility_eeprom/cgi-bin/eepromwrite.cgi

diff --git a/utility_apps/utility_eeprom/desc_utility_i2c.html b/utility_eeprom/desc_utility_i2c.html
similarity index 100%
rename from utility_apps/utility_eeprom/desc_utility_i2c.html
rename to utility_eeprom/desc_utility_i2c.html

diff --git a/utility_apps/utility_eeprom/i2c.html b/utility_eeprom/i2c.html
similarity index 100%
rename from utility_apps/utility_eeprom/i2c.html
rename to utility_eeprom/i2c.html

diff --git a/utility_apps/utility_eeprom/utility_i2c.desktop b/utility_eeprom/utility_i2c.desktop
similarity index 100%
rename from utility_apps/utility_eeprom/utility_i2c.desktop
rename to utility_eeprom/utility_i2c.desktop

diff --git a/utility_apps/utility_eeprom/utility_i2c.sh b/utility_eeprom/utility_i2c.sh
similarity index 100%
rename from utility_apps/utility_eeprom/utility_i2c.sh
rename to utility_eeprom/utility_i2c.sh

diff --git a/utility_apps/utility_filesystem/cgi-bin/filesystemwrite.cgi b/utility_filesystem/cgi-bin/filesystemwrite.cgi
similarity index 100%
rename from utility_apps/utility_filesystem/cgi-bin/filesystemwrite.cgi
rename to utility_filesystem/cgi-bin/filesystemwrite.cgi

diff --git a/utility_apps/utility_filesystem/desc_utility_filesystem.html b/utility_filesystem/desc_utility_filesystem.html
similarity index 100%
rename from utility_apps/utility_filesystem/desc_utility_filesystem.html
rename to utility_filesystem/desc_utility_filesystem.html

diff --git a/utility_apps/utility_filesystem/filesystem.html b/utility_filesystem/filesystem.html
similarity index 100%
rename from utility_apps/utility_filesystem/filesystem.html
rename to utility_filesystem/filesystem.html

diff --git a/utility_apps/utility_filesystem/utility_filesystem.desktop b/utility_filesystem/utility_filesystem.desktop
similarity index 100%
rename from utility_apps/utility_filesystem/utility_filesystem.desktop
rename to utility_filesystem/utility_filesystem.desktop

diff --git a/utility_apps/utility_filesystem/utility_filesystem.sh b/utility_filesystem/utility_filesystem.sh
similarity index 100%
rename from utility_apps/utility_filesystem/utility_filesystem.sh
rename to utility_filesystem/utility_filesystem.sh

diff --git a/utility_apps/utility_flash/cgi-bin/flashread.cgi b/utility_flash/cgi-bin/flashread.cgi
similarity index 100%
rename from utility_apps/utility_flash/cgi-bin/flashread.cgi
rename to utility_flash/cgi-bin/flashread.cgi

diff --git a/utility_apps/utility_flash/cgi-bin/flashwrite.cgi b/utility_flash/cgi-bin/flashwrite.cgi
similarity index 100%
rename from utility_apps/utility_flash/cgi-bin/flashwrite.cgi
rename to utility_flash/cgi-bin/flashwrite.cgi

diff --git a/utility_apps/utility_flash/desc_utility_flash.html b/utility_flash/desc_utility_flash.html
similarity index 100%
rename from utility_apps/utility_flash/desc_utility_flash.html
rename to utility_flash/desc_utility_flash.html

diff --git a/utility_apps/utility_flash/flash.html b/utility_flash/flash.html
similarity index 100%
rename from utility_apps/utility_flash/flash.html
rename to utility_flash/flash.html

diff --git a/utility_apps/utility_flash/utility_flash.desktop b/utility_flash/utility_flash.desktop
similarity index 100%
rename from utility_apps/utility_flash/utility_flash.desktop
rename to utility_flash/utility_flash.desktop

diff --git a/utility_apps/utility_flash/utility_flash.sh b/utility_flash/utility_flash.sh
similarity index 100%
rename from utility_apps/utility_flash/utility_flash.sh
rename to utility_flash/utility_flash.sh

diff --git a/utility_apps/utility_info/cgi-bin/info.cgi b/utility_info/cgi-bin/info.cgi
similarity index 100%
rename from utility_apps/utility_info/cgi-bin/info.cgi
rename to utility_info/cgi-bin/info.cgi

diff --git a/utility_apps/utility_info/desc_utility_info.html b/utility_info/desc_utility_info.html
similarity index 100%
rename from utility_apps/utility_info/desc_utility_info.html
rename to utility_info/desc_utility_info.html

diff --git a/utility_apps/utility_info/utility_info.desktop b/utility_info/utility_info.desktop
similarity index 100%
rename from utility_apps/utility_info/utility_info.desktop
rename to utility_info/utility_info.desktop

diff --git a/utility_apps/utility_info/utility_info.sh b/utility_info/utility_info.sh
similarity index 100%
rename from utility_apps/utility_info/utility_info.sh
rename to utility_info/utility_info.sh

diff --git a/utility_apps/utility_stats/cgi-bin/stats.cgi b/utility_stats/cgi-bin/stats.cgi
similarity index 100%
rename from utility_apps/utility_stats/cgi-bin/stats.cgi
rename to utility_stats/cgi-bin/stats.cgi

diff --git a/utility_apps/utility_stats/desc_utility_stats.html b/utility_stats/desc_utility_stats.html
similarity index 100%
rename from utility_apps/utility_stats/desc_utility_stats.html
rename to utility_stats/desc_utility_stats.html

diff --git a/utility_apps/utility_stats/utility_stats.desktop b/utility_stats/utility_stats.desktop
similarity index 100%
rename from utility_apps/utility_stats/utility_stats.desktop
rename to utility_stats/utility_stats.desktop

diff --git a/utility_apps/utility_stats/utility_stats.sh b/utility_stats/utility_stats.sh
similarity index 100%
rename from utility_apps/utility_stats/utility_stats.sh
rename to utility_stats/utility_stats.sh