Merge branch 'ArduPilot:master' into add_AEROFOX_H7_hwdef

Tools/AP_Bootloader/board_types.txt

@@ -335,6 +335,9 @@ AP_HW_MFT-SEMA100                    2000
 
 AP_HW_SakuraRC-H743                  2714
 
+# IDs 4000-4009 reserved for Karshak Drones
+AP_HW_KRSHKF7_MINI                   4000
+
 # IDs 4200-4220 reserved for HAKRC
 AP_HW_HAKRC_F405                     4200
 AP_HW_HAKRC_F405Wing                 4201

Tools/CodeStyle/astylerc

@@ -1,6 +1,6 @@
 style=linux
 keep-one-line-statements
-add-brackets
+add-braces
 indent=spaces=4
 indent-col1-comments
 min-conditional-indent=0

Tools/environment_install/install-prereqs-arch.sh

@@ -33,6 +33,7 @@ PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect argparse matplotlib pyparsin
 ARM_ROOT="gcc-arm-none-eabi-10-2020-q4-major"
 ARM_TARBALL="$ARM_ROOT-x86_64-linux.tar.bz2"
 ARM_TARBALL_URL="https://firmware.ardupilot.org/Tools/STM32-tools/$ARM_TARBALL"
+ARM_TARBALL_CHECKSUM="21134caa478bbf5352e239fbc6e2da3038f8d2207e089efc96c3b55f1edcd618" 
 
 # Ardupilot Tools
 ARDUPILOT_TOOLS="ardupilot/Tools/autotest"
@@ -85,9 +86,33 @@ pip3 -q install -U $PYTHON_PKGS
 if [ ! -d $OPT/$ARM_ROOT ]; then
     (
         cd $OPT;
-        sudo wget --progress=dot:giga $ARM_TARBALL_URL;
-        sudo tar xjf ${ARM_TARBALL};
-        sudo rm ${ARM_TARBALL};
+
+        # Check if file exists and verify checksum
+        download_required=false
+        if [ -e "$ARM_TARBALL" ]; then
+            echo "File exists. Verifying checksum..."
+
+            # Calculate the checksum of the existing file
+            ACTUAL_CHECKSUM=$(sha256sum "$ARM_TARBALL" | awk '{ print $1 }')
+
+            # Compare the actual checksum with the expected one
+            if [ "$ACTUAL_CHECKSUM" == "$ARM_TARBALL_CHECKSUM" ]; then
+                echo "Checksum valid. No need to redownload."
+            else
+                echo "Checksum invalid. Redownloading the file..."
+                download_required=true
+                sudo rm $ARM_TARBALL
+            fi
+        else
+            echo "File does not exist. Downloading..."
+            download_required=true
+        fi
+
+        if $download_required; then
+            sudo wget -O "$ARM_TARBALL" --progress=dot:giga $ARM_TARBALL_URL
+        fi
+
+        sudo tar xjf ${ARM_TARBALL}
     )
 fi
 

Tools/environment_install/install-prereqs-ubuntu.sh

@@ -164,7 +164,7 @@ fi
 # Lists of packages to install
 BASE_PKGS="build-essential ccache g++ gawk git make wget valgrind screen python3-pexpect"
 PYTHON_PKGS="future lxml pymavlink pyserial MAVProxy geocoder empy==3.3.4 ptyprocess dronecan"
-PYTHON_PKGS="$PYTHON_PKGS flake8 junitparser"
+PYTHON_PKGS="$PYTHON_PKGS flake8 junitparser wsproto"
 
 # add some Python packages required for commonly-used MAVProxy modules and hex file generation:
 if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then