Merge branch 'fz-dev' into dev

scripts/fbt_tools/fbt_debugopts.py

@@ -41,12 +41,10 @@ def generate(env, **kw):
             "|openocd -c 'gdb_port pipe; log_output ${FBT_DEBUG_DIR}/openocd.log' ${[SINGLEQUOTEFUNC(OPENOCD_OPTS)]}"
         ],
         GDBOPTS_BASE=[
-            "-ex",
-            "set pagination off",
             "-ex",
             "target extended-remote ${GDBREMOTE}",
             "-ex",
-            "set confirm off",
+            "source ${FBT_DEBUG_DIR}/gdbinit",
         ],
         GDBOPTS_BLACKMAGIC=[
             "-ex",

scripts/testing/await_flipper.py

@@ -24,7 +24,7 @@ def flp_serial_by_name(flp_name):
             return ""
 
 
-UPDATE_TIMEOUT = 60
+UPDATE_TIMEOUT = 60 * 4  # 4 minutes
 
 
 def main():