[python] remove pprz_msg and use pprzlink instead

paparazzi · Jan 14, 2016 · 50dcf96 · 50dcf96
1 parent 9a9f4a0
commit 50dcf96
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 763 deletions.
diff --git a/sw/ext/pprzlink b/sw/ext/pprzlink
diff --git a/sw/ground_segment/python/dashboard/radiowatchframe.py b/sw/ground_segment/python/dashboard/radiowatchframe.py
@@ -8,7 +8,7 @@
 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
 

diff --git a/sw/ground_segment/python/guided_mode_example.py b/sw/ground_segment/python/guided_mode_example.py
@@ -9,9 +9,10 @@
 # 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

diff --git a/sw/ground_segment/python/messages_app/messagesframe.py b/sw/ground_segment/python/messages_app/messagesframe.py
@@ -10,11 +10,12 @@
 # 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

diff --git a/sw/ground_segment/python/move_waypoint_example.py b/sw/ground_segment/python/move_waypoint_example.py
@@ -9,10 +9,10 @@
 # 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):

diff --git a/sw/ground_segment/python/real_time_plot/messagepicker.py b/sw/ground_segment/python/real_time_plot/messagepicker.py
@@ -10,10 +10,10 @@
 # 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):

diff --git a/sw/ground_segment/python/real_time_plot/plotpanel.py b/sw/ground_segment/python/real_time_plot/plotpanel.py
@@ -15,9 +15,10 @@
 # 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:

diff --git a/sw/ground_segment/python/redundant_link/link_combiner.py b/sw/ground_segment/python/redundant_link/link_combiner.py
@@ -31,9 +31,10 @@
 
 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):

diff --git a/sw/ground_segment/python/udp_link/udp_link.py b/sw/ground_segment/python/udp_link/udp_link.py
@@ -14,9 +14,10 @@
 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

diff --git a/sw/lib/python/ivy_msg_interface.py b/sw/lib/python/ivy_msg_interface.py
diff --git a/sw/lib/python/pprz_msg/__init__.py b/sw/lib/python/pprz_msg/__init__.py