fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-22 01:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

rcS: Keep Mag Cal with AUTOCONFIG param reset in rcS, deprecate rcS AUTOCNF param (#19693)

Browse Source 
* Deprecate the rcS AUTOCNF script param and associated logic.

* Update posix rcS to match previous commit.
This commit is contained in:
Mark Sauder
2022-05-23 18:35:22 -06:00
committed by GitHub
parent 639222dd65
commit a1fb9fb7c6
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d-posix/rcS
+2 -11
View File
@@ -95,10 +95,9 @@ fi
if param compare SYS_AUTOCONFIG 1 if param compare SYS_AUTOCONFIG 1
then then
# Reset params except Airframe, RC calibration, sensor calibration, flight modes, total flight time, and next flight UUID.
param reset_all SYS_AUTOSTART RC* CAL_* COM_FLTMODE* LND_FLIGHT* TC_* COM_FLIGHT*
set AUTOCNF yes set AUTOCNF yes
# Wipe out params except RC*, flight modes, total flight time, accel cal, gyro cal, next flight UUID
param reset_all SYS_AUTO* RC* COM_FLTMODE* LND_FLIGHT* TC_* CAL_ACC* CAL_GYRO* COM_FLIGHT*
fi fi
# multi-instance setup # multi-instance setup
@@ -196,14 +195,6 @@ fi
. "$autostart_file" . "$autostart_file"
#
# If autoconfig parameter was set, reset it and save parameters.
#
if [ $AUTOCNF = yes ]
then
param set SYS_AUTOCONFIG 0
fi
# Simulator IMU data provided at 250 Hz # Simulator IMU data provided at 250 Hz
param set IMU_INTEG_RATE 250 param set IMU_INTEG_RATE 250
ROMFS/px4fmu_common/init.d/rcS
+3 -14
View File
@@ -21,7 +21,6 @@ set +e
# it wastes flash # it wastes flash
# #
set R / set R /
set AUTOCNF no
set FCONFIG /fs/microsd/etc/config.txt set FCONFIG /fs/microsd/etc/config.txt
set FEXTRAS /fs/microsd/etc/extras.txt set FEXTRAS /fs/microsd/etc/extras.txt
set FRC /fs/microsd/etc/rc.txt set FRC /fs/microsd/etc/rc.txt
@@ -177,13 +176,12 @@ else
fi fi
# #
# Set AUTOCNF flag to use it in AUTOSTART scripts. # If the airframe has been previously reset SYS_AUTCONFIG will have been set to 1 and other params will be reset on the next boot.
# #
if param greater SYS_AUTOCONFIG 0 if param greater SYS_AUTOCONFIG 0
then then
# Wipe out params except RC*, flight modes, total flight time, calibration parameters, next flight UUID # Reset params except Airframe, RC calibration, sensor calibration, flight modes, total flight time, and next flight UUID.
param reset_all SYS_AUTO* RC* COM_FLTMODE* LND_FLIGHT* TC_* CAL_ACC* CAL_GYRO* COM_FLIGHT* param reset_all SYS_AUTOSTART RC* CAL_* COM_FLTMODE* LND_FLIGHT* TC_* COM_FLIGHT*
set AUTOCNF yes
fi fi
# #
@@ -274,14 +272,6 @@ else
. $FCONFIG . $FCONFIG
fi fi
#
# If autoconfig parameter was set, reset it and save parameters.
#
if [ $AUTOCNF = yes ]
then
param set SYS_AUTOCONFIG 0
fi
# #
# Check if UAVCAN is enabled, default to it for ESCs. # Check if UAVCAN is enabled, default to it for ESCs.
# #
@@ -565,7 +555,6 @@ fi
# Unset all script parameters to free RAM. # Unset all script parameters to free RAM.
# #
unset R unset R
unset AUTOCNF
unset FCONFIG unset FCONFIG
unset FEXTRAS unset FEXTRAS
unset FRC unset FRC