Commit 7e1bb078 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

Merge branch 'master' of https://github.com/Elphel/meta-elphel393

parents c5b18ceb 19d3be25

recipes-core/apps-web/files/camogm.js

+3 −3
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ function init(){ 
	

	

	ct2 = $("<div style='padding-top:20px;'>");

	ct2 = $("<div style='padding-top:20px;'>");

	

	

	tmpstr = "Absolute path: <input id='abspath' style='text' value='/tmp/mnt/sda1' class='ap' />";

	tmpstr = "Absolute path: <input id='abspath' style='text' value='/mnt/sda1' class='ap' />";

	

	

	ct2.html(tmpstr);

	ct2.html(tmpstr);

	$("#controls").append(ct2);

	$("#controls").append(ct2);
@@ -212,14 +212,14 @@ function get_files(){ 




function init_path(){

function init_path(){

	$.ajax({

	$.ajax({

		url:"camogm.php?cmd=list&path=/tmp/mnt",

		url:"camogm.php?cmd=list&path=/mnt",

		complete: function(data){

		complete: function(data){

			var xml = data.responseXML;

			var xml = data.responseXML;

			var dirs = $(xml).find("d");

			var dirs = $(xml).find("d");

			var res = false;

			var res = false;

			for(var i=0;i<dirs.length;i++){

			for(var i=0;i<dirs.length;i++){

				var tmp = $(dirs[i]).text();

				var tmp = $(dirs[i]).text();

				if (tmp=="/tmp/mnt/sda1") {

				if (tmp=="/mnt/sda1") {

					$("#abspath").val(tmp);

					$("#abspath").val(tmp);

					res = true;

					res = true;

				}

				}

recipes-core/apps-web/files/camogm.php

+4 −4
Original line number Original line Diff line number Diff line
@@ -71,9 +71,9 @@ if ($cmd=="create_symlink"){ 
	if (isset($_GET['path'])) {

	if (isset($_GET['path'])) {

		$path = $_GET['path'];

		$path = $_GET['path'];

		if (is_dir($path)){

		if (is_dir($path)){

			//exec("ln -sf $path /www/pages/video;sync");

			exec("ln -sf $path /www/pages/video;sync");

			if (file_exists("/tmp/video")) unlink("/tmp/video");

			//if (file_exists("/tmp/video")) unlink("/tmp/video");

                        exec("ln -sf $path /tmp/video");

                        //exec("ln -sf $path /tmp/video");

		}

		}

	}

	}

}

}
@@ -90,7 +90,7 @@ if ($cmd=="start"){ 
	fprintf($fcmd,"exit;\n");

	fprintf($fcmd,"exit;\n");

	exec('sync');

	exec('sync');

}else if ($cmd=="default"){

}else if ($cmd=="default"){

	fprintf($fcmd,"format=mov;exif=0;prefix=/tmp/mnt/sda1/;\n");

	fprintf($fcmd,"format=mov;exif=0;prefix=/mnt/sda1/;\n");

}else{

}else{

	fprintf($fcmd,"$cmd\n");

	fprintf($fcmd,"$cmd\n");

	//exec('sync');

	//exec('sync');

recipes-core/images/core-image-elphel393-initramfs.bb

+4 −0
Original line number Original line Diff line number Diff line
@@ -20,3 +20,7 @@ IMAGE_ROOTFS_SIZE = "8192" 




BAD_RECOMMENDATIONS += "busybox-syslog"

BAD_RECOMMENDATIONS += "busybox-syslog"

 

 

do_compile_append(){

    echo "VIRTUAL-RUNTIME_base-utils= ${VIRTUAL-RUNTIME_base-utils}"

    echo "ROOTFS_BOOTSTRAP_INSTALL= ${ROOTFS_BOOTSTRAP_INSTALL}"

}
 
 No newline at end of file

recipes-core/init-elphel393/files/init_elphel393

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ DAEMON=/usr/sbin/init_elphel393 
NAME=init_elphel393

NAME=init_elphel393

DESC="extra init scripts"

DESC="extra init scripts"





MNTPOINT=/tmp/mnt/mmc

MNTPOINT=/mnt/mmc

MMCDEV=/dev/mmcblk0p1

MMCDEV=/dev/mmcblk0p1

SOME_SCRIPT=init_elphel393.sh

SOME_SCRIPT=init_elphel393.sh

recipes-core/init-elphel393/files/init_elphel393.sh

+5 −5
Original line number Original line Diff line number Diff line
@@ -15,19 +15,19 @@ SATA_EN=1 




ifconfig eth0 192.168.0.9

ifconfig eth0 192.168.0.9





PYDIR=/tmp/local/bin

PYDIR=/usr/local/bin





mkdir /tmp/local

#mkdir /tmp/local

cp -r /usr/local/bin $PYDIR

#cp -r /usr/local/bin $PYDIR





cd /usr/local/verilog/

cd /usr/local/verilog/





if [ $SENSOR_TYPE -eq 5 ]; then

if [ $SENSOR_TYPE -eq 5 ]; then

    ln -sf x393_parallel.bit x393.bit

    $PYDIR/test_mcntrl.py @startup5 >> /dev/null 2>&1 &

    $PYDIR/test_mcntrl.py @startup5 >> /dev/null 2>&1 &

    ln -sf /usr/local/verilog/x393_parallel.bit /tmp/x393.bit

else

else

    ln -sf x393_hispi.bit x393.bit

    $PYDIR/test_mcntrl.py @startup14 >> /dev/null 2>&1 &

    $PYDIR/test_mcntrl.py @startup14 >> /dev/null 2>&1 &

    ln -sf /usr/local/verilog/x393_hispi.bit /tmp/x393.bit

fi

fi

sleep 10

sleep 10