fix errors during pprz installation (#3525)

* fix errors during pprz installation
* Use Wayland for high DPI screens
* remove start.py script
* fix dfu flash stm32

doc/sphinx/source/user_guide/directories_structure.rst

@@ -41,7 +41,6 @@ Here is an extract of the Paparazzi tree:
     │       └── source
     ├── Makefile
     ├── paparazzi
-    ├── start.py
     ├── sw
     │   ├── ext
     │   ├── airborne
@@ -136,7 +135,7 @@ Compiled and generated files are located in the ``var`` directory.
 Launcher
 --------
 
-You can launch Paparazzi  with the eponym executable file ``paparazzi``, or via the configuration utility ``start.py``. In the later case, you can choose what conf file and what control panel file you want to use.
+You can launch Paparazzi with the eponym executable file ``paparazzi``.
 
 
 

doc/sphinx/source/user_guide/gvf_viewer.rst

@@ -56,7 +56,7 @@ The GVF Viewer tool is built inside the GCS map widget but will be deactivated u
   </gcsconf>
   
 
-Once we loaded GVF Viewer, we need an aircraft working with GVF. In order to test some features of this tool, the user can load with ``start.py`` the GVF configurations located in ``conf/userconf/conf_example_gvf.xml`` and compile the simulation target.
+Once we loaded GVF Viewer, we need an aircraft working with GVF. In order to test some features of this tool, the user can load the GVF configurations located in ``conf/userconf/conf_example_gvf.xml`` and compile the simulation target.
 
 How GVF Viewer works
 --------------------

docker/Makefile

@@ -11,7 +11,6 @@ help:
 	@echo "   2. make test             - run make test on pprz-dev"
 	@echo "   2. make terminator       - run terminator on pprz-dev"
 	@echo "   2. make paparazzi        - run ./paparazzi center on pprz-dev"
-	@echo "   2. make start            - run ./start.py on pprz-dev"
 	@echo ""
 
 build:
@@ -35,9 +34,6 @@ bash terminator:
 paparazzi:
 	@bash run.sh -i -t paparazziuav/pprz-dev ./paparazzi
 
-start:
-	@bash run.sh -i -t paparazziuav/pprz-dev ./start.py
-
 test:
 	@bash run.sh -i -t paparazziuav/pprz-dev make test
 

paparazzi

@@ -3,6 +3,9 @@
 import os
 import sys
 
+# Make sure to use Wayland for high DPI screens
+os.environ["QT_QPA_PLATFORM"] = "wayland"
+
 dirname = os.path.dirname(os.path.abspath(__file__))
 PAPARAZZI_HOME = os.getenv("PAPARAZZI_HOME",dirname)
 PAPARAZZI_SRC = os.getenv("PAPARAZZI_SRC",PAPARAZZI_HOME)

setup.py

@@ -27,6 +27,11 @@ def run(args):
     else:
         print("venv successfully created.")
 
+    cmd = ["git", "submodule", "update", "--init", "./sw/ext/pprzlink"]
+    result = subprocess.run(cmd, check=False)
+    if result.returncode:
+        print("Failed to update submodule pprzlink!")
+
     # installing pprzlink
     print("Installing pprzlink...")
     cmd = [f'./{ENV_NAME}/bin/pip', 'install', '-e' , 'sw/ext/pprzlink/lib/v2.0/python']

sw/tools/dfu/stm32_mem.py

@@ -169,8 +169,16 @@ if __name__ == "__main__":
             continue
         try:
             man = dfudev.handle.getString(dfudev.dev.iManufacturer, 30)
+            if isinstance(man, bytes):
+                man = man.decode("utf-8")
+
             product = dfudev.handle.getString(dfudev.dev.iProduct, 30)
+            if isinstance(product, bytes):
+                product = product.decode("utf-8")
+
             serial = dfudev.handle.getString(dfudev.dev.iSerialNumber, 40)
+            if isinstance(serial, bytes):
+                serial = serial.decode("utf-8")
         except Exception as e:
             print("Whoops... could not get device description.")
             print("Exception:", e)

sw/tools/install.py

@@ -96,7 +96,7 @@ class InstallWindow(QWidget):
     def cmd_go(self):
         self.execute('make clean')
         self.execute('make -j1')
-        self.execute('./start.py &')
+        self.execute('./paparazzi &')
 
     def cmd_pdf(self):
         self.view('https://github.com/tudelft/coursePaparazzi/raw/master/paparazzi_crash_course.pdf')
@@ -173,7 +173,7 @@ class InstallWindow(QWidget):
         button10.clicked.connect(self.cmd_doc)
         btn_layout.addWidget(button10)
 
-        button11 = QPushButton('11) Make and ./start.py')
+        button11 = QPushButton('11) Make and start Pprz Center')
         button11.clicked.connect(self.cmd_go)
         btn_layout.addWidget(button11)