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

Commit e6226df

Browse files
author
intel-aero
authored
Merge pull request #11 from intel-aero/master
Rebase master (Release v01.00.03) to krogoth
2 parents b61432f + 879de50 commit e6226df

35 files changed

+4665
-374
lines changed

‎conf/bblayers.conf.sample‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
2+
# changes incompatibly
3+
POKY_BBLAYERS_CONF_VERSION = "2"
4+
5+
BBPATH = "${TOPDIR}"
6+
BBFILES ?= ""
7+
8+
BBLAYERS ?= " \
9+
##OEROOT##/meta \
10+
##OEROOT##/meta-poky \
11+
##OEROOT##/meta-yocto-bsp \
12+
##OEROOT##/meta-qt4 \
13+
##OEROOT##/meta-qt5 \
14+
##OEROOT##/meta-uav \
15+
##OEROOT##/meta-ros \
16+
##OEROOT##/meta-intel-aero \
17+
##OEROOT##/meta-intel-aero-connectivity \
18+
##OEROOT##/meta-intel-aero-librealsense \
19+
##OEROOT##/meta-openembedded/meta-oe \
20+
##OEROOT##/meta-openembedded/meta-python \
21+
##OEROOT##/meta-openembedded/meta-networking \
22+
"
23+

conf/local.conf renamed to conf/local.conf.sample

File renamed without changes.

‎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"
12+
KERNEL_MODULE_AUTOLOAD += "spi_imu spi_fpga"
1313
CORE_IMAGE_EXTRA_INSTALL += "librealsense-graphical-examples"

‎recipes-core/eee-acpi-scripts/eee-acpi-scripts_git.bbappend‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2+
3+
SRC_URI += "file://0001-intel-aero-rename-PWRF-to-PBTN.patch \
4+
file://0002-intel-aero-shutdown-to-handle-LED-toggling.patch \
5+
"

‎recipes-core/eee-acpi-scripts/files/0001-intel-aero-rename-PWRF-to-PBTN.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From af228d0ca2701032c36f618650e1264cdef16ac1 Mon Sep 17 00:00:00 2001
2+
From: Omar Ramirez Luna <omar.r.ramirez.luna@intel.com>
3+
Date: Wed, 12 Oct 2016 02:30:10 -0700
4+
Subject: [PATCH] intel-aero: rename PWRF to PBTN
5+
6+
In intel-aero platform the power button press is tied to the event
7+
generated to PBTN, acpid will map it to the needed script to
8+
shutdown the platform.
9+
10+
Signed-off-by: Omar Ramirez Luna <omar.r.ramirez.luna@intel.com>
11+
---
12+
events/powerbtn | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/events/powerbtn b/events/powerbtn
16+
index 3722ebf..262d7d3 100644
17+
--- a/events/powerbtn
18+
+++ b/events/powerbtn
19+
@@ -1,2 +1,2 @@
20+
-event=button/power PWRF
21+
+event=button/power PBTN
22+
action=/etc/acpi/actions/power.sh
23+
--
24+
1.9.1
25+

‎recipes-core/eee-acpi-scripts/files/0002-intel-aero-shutdown-to-handle-LED-toggling.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 23a42d308fd21d5dae0d519b1a63f099df1eaa4c Mon Sep 17 00:00:00 2001
2+
From: Omar Ramirez Luna <omar.r.ramirez.luna@intel.com>
3+
Date: Wed, 12 Oct 2016 17:32:03 -0700
4+
Subject: [PATCH] intel-aero: shutdown to handle LED toggling
5+
6+
During shutdown we need to indicate to user that the button press
7+
was registered, as soon as the event is handled we flash
8+
the LED_BLUE_IO on/off for 1 second every 100 ms.
9+
10+
Signed-off-by: Omar Ramirez Luna <omar.r.ramirez.luna@intel.com>
11+
---
12+
actions/power.sh | 1 +
13+
1 file changed, 1 insertion(+)
14+
15+
diff --git a/actions/power.sh b/actions/power.sh
16+
index 8b76ef5..09fe10b 100644
17+
--- a/actions/power.sh
18+
+++ b/actions/power.sh
19+
@@ -1,3 +1,4 @@
20+
#!/bin/sh
21+
22+
+/usr/bin/led_ctrl shutdown_seq
23+
/sbin/shutdown -h now "Power button pressed"
24+
--
25+
1.9.1
26+

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ IMAGE_INSTALL += "gstreamer1.0 gst-player \
1212
gstreamer1.0-meta-base gstreamer1.0-rtsp-server \
1313
jam-stapl \
1414
aero-watchdog \
15+
aero-utils \
16+
px4-fw \
1517
"
1618

1719
# Build tools
@@ -29,6 +31,12 @@ IMAGE_INSTALL += "opencv"
2931
# Dronekit
3032
IMAGE_INSTALL_append = " dronekit-python"
3133

34+
# MavROS
35+
IMAGE_INSTALL_append = " mavros"
36+
37+
# Enable ros comm packagegroup
38+
IMAGE_INSTALL_append = " packagegroup-ros-comm"
39+
3240
# PX4
3341
IMAGE_INSTALL_append = " packagegroup-px4"
3442

‎recipes-core/initscripts/initscripts/mavlink_bridge.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/usr/bin/env python2
2+
3+
import sys
4+
import signal
5+
from threading import Thread
6+
from pymavlink import mavutil
7+
8+
udp_port = 14550
9+
uart_interface = "/dev/ttyS1"
10+
uart_baudrate = 1500000
11+
12+
loop = True
13+
14+
if len(sys.argv) < 2:
15+
print("Usage: ./mavlink_bridge.py <target IP>")
16+
exit()
17+
18+
print("MAVLINK bridge started")
19+
print("%s at %ibps <-> udp:%s:%i" % (uart_interface, uart_baudrate, sys.argv[1], udp_port))
20+
21+
mav_uart_con = mavutil.mavlink_connection(uart_interface, baud=uart_baudrate)
22+
mav_udp_con = mavutil.mavlink_connection("udpin:0.0.0.0:" + str(udp_port))
23+
24+
# Hack to mav_udp_con.write() works
25+
mav_udp_con.last_address = (sys.argv[1], udp_port)
26+
27+
def handler(signal, frame):
28+
global loop
29+
loop = False
30+
31+
def uart_thread_function():
32+
global loop
33+
while loop:
34+
msg = mav_uart_con.recv_match(blocking=True)
35+
if msg != None:
36+
mav_udp_con.write(msg.get_msgbuf())
37+
38+
signal.signal(signal.SIGINT, handler)
39+
uart_thread = Thread(target = uart_thread_function)
40+
uart_thread.start()
41+
42+
while loop:
43+
msg = mav_udp_con.recv_match(blocking=True)
44+
if msg != None:
45+
mav_uart_con.write(msg.get_msgbuf())
46+
47+
print("MAVLINK bridge stopped")
48+

‎recipes-core/initscripts/initscripts/mavlink_bridge.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#! /bin/sh
2+
3+
### BEGIN INIT INFO
4+
# Provides: mavlink_bridge
5+
# Required-Start: $network
6+
# Required-Stop: $network
7+
# Default-Start: 2 3 4 5
8+
# Default-Stop:
9+
### END INIT INFO
10+
11+
# Source function library.
12+
. /etc/init.d/functions
13+
14+
# Functions to do individual actions
15+
start(){
16+
mavlink_bridge.py 192.168.1.2 &
17+
}
18+
stop(){
19+
kill `ps | grep -m 1 'mavlink_bridge.py' | awk '{print $1}'`
20+
}
21+
22+
case "$1" in
23+
start)
24+
start
25+
;;
26+
stop)
27+
stop
28+
;;
29+
restart)
30+
stop
31+
start
32+
;;
33+
status)
34+
ps | grep -m 1 mavlink_bridge.py
35+
;;
36+
*)
37+
echo "Usage: mavlink_bridge { start | stop | status | restart }" >&2
38+
exit 1
39+
;;
40+
esac
41+
42+
exit 0

‎recipes-core/initscripts/initscripts_1.0.bbappend‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/initscripts:"
22

33
SRC_URI += "file://ds4.sh \
44
file://aero-wd.sh \
5+
file://mavlink_bridge.sh \
6+
file://mavlink_bridge.py \
57
"
68

79
do_install_append () {
810
install -m 0755 ${WORKDIR}/ds4.sh ${D}${sysconfdir}/init.d
911
install -m 0755 ${WORKDIR}/aero-wd.sh ${D}${sysconfdir}/init.d
1012

13+
install -m 0755 ${WORKDIR}/mavlink_bridge.sh ${D}${sysconfdir}/init.d
14+
install -d ${D}${sbindir}
15+
install -m 0755 ${WORKDIR}/mavlink_bridge.py ${D}${sbindir}
16+
1117
ln -sf ../init.d/ds4.sh ${D}${sysconfdir}/rc1.d/S10ds4
1218
ln -sf ../init.d/ds4.sh ${D}${sysconfdir}/rc2.d/S10ds4
1319
ln -sf ../init.d/ds4.sh ${D}${sysconfdir}/rc3.d/S10ds4
@@ -19,4 +25,10 @@ do_install_append () {
1925
ln -sf ../init.d/aero-wd.sh ${D}${sysconfdir}/rc3.d/S10aero-wd
2026
ln -sf ../init.d/aero-wd.sh ${D}${sysconfdir}/rc4.d/S10aero-wd
2127
ln -sf ../init.d/aero-wd.sh ${D}${sysconfdir}/rc5.d/S10aero-wd
28+
29+
ln -sf ../init.d/mavlink_bridge.sh ${D}${sysconfdir}/rc1.d/S71mavlink_bridge
30+
ln -sf ../init.d/mavlink_bridge.sh ${D}${sysconfdir}/rc2.d/S71mavlink_bridge
31+
ln -sf ../init.d/mavlink_bridge.sh ${D}${sysconfdir}/rc3.d/S71mavlink_bridge
32+
ln -sf ../init.d/mavlink_bridge.sh ${D}${sysconfdir}/rc4.d/S71mavlink_bridge
33+
ln -sf ../init.d/mavlink_bridge.sh ${D}${sysconfdir}/rc5.d/S71mavlink_bridge
2234
}

0 commit comments

Comments
 (0)