Merge branch 'master' into krogoth

Author: Intel Aero

conf/bblayers.conf.sample

@@ -16,6 +16,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-intel-aero \
   ##OEROOT##/meta-intel-aero-connectivity \
   ##OEROOT##/meta-intel-aero-librealsense \
+  ##OEROOT##/intel-aero-samples \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-networking \

conf/layer.conf

@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "intelaero"
 BBFILE_PATTERN_intelaero = "^${LAYERDIR}/"
-BBFILE_PRIORITY_intelaero = "5"
+BBFILE_PRIORITY_intelaero = "6"
 LAYERVERSION_intelaero = "0"

conf/machine/intel-aero.conf

@@ -9,5 +9,5 @@ require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "spidev"
-KERNEL_MODULE_AUTOLOAD += "spi_imu spi_fpga"
+KERNEL_MODULE_AUTOLOAD += "spi_imu spi_fpga spi_can"
 CORE_IMAGE_EXTRA_INSTALL += "librealsense-graphical-examples"

recipes-airmap/airmap/airmap_0.1.bb recipes-airmap/airmap/airmap_1.8.bbrecipes-airmap/airmap/airmap_0.1.bb renamed to recipes-airmap/airmap/airmap_1.8.bb

@@ -8,7 +8,7 @@ DESCRIPTION = "Description: The AirMap airspace management system facilitates \
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d9bb3515869c0f426cb8441c899ae7f5"
 
-RDEPENDS_${PN} += "python-json libgps libgpsd gpsd-conf gpsd-gpsctl gps-utils"
+RDEPENDS_${PN} += "python-json libgps libgpsd gpsd-conf gpsd-gpsctl gps-utils python-paho-mqtt"
 
 SRC_URI = "file://requests-master.zip \
 	file://AirMapSDK-Embedded.zip \

recipes-airmap/airmap/files/AirMapSDK-Embedded.zip

@@ -14,6 +14,7 @@ IMAGE_INSTALL += "gstreamer1.0 gst-player \
 				aero-watchdog \
 				aero-utils \
 				px4-fw \
+				mavlink-router \
 				"
 
 # Build tools
@@ -46,3 +47,15 @@ GRUB_TIMEOUT = "3"
 
 # librealsense
 IMAGE_INSTALL += "librealsense"
+
+addtask create_link after do_rootfs before do_image
+addtask create_os_version_file after do_rootfs before do_image
+
+do_create_link() {
+	ln -s /lib ${WORKDIR}/rootfs/lib64
+}
+
+do_create_os_version_file() {
+	echo "v01.00.04" > ${WORKDIR}/rootfs/etc/os_version
+	chmod 444 ${WORKDIR}/rootfs/etc/os_version
+}

recipes-core/images/intel-aero-image.bb

@@ -0,0 +1,9 @@
+#!/bin/sh
+# This script will:
+# a) Read and store BIOS version
+# b) Make os_version file immutable
+
+dmesg | grep DMI > /etc/bios_version
+chmod 444 /etc/bios_version
+chattr +i /etc/bios_version
+chattr +i /etc/os_version

recipes-core/initscripts/initscripts/build_version.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+red=437
+blue=403
+green=397
+
+if [ ! -e /sys/class/gpio/gpio$red ]; then
+        echo $red > /sys/class/gpio/export
+fi
+if [ ! -e /sys/class/gpio/gpio$green ]; then
+        echo $green > /sys/class/gpio/export
+fi
+if [ ! -e /sys/class/gpio/gpio$blue ]; then
+        echo $blue > /sys/class/gpio/export
+fi
+
+echo 0 > /sys/class/gpio/gpio$red/value
+echo 0 > /sys/class/gpio/gpio$blue/value
+echo 1 > /sys/class/gpio/gpio$green/value
+echo $red > /sys/class/gpio/unexport
+echo $blue > /sys/class/gpio/unexport

recipes-core/initscripts/initscripts/init_complete.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+red=437
+green=397
+blue=403
+
+# Check if GPIO's are already exported
+if [ ! -e /sys/class/gpio/gpio$red ]; then
+	echo $red > /sys/class/gpio/export
+fi
+if [ ! -e /sys/class/gpio/gpio$green ]; then
+	echo $green > /sys/class/gpio/export
+fi
+if [ ! -e /sys/class/gpio/gpio$blue ]; then
+	echo $blue > /sys/class/gpio/export
+fi
+
+# Set direction
+echo out > /sys/class/gpio/gpio$red/direction
+echo out > /sys/class/gpio/gpio$blue/direction
+echo out > /sys/class/gpio/gpio$green/direction
+
+echo 0 > /sys/class/gpio/gpio$green/value
+echo 1 > /sys/class/gpio/gpio$red/value
+echo 1 > /sys/class/gpio/gpio$blue/value