Merge pull request #1160 from bitcraze/krichardsson/ai-deck-flash

AI-deck GAP8 flash write error check

src/deck/drivers/src/aideck.c

@@ -43,7 +43,6 @@
 #include "debug.h"
 #include "deck.h"
 #include "esp_deck_flasher.h"
-#include "FreeRTOS.h"
 #include "task.h"
 #include "event_groups.h"
 #include "queue.h"
@@ -78,6 +77,9 @@ static bool isInit = false;
 
 #define CPX_ENABLE_CRTP_BRIDGE    0x10
 
+#define GAP8_MAX_MEM_WRITE_TIMEOUT_MS 5000
+#define GAP8_MAX_MEM_VERIFY_TIMEOUT_MS 5000
+
 typedef struct {
   uint8_t cmd;
   uint32_t startAddress;
@@ -126,7 +128,8 @@ static bool gap8DeckFlasherWrite(const uint32_t memAddr, const uint8_t writeLen,
     gap8BlPacket->startAddress = 0x40000;
     gap8BlPacket->writeSize = *(memDef->newFwSizeP);
     bootPacket.dataLength = sizeof(GAP8BlCmdPacket_t);
-    cpxSendPacketBlocking(&bootPacket);
+    bool writeOk = cpxSendPacketBlockingTimeout(&bootPacket, M2T(GAP8_MAX_MEM_WRITE_TIMEOUT_MS));
+    ASSERT(writeOk);
   }
 
   // The GAP8 can only flash data in multiples of 4 bytes,
@@ -144,7 +147,8 @@ static bool gap8DeckFlasherWrite(const uint32_t memAddr, const uint8_t writeLen,
     memcpy(&bootPacket.data, flashBuffer, flashBufferIndex);
     bootPacket.dataLength = flashBufferIndex;
 
-    cpxSendPacketBlocking(&bootPacket);
+    bool writeOk = cpxSendPacketBlockingTimeout(&bootPacket, M2T(GAP8_MAX_MEM_WRITE_TIMEOUT_MS));
+    ASSERT(writeOk);
 
     flashBufferIndex = 0;
     int sizeLeftToBuffer = writeLen - sizeLeftToBufferFull;
@@ -163,13 +167,16 @@ static bool gap8DeckFlasherWrite(const uint32_t memAddr, const uint8_t writeLen,
     gap8BlPacket->startAddress = 0x40000;
     gap8BlPacket->writeSize = *(memDef->newFwSizeP);
     bootPacket.dataLength = sizeof(GAP8BlCmdPacket_t);
-    cpxSendPacketBlocking(&bootPacket);
+    bool writeOk = cpxSendPacketBlockingTimeout(&bootPacket, M2T(GAP8_MAX_MEM_WRITE_TIMEOUT_MS));
+    ASSERT(writeOk);
 
-    xEventGroupWaitBits(bootloaderSync,
+    EventBits_t bits = xEventGroupWaitBits(bootloaderSync,
                         CPX_WAIT_FOR_BOOTLOADER_REPLY,
                         pdTRUE,  // Clear bits before returning
                         pdFALSE, // Wait for any bit
-                        portMAX_DELAY);
+                        M2T(GAP8_MAX_MEM_VERIFY_TIMEOUT_MS));
+    bool flashWritten = (bits & CPX_WAIT_FOR_BOOTLOADER_REPLY);
+    ASSERT(flashWritten);
 }
 
   return true;

src/modules/interface/cpx/cpx_internal_router.h

@@ -29,15 +29,15 @@
 
 /**
  * @brief Initialize the internal router
- * 
+ *
  * Initialize the internal router, used for routing CPX packets
  * on function inside the STM32.
  *
  */
 void cpxInternalRouterInit(void);
 
 /**
- * @brief Send a CPX packet
+ * @brief Send a CPX packet, blocking
  *
  * This will send a packet to the ESP32 to be routed using CPX. This
  * will block until the packet can be queued up for sending.
@@ -46,17 +46,26 @@ void cpxInternalRouterInit(void);
  */
 void cpxSendPacketBlocking(const CPXPacket_t * packet);
 
+/**
+ * @brief Send a CPX packet, blocking with timeout
+ *
+ * @param packet packet to be sent
+ * @param timeout Timeout in ticks
+ * @return True if sent, false if timeout
+ */
+bool cpxSendPacketBlockingTimeout(const CPXPacket_t * packet, const uint32_t timeout);
+
 /**
  * @brief Receive a CPX packet sent with the CRTP function
- * 
+ *
  * @param packet CPX packet where received packet is stored
  * @return int 0 if no packet was received otherwise non zero.
  */
 int cpxInternalRouterReceiveCRTP(CPXPacket_t * packet);
 
 /**
  * @brief Receive a CPX packet sent with another function than CRTP
- * 
+ *
  * @param packet CPX packet where received packet is stored
  * @return int 0 if no packet was received otherwise non zero.
  */
@@ -65,16 +74,15 @@ void cpxInternalRouterReceiveOthers(CPXPacket_t * packet);
 /**
  * @brief Send a CPX packet from the external router into the internal
  * router
- * 
+ *
  * @param packet CPX packet to send
  */
 void cpxInternalRouterRouteIn(const CPXRoutablePacket_t* packet);
 
 /**
  * @brief Retrieve a CPX packet from the internal router to be
  * routed externally.
- * 
+ *
  * @param packet CPX packet where retrieved packet is stored
  */
 void cpxInternalRouterRouteOut(CPXRoutablePacket_t* packet);
-

src/modules/src/cpx/cpx_internal_router.c

@@ -54,6 +54,10 @@ void cpxSendPacketBlocking(const CPXPacket_t * packet) {
   xQueueSend(txq, packet, portMAX_DELAY);
 }
 
+bool cpxSendPacketBlockingTimeout(const CPXPacket_t * packet, const uint32_t timeout) {
+  return xQueueSend(txq, packet, timeout) == pdTRUE;
+}
+
 bool cpxSendPacket(const CPXPacket_t * packet, uint32_t timeout) {
   return true;
 }