Merge branch 'rm690b0' into copilot/check-branch-changes-rm690b0

Author: ppsx

locale/circuitpython.pot

@@ -711,7 +711,6 @@ msgid "Buffer too short by %d bytes"
 msgstr ""
 
 #: ports/cxd56/common-hal/camera/Camera.c
-#: ports/espressif/common-hal/qspibus/QSPIBus.c
 #: shared-bindings/busdisplay/BusDisplay.c
 #: shared-bindings/framebufferio/FramebufferDisplay.c
 #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c
@@ -874,8 +873,7 @@ msgstr ""
 msgid "Coordinate arrays types have different sizes"
 msgstr ""
 
-#: shared-module/usb/core/Device.c
-#: ports/espressif/common-hal/qspibus/QSPIBus.c
+#: ports/espressif/common-hal/qspibus/QSPIBus.c shared-module/usb/core/Device.c
 msgid "Could not allocate DMA capable buffer"
 msgstr ""
 

ports/espressif/common-hal/qspibus/QSPIBus.c

@@ -497,12 +497,10 @@ bool common_hal_qspibus_qspibus_bus_free(mp_obj_t obj) {
 
 bool common_hal_qspibus_qspibus_begin_transaction(mp_obj_t obj) {
     qspibus_qspibus_obj_t *self = MP_OBJ_TO_PTR(obj);
-    if (!self->bus_initialized || self->in_transaction) {
+    if (!common_hal_qspibus_qspibus_bus_free(obj)) {
         return false;
     }
     self->in_transaction = true;
-    self->has_pending_command = false;
-    self->pending_command = 0;
     return true;
 }