mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-02 20:28:37 +08:00
Merged master branch
This commit is contained in:
@@ -39,28 +39,6 @@ fi
|
|||||||
#
|
#
|
||||||
param set MAV_TYPE 2
|
param set MAV_TYPE 2
|
||||||
|
|
||||||
#
|
|
||||||
# Check if PX4IO Firmware should be upgraded (from Andrew Tridgell)
|
|
||||||
#
|
|
||||||
if [ -f /fs/microsd/px4io.bin ]
|
|
||||||
then
|
|
||||||
echo "PX4IO Firmware found. Checking Upgrade.."
|
|
||||||
if cmp /fs/microsd/px4io.bin /fs/microsd/px4io.bin.current
|
|
||||||
then
|
|
||||||
echo "No newer version, skipping upgrade."
|
|
||||||
else
|
|
||||||
echo "Loading /fs/microsd/px4io.bin"
|
|
||||||
if px4io update /fs/microsd/px4io.bin > /fs/microsd/px4io_update.log
|
|
||||||
then
|
|
||||||
cp /fs/microsd/px4io.bin /fs/microsd/px4io.bin.current
|
|
||||||
echo "Flashed /fs/microsd/px4io.bin OK" >> /fs/microsd/px4io_update.log
|
|
||||||
else
|
|
||||||
echo "Failed flashing /fs/microsd/px4io.bin" >> /fs/microsd/px4io_update.log
|
|
||||||
echo "Failed to upgrade PX4IO firmware - check if PX4IO is in bootloader mode"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Start MAVLink (depends on orb)
|
# Start MAVLink (depends on orb)
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -39,28 +39,6 @@ fi
|
|||||||
#
|
#
|
||||||
param set MAV_TYPE 2
|
param set MAV_TYPE 2
|
||||||
|
|
||||||
#
|
|
||||||
# Check if PX4IO Firmware should be upgraded (from Andrew Tridgell)
|
|
||||||
#
|
|
||||||
if [ -f /fs/microsd/px4io2.bin ]
|
|
||||||
then
|
|
||||||
echo "PX4IO Firmware found. Checking Upgrade.."
|
|
||||||
if cmp /fs/microsd/px4io2.bin /fs/microsd/px4io2.cur
|
|
||||||
then
|
|
||||||
echo "No newer version, skipping upgrade."
|
|
||||||
else
|
|
||||||
echo "Loading /fs/microsd/px4io2.bin"
|
|
||||||
if px4io update /fs/microsd/px4io2.bin > /fs/microsd/px4io2.log
|
|
||||||
then
|
|
||||||
cp /fs/microsd/px4io2.bin /fs/microsd/px4io2.cur
|
|
||||||
echo "Flashed /fs/microsd/px4io2.bin OK" >> /fs/microsd/px4io2.log
|
|
||||||
else
|
|
||||||
echo "Failed flashing /fs/microsd/px4io2.bin" >> /fs/microsd/px4io2.log
|
|
||||||
echo "Failed to upgrade PX4IO2 firmware - check if PX4IO2 is in bootloader mode"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Start MAVLink (depends on orb)
|
# Start MAVLink (depends on orb)
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -81,6 +81,28 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#
|
||||||
|
# Check if PX4IO Firmware should be upgraded (from Andrew Tridgell)
|
||||||
|
#
|
||||||
|
if [ -f /fs/microsd/px4io.bin ]
|
||||||
|
then
|
||||||
|
echo "PX4IO Firmware found. Checking Upgrade.."
|
||||||
|
if cmp /fs/microsd/px4io.bin /fs/microsd/px4io.cur
|
||||||
|
then
|
||||||
|
echo "No newer version, skipping upgrade."
|
||||||
|
else
|
||||||
|
echo "Loading /fs/microsd/px4io.bin"
|
||||||
|
if px4io update /fs/microsd/px4io.bin > /fs/microsd/px4io.log
|
||||||
|
then
|
||||||
|
cp /fs/microsd/px4io.bin /fs/microsd/px4io.cur
|
||||||
|
echo "Flashed /fs/microsd/px4io.bin OK" >> /fs/microsd/px4io.log
|
||||||
|
else
|
||||||
|
echo "Failed flashing /fs/microsd/px4io.bin" >> /fs/microsd/px4io.log
|
||||||
|
echo "Failed to upgrade px4io firmware - check if px4io is in bootloader mode"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
# Check if auto-setup from one of the standard scripts is wanted
|
# Check if auto-setup from one of the standard scripts is wanted
|
||||||
# SYS_AUTOSTART = 0 means no autostart (default)
|
# SYS_AUTOSTART = 0 means no autostart (default)
|
||||||
|
|||||||
Reference in New Issue
Block a user