Merge branch 'master' into guided_velocity

* master: (53 commits)
  [pprzlink] call pymessages with VALIDATE_XML=FALSE
  [pprzlink] update submodule
  [pprzlink] point to messages.xml file in var directory
  [pprlink] remove paparazzi message definition
  [tools] gen_messages_doc.py: use messages.xml from pprzlink by default
  [python] remove pprz_msg and use pprzlink instead
  [datalink] fix bluegiga parser
  [conf] fix tudelft_bebop_flip.xml
  [generators] always put configure options at beginning
  Config files cleanup
  [pprzlink] more datalink include fixing
  [pprzlink] fix datalink include
  [ext] add pprzlink convenience targets
  make sure pprzlink submodule is initialized before building
  [pprzlink] fix conpilation errors with some devices
  [pprzlink] fix path for test progs
  [conf] gps: ublox_utm -> ublox, piksi to shared
  [pprzlink] fix transport files path
  [pprzlink] start fixing some compilation issues
  [pprzlink] generate intermcu messages from pprzlink
  ...
This commit is contained in:
Felix Ruess
2016-01-24 10:52:02 +01:00
343 changed files with 2006 additions and 12786 deletions
@@ -8,7 +8,7 @@ import math
import pynotify
import pygame.mixer
sys.path.append(os.getenv("PAPARAZZI_HOME") + "/sw/lib/python")
sys.path.append(os.getenv("PAPARAZZI_HOME") + "/sw/ext/pprzlink/lib/v1.0/python")
from ivy_msg_interface import IvyMessagesInterface
@@ -9,9 +9,10 @@ from os import path, getenv
# file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
from ivy_msg_interface import IvyMessagesInterface
from pprz_msg.message import PprzMessage
from pprzlink.message import PprzMessage
from settings_xml_parse import PaparazziACSettings
from math import radians
@@ -10,11 +10,12 @@ from os import path, getenv
# file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
PPRZ_HOME = getenv("PAPARAZZI_HOME", PPRZ_SRC)
from ivy_msg_interface import IvyMessagesInterface
from pprz_msg.message import PprzMessage
from pprzlink.message import PprzMessage
WIDTH = 450
LABEL_WIDTH = 166
@@ -9,10 +9,10 @@ from time import sleep
# if PAPARAZZI_SRC not set, then assume the tree containing this
# file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
from ivy_msg_interface import IvyMessagesInterface
from pprz_msg.message import PprzMessage
from pprzlink.message import PprzMessage
class WaypointMover(object):
@@ -10,10 +10,10 @@ from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this
# file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
from ivy_msg_interface import IvyMessagesInterface
from pprz_msg.message import PprzMessage
from pprzlink.message import PprzMessage
class Message(PprzMessage):
@@ -15,9 +15,10 @@ import messagepicker
# file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
import pprz_env
from pprz_msg import messages_xml_map
from pprzlink import messages_xml_map
class PlotData:
@@ -31,9 +31,10 @@ from ivy.std_api import *
PPRZ_HOME = os.getenv("PAPARAZZI_HOME")
sys.path.append(PPRZ_HOME + "/sw/lib/python")
sys.path.append(PPRZ_HOME + "/sw/ext/pprzlink/lib/v1.0/python")
import pprz_env
from pprz_msg import messages_xml_map
from pprzlink import messages_xml_map
class Circular_Buffer:
def __init__(self, size):
@@ -14,9 +14,10 @@ import time
PPRZ_SRC = os.getenv("PAPARAZZI_SRC", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)),
'../../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
import pprz_env
from pprz_msg import messages_xml_map
from pprzlink import messages_xml_map
PING_PERIOD = 5.0
STATUS_PERIOD = 1.0