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

classes/elphel-dev.bbclass

@@ -33,6 +33,7 @@ EXTRA_OEMAKE = " \
                 USERADD='${ELPHEL393_USERADD}' \
                 REMOTE_USER=${REMOTE_USER} \
                 REMOTE_IP=${REMOTE_IP} \
+                INITSTRING=${INITSTRING} \
                 "
 
 do_compile_prepend() {

classes/elphel-scp.bbclass

 # Adding support for scp files to the target (similar to install) ---
 
-IDENTITY_FILE ?= "-i ~/.ssh/id_rsa"
+IDENTITY_FILE ??= "~/.ssh/id_rsa"
 
 do_target_scp () {
     #Without next echo - no trace of the scp in the log!
+    SSH_COMMAND='tar -C / -xzpf /image.tar.gz; rm -f /image.tar.gz; sync'
     tar -czvf ${WORKDIR}/image.tar.gz -C ${WORKDIR}/image .
-    echo scp ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
-    scp ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
-    echo ssh ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
-    ssh ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
+    echo scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
+    scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
+    echo ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
+    ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
+    
 }
 
 addtask do_target_scp after do_install

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

@@ -53,7 +53,7 @@ IMAGE_INSTALL_append += " \
                          dhcp-client \
                          dhcpcd \
                          linux-firmware-rtl8192cu \
-                         init-elphel393 \
+                         init \
                          overlay-sync \
                          init-tempmon \
                          ahci-blacklist \

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

@@ -3,7 +3,8 @@
 #ifconfig eth0 hw ether 00:0e:64:10:00:02 192.168.0.7
 
 # select sensor type: 5 Mpx (set 5) or 14 Mpx (set 14)
-SENSOR_TYPE=14
+# 14MPix does not work with framepars & parsedit!!!
+SENSOR_TYPE=5
 # imgsrv port number 
 IMGSRV_PORT=2323
 # camogm port number
@@ -14,7 +15,7 @@ CAMOGM_PIPE=/var/volatile/camogm_cmd
 SATA_EN=1
 
 #for andrey:
-ifconfig eth0 192.168.0.7
+ifconfig eth0 192.168.0.9
 
 PYDIR=/usr/local/bin
 VERILOG_DIR=/usr/local/verilog
@@ -24,6 +25,21 @@ imgsrv -p 2323
 #restart PHP - it can get errors while opening/mmaping at startup, then some functions fail
 killall lighttpd; /usr/sbin/lighttpd -f /etc/lighttpd.conf
 /www/pages/exif.php init=/etc/Exif_template.xml
+
+echo "init sensor port"
+
+wget -qO- "localhost/framepars.php?sensor_port=0&cmd=init" > /dev/null 2>&1
+
+autoexposure -p 0 -c 0 -b 0 -d 1  >> /dev/null 2>&1 &
+
+echo "start autoexposure daemon"
+
+wget -qO- "localhost/parsedit.php?immediate&COMPRESSOR_RUN=2&DAEMON_EN=1&AUTOEXP_ON=1&AEXP_FRACPIX=0xff80&AEXP_LEVEL=0xf800&AE_PERIOD=4&AE_THRESH=500&HIST_DIM_01=0x0a000a00&HIST_DIM_23=0x0a000a00&EXP_AHEAD=3" > /dev/null 2>&1
+
+echo "start white balance daemon"
+
+wget -qO- "localhost/parsedit.php?immediate&COMPRESSOR_RUN=2&DAEMON_EN=1&WB_EN=0x1&WB_MASK=0xd&WB_PERIOD=16&WB_WHITELEV=0xfae1&WB_WHITEFRAC=0x028f&WB_SCALE_R=0x10000&WB_SCALE_GB=0x10000&WB_SCALE_B=0x10000&WB_THRESH=500&GAIN_MIN=0x18000&GAIN_MAX=0xfc000&ANA_GAIN_ENABLE=1&GAINR=0x10000&GAING=0x10000&GAINGB=0x10000&GAINB=0x10000" > /dev/null 2>&1
+
 echo "/etc/init_elphel393.sh done"
 exit 0
 

recipes-core/init/init_1.0.bb

+SUMMARY = "init scripts" 
+
+AUTHOR = "Elphel Inc."
+HOMEPAGE = "http://www3.elphel.com/"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
+
+VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-init"
+
+inherit elphel-dev
+
+do_configure[noexec] = "1"
+#do_compile[noexec] = "1"
+
+FILES_${PN} += " ${base_prefix}/etc/* ${base_prefix}/etc/init.d/*"
+
+INITSCRIPT_NAME = "init_elphel393"
+INITSCRIPT_PARAMS = "defaults 95"
+
+inherit update-rc.d
+
+INITSTRING ??= "init_elphel393.sh"
\ No newline at end of file