Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 18:07:25 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[python] update python tools to use installed version of pprzlink

Browse Source
This commit is contained in:
Gautier Hattenberger
2018-03-07 21:45:19 +01:00
parent 3ee335965a
commit a628e6af97
16 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ext/pprzlink
+1 -1
Submodule sw/ext/pprzlink updated: 7c7d0abe59...4e92b01af2
sw/ground_segment/joystick/gb2ivy.py
+4 -3
View File
@@ -5,11 +5,12 @@ from __future__ import print_function
import sys import sys
from os import path, getenv from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_SRC and PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../'))) 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/lib/python") # settings_xml
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/atc/atc_frame.py
+2 -2
View File
@@ -28,10 +28,10 @@ import array
from cStringIO import StringIO from cStringIO import StringIO
PPRZ_SRC = os.getenv("PAPARAZZI_SRC", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), PPRZ_HOME = os.getenv("PAPARAZZI_HOME", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)),
'../../../..'))) '../../../..')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
sw/ground_segment/python/dashboard/radiowatchframe.py
+4 -1
View File
@@ -8,7 +8,10 @@ import math
import pynotify import pynotify
import pygame.mixer import pygame.mixer
sys.path.append(os.getenv("PAPARAZZI_HOME") + "/sw/ext/pprzlink/lib/v1.0/python") # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
sw/ground_segment/python/guided_mode_example.py
+4 -3
View File
@@ -5,11 +5,12 @@ from __future__ import print_function
import sys import sys
from os import path, getenv from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_SRC or PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
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/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/messages_app/messagesframe.py
+3 -6
View File
@@ -6,13 +6,10 @@ import threading
from os import path, getenv from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python") sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
PPRZ_HOME = getenv("PAPARAZZI_HOME", PPRZ_SRC)
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/move_waypoint_example.py
+3 -3
View File
@@ -6,10 +6,10 @@ import sys
from os import path, getenv from os import path, getenv
from time import sleep from time import sleep
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/natnet3.x/natnet2ivy.py
-1
View File
@@ -54,7 +54,6 @@ from NatNetClient import NatNetClient
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_HOME + "/var/lib/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
sys.path.append(PPRZ_HOME + "/var/lib/python/pprzlink") # seems needed for messages_xml_map file
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/payload_forward/payload_forward.py
+2 -2
View File
@@ -27,9 +27,9 @@ import jpeg100_decoder
from cStringIO import StringIO from cStringIO import StringIO
PPRZ_SRC = os.getenv("PAPARAZZI_SRC", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..'))) PPRZ_HOME = os.getenv("PAPARAZZI_HOME", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
sw/ground_segment/python/real_time_plot/messagepicker.py
+3 -3
View File
@@ -7,10 +7,10 @@ import sys
import time import time
from os import path, getenv from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/ground_segment/python/real_time_plot/plotpanel.py
+3 -2
View File
@@ -11,11 +11,12 @@ import sys
from os import getenv, path from os import getenv, path
import messagepicker import messagepicker
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_SRC or PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../')))
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../../'))) 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/lib/python")
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
import pprz_env import pprz_env
from pprzlink import messages_xml_map from pprzlink import messages_xml_map
sw/ground_segment/python/redundant_link/link_combiner.py
+3 -2
View File
@@ -30,8 +30,9 @@ import argparse
from ivy.std_api import * from ivy.std_api import *
PPRZ_HOME = os.getenv("PAPARAZZI_HOME") PPRZ_HOME = os.getenv("PAPARAZZI_HOME")
sys.path.append(PPRZ_HOME + "/sw/lib/python") PPRZ_SRC = os.getenv("PAPARAZZI_SRC")
sys.path.append(PPRZ_HOME + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_SRC + "/sw/lib/python")
sys.path.append(PPRZ_HOME + "/var/lib/python")
import pprz_env import pprz_env
from pprzlink import messages_xml_map from pprzlink import messages_xml_map
sw/ground_segment/python/svinfo/svinfoviewer.py
+2 -2
View File
@@ -23,10 +23,10 @@ import sys
import os import os
import math import math
PPRZ_SRC = os.getenv("PAPARAZZI_SRC", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), PPRZ_HOME = os.getenv("PAPARAZZI_HOME", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)),
'../../../..'))) '../../../..')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
sw/simulator/mesonh/mesonh.py
+3 -3
View File
@@ -9,10 +9,10 @@ import struct
import cmath import cmath
import numpy as np import numpy as np
from os import getenv from os import getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") sys.path.append(PPRZ_HOME + "/var/lib/python")
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage
sw/tools/calibration/calib_mag_live.py
+3 -6
View File
@@ -7,13 +7,10 @@ import logging
import sys import sys
from os import path, getenv from os import path, getenv
# if PAPARAZZI_SRC not set, then assume the tree containing this # if PAPARAZZI_HOME not set, then assume the tree containing this
# file is a reasonable substitute # file is a reasonable substitute
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../'))) PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_SRC + "/sw/lib/python") sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python")
PPRZ_HOME = getenv("PAPARAZZI_HOME", PPRZ_SRC)
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
sw/tools/rtp_viewer/rtp_viewer.py
+4 -2
View File
@@ -5,8 +5,10 @@ import sys
import argparse import argparse
from os import path, getenv from os import path, getenv
PPRZ_SRC = getenv("PAPARAZZI_SRC", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../'))) # if PAPARAZZI_HOME not set, then assume the tree containing this
sys.path.append(PPRZ_SRC + "/sw/ext/pprzlink/lib/v1.0/python") # file is a reasonable substitute
PPRZ_HOME = getenv("PAPARAZZI_HOME", path.normpath(path.join(path.dirname(path.abspath(__file__)), '../../../')))
sys.path.append(PPRZ_HOME + "/var/lib/python") # pprzlink
from pprzlink.ivy import IvyMessagesInterface from pprzlink.ivy import IvyMessagesInterface
from pprzlink.message import PprzMessage from pprzlink.message import PprzMessage