Merge remote-tracking branch 'px4/master' into pr-hovergames_airframe

.ci/Jenkinsfile-compile

@@ -41,7 +41,6 @@ pipeline {
                      "cubepilot_cubeyellow_console",
                      "cubepilot_cubeyellow_default",
                      "holybro_durandal-v1_default",
-                     "holybro_durandal-v1_stackcheck",
                      "holybro_kakutef7_default",
                      "holybro_pix32v5_default",
                      "intel_aerofc-v1_default",
@@ -53,7 +52,7 @@ pipeline {
                      "nxp_fmuk66-v3_socketcan",
                      "nxp_fmuk66-v3_rtps",
                      "nxp_fmurt1062-v1_default",
-                     "nxp_rddrone-uavcan146_default",
+                     "nxp_ucans32k146_default",
                      "omnibus_f4sd_default",
                      "px4_fmu-v2_default",
                      "px4_fmu-v2_fixedwing",

.ci/Jenkinsfile-hardware

@@ -836,6 +836,8 @@ void statusFTDI() {
   // run logger
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "logger on"'
   // status commands
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "free"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "work_queue status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "board_adc test"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "commander check"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "commander status"'
@@ -846,14 +848,15 @@ void statusFTDI() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "dataman status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "df"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "dmesg"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "ekf2 status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "free"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "gps status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener adc_report"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener battery_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener cpuload"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_sensor"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_attitude"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_local_position"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_selector_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_sensor_bias"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener estimator_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener logger_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener sensor_accel"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "listener sensor_accel_fifo"'
@@ -901,6 +904,8 @@ void statusFTDI() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "uorb top -1 -a"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "ver all"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "work_queue status"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "ekf2 status"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "free"'
   // stop logger
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-FTDI_*` --cmd "logger off"'
 }
@@ -909,6 +914,8 @@ void statusSEGGER() {
   // run logger
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "logger on"'
   // status commands
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "free"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "work_queue status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "board_adc test"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "commander check"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "commander status"'
@@ -919,12 +926,13 @@ void statusSEGGER() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "dataman status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "df -h"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "dmesg"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "ekf2 status"'
-  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "free"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "gps status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener adc_report"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener battery_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener cpuload"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener estimator_attitude"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener estimator_local_position"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener estimator_selector_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener estimator_sensor_bias"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener estimator_status"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "listener logger_status"'
@@ -974,6 +982,8 @@ void statusSEGGER() {
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "uorb top -1 -a"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "ver all"'
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "work_queue status"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "ekf2 status"'
+  sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "free"'
   // stop logger
   sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-SEGGER_*` --cmd "logger off"'
 }

.github/workflows/compile_nuttx.yml

@@ -27,7 +27,6 @@ jobs:
           cubepilot_cubeyellow_console,
           cubepilot_cubeyellow_default,
           holybro_durandal-v1_default,
-          holybro_durandal-v1_stackcheck,
           holybro_kakutef7_default,
           holybro_pix32v5_default,
           intel_aerofc-v1_default,
@@ -40,7 +39,7 @@ jobs:
           nxp_fmuk66-v3_socketcan,
           nxp_fmuk66-v3_rtps,
           nxp_fmurt1062-v1_default,
-          nxp_rddrone-uavcan146_default,
+          nxp_ucans32k146_default,
           omnibus_f4sd_default,
           px4_fmu-v2_default,
           px4_fmu-v2_fixedwing,

.github/workflows/sitl_tests.yml

@@ -28,9 +28,9 @@ jobs:
         token: ${{ secrets.ACCESS_TOKEN }}
 
     - name: Download MAVSDK
-      run: wget https://github.com/mavlink/MAVSDK/releases/download/v0.30.1/mavsdk_0.30.1_ubuntu18.04_amd64.deb
+      run: wget https://github.com/mavlink/MAVSDK/releases/download/v0.33.1/mavsdk_0.33.1_ubuntu20.04_amd64.deb
     - name: Install MAVSDK
-      run: dpkg -i mavsdk_0.30.1_ubuntu18.04_amd64.deb
+      run: dpkg -i mavsdk_0.33.1_ubuntu20.04_amd64.deb
 
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp
@@ -106,7 +106,7 @@ jobs:
 
     - name: Upload logs to flight review
       if: failure()
-      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ./build/px4_sitl_default/tmp/rootfs/log/*/*.ulg
+      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ${GITHUB_WORKSPACE}/build/px4_sitl_default/tmp_mavsdk_tests/rootfs/log/*/*.ulg
 
     - name: Upload px4 binary
       if: failure()

.gitmodules

@@ -12,23 +12,23 @@
 	branch = master
 [submodule "Tools/sitl_gazebo"]
 	path = Tools/sitl_gazebo
-	url = https://github.com/PX4/sitl_gazebo.git
+	url = https://github.com/PX4/PX4-SITL_gazebo.git
 	branch = master
 [submodule "src/lib/matrix"]
 	path = src/lib/matrix
-	url = https://github.com/PX4/Matrix.git
+	url = https://github.com/PX4/PX4-Matrix
 	branch = master
 [submodule "src/lib/ecl"]
 	path = src/lib/ecl
-	url = https://github.com/PX4/ecl.git
+	url = https://github.com/PX4/PX4-ECL
 	branch = master
 [submodule "boards/atlflight/cmake_hexagon"]
 	path = boards/atlflight/cmake_hexagon
 	url = https://github.com/PX4/cmake_hexagon.git
 	branch = px4
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
-	url = https://github.com/PX4/GpsDrivers.git
+	url = https://github.com/PX4/PX4-GPSDrivers
 	branch = master
 [submodule "src/modules/micrortps_bridge/micro-CDR"]
 	path = src/modules/micrortps_bridge/micro-CDR
@@ -37,11 +37,11 @@
 [submodule "platforms/nuttx/NuttX/nuttx"]
 	path = platforms/nuttx/NuttX/nuttx
 	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-9.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
 [submodule "platforms/nuttx/NuttX/apps"]
 	path = platforms/nuttx/NuttX/apps
 	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-9.1.0+
+	branch = px4_firmware_nuttx-10.0.0+
 [submodule "platforms/qurt/dspal"]
 	path = platforms/qurt/dspal
 	url = https://github.com/ATLFlight/dspal.git

Jenkinsfile

@@ -210,10 +210,12 @@ pipeline {
             sh('export')
             unstash 'metadata_airframes'
             unstash 'metadata_parameters'
+            unstash 'metadata_module_documentation'
             withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
               sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_user_guide.git')
               sh('cp airframes.md px4_user_guide/en/airframes/airframe_reference.md')
               sh('cp parameters.md px4_user_guide/en/advanced_config/parameter_reference.md')
+              sh('cp -R modules/*.md px4_user_guide/en/modules/')
               sh('cd px4_user_guide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
               sh('cd px4_user_guide; git push origin master || true')
               sh('rm -rf px4_user_guide')

README.md

@@ -40,8 +40,12 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/master/en/co
 
 ## Maintenance Team
 
-  * Project: Founder - [Lorenz Meier](https://github.com/LorenzMeier), Architecture: [Daniel Agar](https://github.com/dagar)
-    * [Dev Call](https://github.com/PX4/Firmware/labels/devcall) - [Ramon Roche](https://github.com/mrpollo)
+  * Project: Founder
+    * [Lorenz Meier](https://github.com/LorenzMeier)
+  * Architecture
+    * [Daniel Agar](https://github.com/dagar)
+  * [Dev Call](https://github.com/PX4/Firmware/labels/devcall)
+    * [Ramon Roche](https://github.com/mrpollo)
   * Communication Architecture
     * [Beat Kueng](https://github.com/bkueng)
     * [Julian Oes](https://github.com/JulianOes)
@@ -55,15 +59,22 @@ The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/master/en/co
     * [Roman Bapst](https://github.com/RomanBapst)
   * [Fixed Wing Flight Control](https://github.com/PX4/Firmware/labels/fixedwing)
     * [Roman Bapst](https://github.com/RomanBapst)
-  * OS / NuttX [David Sidrane](https://github.com/davids5)
-  * Driver Architecture [Daniel Agar](https://github.com/dagar)
-  * Commander Architecture [Julian Oes](https://github.com/julianoes)
-  * [UAVCAN](https://github.com/PX4/Firmware/labels/uavcan) [Daniel Agar](https://github.com/dagar)
-  * [State Estimation](https://github.com/PX4/Firmware/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22) - [Paul Riseborough](https://github.com/priseborough)
+  * OS / NuttX
+    * [David Sidrane](https://github.com/davids5)
+  * Driver Architecture
+    * [Daniel Agar](https://github.com/dagar)
+  * Commander Architecture
+    * [Julian Oes](https://github.com/julianoes)
+  * [UAVCAN](https://github.com/PX4/Firmware/labels/uavcan)
+    * [Daniel Agar](https://github.com/dagar)
+  * [State Estimation](https://github.com/PX4/Firmware/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22)
+    * [Paul Riseborough](https://github.com/priseborough)
   * Vision based navigation
     * [Julian Kent](https://github.com/jkflying)
-  * Obstacle Avoidance - [Martina Rivizzigno](https://github.com/mrivi)
-  * RTPS/ROS2 Interface - [Nuno Marques](https://github.com/TSC21)
+  * Obstacle Avoidance
+    * [Martina Rivizzigno](https://github.com/mrivi)
+  * RTPS/ROS2 Interface
+    * [Nuno Marques](https://github.com/TSC21)
 
 See also [maintainers list](https://px4.io/community/maintainers/) (px4.io) and the [contributors list](https://github.com/PX4/Firmware/graphs/contributors) (Github).
 

ROMFS/cannode/init.d/rcS

@@ -14,7 +14,7 @@ set +e
 # NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
 #
 #------------------------------------------------------------------------------
-
+set R /
 #
 # Mount the procfs.
 #
@@ -57,7 +57,7 @@ fi
 #
 # Optional board defaults: rc.board_defaults
 #
-set BOARD_RC_DEFAULTS /etc/init.d/rc.board_defaults
+set BOARD_RC_DEFAULTS ${R}etc/init.d/rc.board_defaults
 if [ -f $BOARD_RC_DEFAULTS ]
 then
 	echo "Board defaults: ${BOARD_RC_DEFAULTS}"
@@ -83,7 +83,7 @@ fi
 #
 # board sensors: rc.sensors
 #
-set BOARD_RC_SENSORS /etc/init.d/rc.board_sensors
+set BOARD_RC_SENSORS ${R}etc/init.d/rc.board_sensors
 if [ -f $BOARD_RC_SENSORS ]
 then
 	echo "Board sensors: ${BOARD_RC_SENSORS}"
@@ -95,7 +95,7 @@ unset BOARD_RC_SENSORS
 # Start UART/Serial device drivers.
 # Note: rc.serial is auto-generated from Tools/serial/generate_config.py
 #
-. /etc/init.d/rc.serial
+. ${R}etc/init.d/rc.serial
 
 # Check for flow sensor
 if param compare SENS_EN_PX4FLOW 1
@@ -104,3 +104,4 @@ then
 fi
 
 uavcannode start
+unset R

ROMFS/px4fmu_common/init.d-posix/airframes/10016_iris

@@ -7,6 +7,6 @@
 # @maintainer Julian Oes <[email protected]>
 #
 
-sh /etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.mc_defaults
 
 set MIXER quad_w

ROMFS/px4fmu_common/init.d-posix/airframes/10020_if750a

@@ -6,7 +6,7 @@
 # @type Quadrotor
 #
 
-sh /etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.mc_defaults
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/10030_px4vision

@@ -6,6 +6,6 @@
 # @type Quadrotor
 #
 
-sh /etc/init.d/airframes/4016_holybro_px4vision
+. ${R}etc/init.d/airframes/4016_holybro_px4vision
 
 set MIXER quad_x

ROMFS/px4fmu_common/init.d-posix/airframes/1010_iris_opt_flow

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1011_iris_irlock

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1012_iris_rplidar

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1013_iris_vision

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1014_solo

@@ -5,7 +5,7 @@
 # @type Quadrotor
 #
 
-sh /etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.mc_defaults
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1015_iris_obs_avoid

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1016_iris_rtps

@@ -5,4 +5,4 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris

ROMFS/px4fmu_common/init.d-posix/airframes/1017_iris_opt_flow_mockup

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1018_iris_vision_velocity

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1019_iris_dual_gps

@@ -5,7 +5,7 @@
 # @type Quadrotor Wide
 #
 
-sh /etc/init.d-posix/airframes/10016_iris
+. ${R}etc/init.d-posix/airframes/10016_iris
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1020_uuv_generic

@@ -3,7 +3,7 @@
 # @name UUV
 #
 
-sh /etc/init.d/rc.uuv_defaults
+. ${R}etc/init.d/rc.uuv_defaults
 
 if [ $AUTOCNF = yes ]
 then

ROMFS/px4fmu_common/init.d-posix/airframes/1021_uuv_hippocampus

@@ -3,7 +3,7 @@
 # @name Hippocampus UUV
 #
 
-sh /etc/init.d/rc.uuv_defaults
+. ${R}etc/init.d/rc.uuv_defaults
 
 if [ $AUTOCNF = yes ]
 then