Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit d058b2c

Browse files
author
Intel Aero
committed
Merge branch 'master' into krogoth
2 parents e6226df + cea218c commit d058b2c

30 files changed

+1044
-463
lines changed

conf/bblayers.conf.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ BBLAYERS ?= " \
1616
##OEROOT##/meta-intel-aero \
1717
##OEROOT##/meta-intel-aero-connectivity \
1818
##OEROOT##/meta-intel-aero-librealsense \
19+
##OEROOT##/intel-aero-samples \
1920
##OEROOT##/meta-openembedded/meta-oe \
2021
##OEROOT##/meta-openembedded/meta-python \
2122
##OEROOT##/meta-openembedded/meta-networking \

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
77

88
BBFILE_COLLECTIONS += "intelaero"
99
BBFILE_PATTERN_intelaero = "^${LAYERDIR}/"
10-
BBFILE_PRIORITY_intelaero = "5"
10+
BBFILE_PRIORITY_intelaero = "6"
1111
LAYERVERSION_intelaero = "0"

conf/machine/intel-aero.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ require conf/machine/include/tune-core2.inc
99
require conf/machine/include/genericx86-common.inc
1010

1111
MACHINE_EXTRA_RRECOMMENDS += "spidev"
12-
KERNEL_MODULE_AUTOLOAD += "spi_imu spi_fpga"
12+
KERNEL_MODULE_AUTOLOAD += "spi_imu spi_fpga spi_can"
1313
CORE_IMAGE_EXTRA_INSTALL += "librealsense-graphical-examples"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DESCRIPTION = "Description: The AirMap airspace management system facilitates \
88
LICENSE = "Apache-2.0"
99
LIC_FILES_CHKSUM = "file://LICENSE;md5=d9bb3515869c0f426cb8441c899ae7f5"
1010

11-
RDEPENDS_${PN} += "python-json libgps libgpsd gpsd-conf gpsd-gpsctl gps-utils"
11+
RDEPENDS_${PN} += "python-json libgps libgpsd gpsd-conf gpsd-gpsctl gps-utils python-paho-mqtt"
1212

1313
SRC_URI = "file://requests-master.zip \
1414
file://AirMapSDK-Embedded.zip \
647 KB
Binary file not shown.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ IMAGE_INSTALL += "gstreamer1.0 gst-player \
1414
aero-watchdog \
1515
aero-utils \
1616
px4-fw \
17+
mavlink-router \
1718
"
1819

1920
# Build tools
@@ -46,3 +47,15 @@ GRUB_TIMEOUT = "3"
4647

4748
# librealsense
4849
IMAGE_INSTALL += "librealsense"
50+
51+
addtask create_link after do_rootfs before do_image
52+
addtask create_os_version_file after do_rootfs before do_image
53+
54+
do_create_link() {
55+
ln -s /lib ${WORKDIR}/rootfs/lib64
56+
}
57+
58+
do_create_os_version_file() {
59+
echo "v01.00.04" > ${WORKDIR}/rootfs/etc/os_version
60+
chmod 444 ${WORKDIR}/rootfs/etc/os_version
61+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
# This script will:
3+
# a) Read and store BIOS version
4+
# b) Make os_version file immutable
5+
6+
dmesg | grep DMI > /etc/bios_version
7+
chmod 444 /etc/bios_version
8+
chattr +i /etc/bios_version
9+
chattr +i /etc/os_version
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/sh
2+
3+
red=437
4+
blue=403
5+
green=397
6+
7+
if [ ! -e /sys/class/gpio/gpio$red ]; then
8+
echo $red > /sys/class/gpio/export
9+
fi
10+
if [ ! -e /sys/class/gpio/gpio$green ]; then
11+
echo $green > /sys/class/gpio/export
12+
fi
13+
if [ ! -e /sys/class/gpio/gpio$blue ]; then
14+
echo $blue > /sys/class/gpio/export
15+
fi
16+
17+
echo 0 > /sys/class/gpio/gpio$red/value
18+
echo 0 > /sys/class/gpio/gpio$blue/value
19+
echo 1 > /sys/class/gpio/gpio$green/value
20+
echo $red > /sys/class/gpio/unexport
21+
echo $blue > /sys/class/gpio/unexport
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
3+
red=437
4+
green=397
5+
blue=403
6+
7+
# Check if GPIO's are already exported
8+
if [ ! -e /sys/class/gpio/gpio$red ]; then
9+
echo $red > /sys/class/gpio/export
10+
fi
11+
if [ ! -e /sys/class/gpio/gpio$green ]; then
12+
echo $green > /sys/class/gpio/export
13+
fi
14+
if [ ! -e /sys/class/gpio/gpio$blue ]; then
15+
echo $blue > /sys/class/gpio/export
16+
fi
17+
18+
# Set direction
19+
echo out > /sys/class/gpio/gpio$red/direction
20+
echo out > /sys/class/gpio/gpio$blue/direction
21+
echo out > /sys/class/gpio/gpio$green/direction
22+
23+
echo 0 > /sys/class/gpio/gpio$green/value
24+
echo 1 > /sys/class/gpio/gpio$red/value
25+
echo 1 > /sys/class/gpio/gpio$blue/value

recipes-core/initscripts/initscripts/mavlink_bridge.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)