Merge remote-tracking branch 'AP_Origin/master'

ArduPilot · Jul 5, 2024 · 70c0c87 · 70c0c87
2 parents 14d689a + 9090420
commit 70c0c87
Show file tree

Hide file tree

Showing 31 changed files with 5,936 additions and 5,589 deletions.
diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
@@ -188,5 +188,7 @@ jobs:
           echo $PATH
           ./waf configure --board ${{matrix.config}}
           ./waf
+          ./waf configure --board ${{matrix.config}} --debug
+          ./waf
           ccache -s
           ccache -z
diff --git a/Tools/AP_Bootloader/support.cpp b/Tools/AP_Bootloader/support.cpp
@@ -506,7 +506,7 @@ bool update_otg2_serial_forward()
         chnWriteTimeout(&SDU2, data, n, TIME_IMMEDIATE);
     }
 
-    return (AP_HAL::millis() > otg2_serial_deadline_ms);
+    return (AP_HAL::millis() < otg2_serial_deadline_ms);
 }
 #endif
 

diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
@@ -286,15 +286,15 @@ def configure_env(self, cfg, env):
 
         if cfg.env.DEBUG:
             env.CFLAGS += [
-                '-g',
+                '-g3',
                 '-O0',
             ]
             env.DEFINES.update(
                 HAL_DEBUG_BUILD = 1,
             )
         elif cfg.options.debug_symbols:
             env.CFLAGS += [
-                '-g',
+                '-g3',
             ]
         if cfg.env.COVERAGE:
             env.CFLAGS += [

diff --git a/Tools/bootloaders/CubeOrangePlus-bdshot_bl.bin b/Tools/bootloaders/CubeOrangePlus-bdshot_bl.bin
diff --git a/Tools/bootloaders/CubeOrangePlus-bdshot_bl.hex b/Tools/bootloaders/CubeOrangePlus-bdshot_bl.hex
diff --git a/Tools/bootloaders/CubeOrangePlus_bl.bin b/Tools/bootloaders/CubeOrangePlus_bl.bin
diff --git a/Tools/bootloaders/CubeOrangePlus_bl.elf b/Tools/bootloaders/CubeOrangePlus_bl.elf
diff --git a/Tools/bootloaders/CubeOrangePlus_bl.hex b/Tools/bootloaders/CubeOrangePlus_bl.hex
diff --git a/Tools/bootloaders/CubeRedPrimary-PPPGW_bl.bin b/Tools/bootloaders/CubeRedPrimary-PPPGW_bl.bin
diff --git a/Tools/bootloaders/CubeRedPrimary_bl.bin b/Tools/bootloaders/CubeRedPrimary_bl.bin
-Original file line number
+Diff line change
@@ Expand Up / @@ -506,7 +506,7 @@ bool update_otg2_serial_forward() @@
             chnWriteTimeout(&SDU2, data, n, TIME_IMMEDIATE);
         }
-        return (AP_HAL::millis() > otg2_serial_deadline_ms);
+        return (AP_HAL::millis() < otg2_serial_deadline_ms);
     }
     #endif
@@ Expand Down @@