Adjusted Classes BootloaderCom and FlashManager

Author: chezlyne

lib/ZumoOta/doc/Sequenz_diagramm

@@ -0,0 +1,37 @@
+@startuml
+autoactivate on 
+participant "App" as  App
+participant Board
+participant USBStream
+participant "FlashManager" as FM 
+participant "BootloaderCom" as BC
+
+
+App -> Board: Process
+Board --> App
+Board -> USBStream: Process
+USBStream--> Board
+
+alt if(Idle) 
+App -> BC: Process
+BC -> FM: sendcommand()
+FM -> USBStream: write()
+USBStream --> FM: writtenbytes
+FM --> BC: true
+BC --> App
+end alt
+
+alt if (waitingforResponse)
+App -> BC: Process
+
+BC -> FM: readResponse()
+FM -> USBStream: read
+USBStream --> FM: 
+BC -> FM : isComplete()
+FM --> BC: true
+BC-> BC: checkresponse()
+BC -> FM: set Idle
+BC --> App: true
+end alt
+
+@enduml

lib/ZumoOta/src/App.cpp

@@ -209,7 +209,9 @@ void App::loop()
 
         m_webServer.handleUploadRequest();
         m_isWebServerInitialized = true;
-        m_webServer.handleUpdateRequest();   
+        Board::getInstance().process();
+        m_bootloader.enterBootloader();
+        m_bootloader.process();  
     }
 
 

lib/ZumoOta/src/App.h

@@ -46,7 +46,7 @@
 #include <Board.h>
 #include "FileManager.h"
 #include "WebServerCustom.h"
-#include "FlashManager.h"
+#include "BootloaderCom.h"
 
 /******************************************************************************
  * Macros
@@ -119,9 +119,9 @@ class App
     Upload m_upload;
 
     /**
-     * Instance of the FlashManager class
+     * Instance of the BootloaderCom class
      */
-    FlashManager m_flashManager;
+    BootloaderCom m_bootloader;
 };
 
 #endif /* APP_H */

lib/ZumoOta/src/BootloaderCom.cpp

@@ -65,7 +65,9 @@ static const uint16_t PAGE_SIZE_BYTES = 128U;
  * Public Methods
  *****************************************************************************/
 
-BootloaderCom::BootloaderCom()
+BootloaderCom::BootloaderCom():
+m_state(Idle),
+m_waitingForResponse(false)
 {
 
 }
@@ -88,6 +90,56 @@ void BootloaderCom::exitBootloader()
     LOG_INFO(" bootloader mode is exited");
 
 }
+
+void BootloaderCom::process()
+{
+    switch(m_state)
+    {
+        
+        case Idle:
+        /*Handle Idle state*/
+        m_waitingForResponse = false;
+        myFlashManager.sendCommand(Zumo32U4Specification::READ_SW_ID, sizeof(Zumo32U4Specification::READ_SW_ID));
+        break;
+     
+        case Pending:
+        /*Handle Pending state*/
+        m_state = ReadingResponse;
+        m_waitingForResponse = true;
+        break;
+
+        case ReadingResponse:
+        /*Handle Complete state*/
+        uint8_t expectedSW[sizeof(&Zumo32U4Specification::EXPECTED_SOFTWARE_ID)];
+        myFlashManager.readingStream(expectedSW);
+        m_state = Complete;
+        m_waitingForResponse = false;
+
+        if (compareExpectedAndReceivedResponse(Zumo32U4Specification::READ_SW_ID, sizeof(Zumo32U4Specification::READ_SW_ID),Zumo32U4Specification::EXPECTED_SOFTWARE_ID, sizeof(Zumo32U4Specification::EXPECTED_SOFTWARE_ID)))
+            {
+                LOG_INFO("Received expected response.");
+            }
+        else
+            {
+                LOG_ERROR("Received response does not match the expected response.");
+            }
+        break;
+
+        case Complete:
+        m_state = Idle;
+        break;
+
+        default:
+            break;
+ }
+}
+
+bool BootloaderCom::compareExpectedAndReceivedResponse(const uint8_t command[], size_t commandSize, const uint8_t expectedResponse[], size_t expectedResponseSize)
+{
+    
+    myFlashManager.Check( command,  commandSize,  expectedResponse,  expectedResponseSize);
+    return true;
+}
 
 
 

lib/ZumoOta/src/BootloaderCom.h

@@ -43,7 +43,7 @@
 /******************************************************************************
  * Includes
  ******************************************************************************/
-
+#include "FlashManager.h"
 /******************************************************************************
  * Macros
  *****************************************************************************/
@@ -76,7 +76,37 @@ class BootloaderCom
     */
    void exitBootloader();
 
+   /**
+    * @brief Process the flash manager state machine.
+    */
+    void process();
+
+    /**
+     *@brief Compare the received response against the expected response after sending a command.
+     *@param command The command to be sent.
+     *@param commandSize The size of the command.
+     *@param expectedResponse The expected response to compare against.
+     *@param expectedResponseSize The size of the expected response.
+     *@return True if the received response matches the expected response, false otherwise.
+     */
+     bool compareExpectedAndReceivedResponse(const uint8_t command[], size_t commandSize, const uint8_t expectedResponse[], size_t expectedResponseSize);
+
 private:
+    enum State
+    {
+        Idle,
+        Pending,
+        ReadingResponse,
+        Complete
+    };
+    State m_state;
+
+    FlashManager myFlashManager;
+
+    /*
+     * Flag indicating whether the FlashManager is currently waiting for a response.
+    */
+    bool m_waitingForResponse;
 
 };