- Changed the baud rate to 19.2k

- The byte acknowledgements are sent as soon as a byte is received instead of sending all of them after a page has been updated
qb-creates · Mar 5, 2024 · 1f8d054 · 1f8d054
1 parent 67588c0
commit 1f8d054
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/bootloader-atmega1284/lib/IOStream/USART.c b/bootloader-atmega1284/lib/IOStream/USART.c
@@ -9,13 +9,13 @@
  * @note - No parity
  * @note - Asynchronous operation
  * 
- * @attention A clock frequency of 18.432MHz and baud rate of 115.2kbs were used during the development of this bootloader.
+ * @attention A clock frequency of 18.432MHz and baud rate of 19.2kbs were used during the development of this bootloader.
  * Update F_CPU and the value in the UBRRn register to get the desired baud rate.
  * 
  */
 void enableUSART(void)
 {
-    UBRR0L = 9;
+    UBRR0L = 59;
     UCSR0B = _BV(RXEN0) | _BV(TXEN0);
     UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
 }

diff --git a/bootloader-atmega1284/lib/Utilities/BootloadUtility.c b/bootloader-atmega1284/lib/Utilities/BootloadUtility.c
@@ -8,7 +8,6 @@ const uint8_t uploadeFailedCode = 'w';
 
 // Command Responses
 const uint8_t pageAck[] = {'P', 'a', 'g', 'e'};
-const uint8_t ack[] = {'\r'};
 
 // Page status
 const uint8_t lastPageIndicator = 0xFE;
@@ -89,12 +88,6 @@ void writePageDataToFlash(uint8_t *buf)
     boot_spm_busy_wait();
     boot_rww_enable();
 
-    for (int i = 0; i < 259; ++i)
-    {
-        wdt_reset();
-        usartTransmit(ack, 1);
-    }
-
     usartTransmit(pageAck, 4);
 
     // Upload is complete if the last byte in the buffer is equal to the lastPageByte.

diff --git a/bootloader-atmega1284/src/main.c b/bootloader-atmega1284/src/main.c
@@ -3,6 +3,8 @@
 #include "ButtonUtility.h"
 #include "BootloadUtility.h"
 
+const uint8_t ack[] = {'\r'};
+
 int main(void)
 {
     // Clear watchdog reset flag and disable watchdog timer.
@@ -23,7 +25,7 @@ int main(void)
     // Continue to bootloader section.
     enableUSART();
     startBootloadIndicator();
-    
+
     while (true)
     {
         // Check for data in the usart receive buffers.
@@ -40,8 +42,8 @@ int main(void)
         if (dataStruct.data == '\0' && !writeToFlash)
         {
             bufferCounter = 0;
-            
-            if (!memcmp(dataBuffer, "RTU", 4))                
+
+            if (!memcmp(dataBuffer, "RTU", 4))
             {
                 writeToFlash = true;
                 wdt_enable(WDTO_8S);
@@ -50,7 +52,13 @@ int main(void)
 
             continue;
         }
-
+
+        // The microcontroller is writing to flash. Send a byte acknowledgement back to the server.
+        if (writeToFlash)
+        {
+            usartTransmit(ack, 1);
+        }
+
         // Check if the data buffer has been completely filled with page data
         if (bufferCounter == 259)
         {

diff --git a/bootloader-atmega128a/lib/IOStream/USART.c b/bootloader-atmega128a/lib/IOStream/USART.c
@@ -9,13 +9,13 @@
  * @note - No parity
  * @note - Asynchronous operation
  * 
- * @attention A clock frequency of 7.3728MHz and baud rate of 115.2kbs were used during the development of this bootloader.
+ * @attention A clock frequency of 7.3728MHz and baud rate of 19.2kbs were used during the development of this bootloader.
  * Update F_CPU and the value in the UBRRn register to get the desired baud rate.
  * 
  */
 void enableUSART(void)
 {
-    UBRR1L = 3;
+    UBRR1L = 23;
     UCSR1B = _BV(RXEN1) | _BV(TXEN1);
     UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
 }

diff --git a/bootloader-atmega128a/lib/Utilities/BootloadUtility.c b/bootloader-atmega128a/lib/Utilities/BootloadUtility.c
@@ -8,7 +8,6 @@ const uint8_t uploadeFailedCode = 'w';
 
 // Command Responses
 const uint8_t pageAck[] = {'P', 'a', 'g', 'e'};
-const uint8_t ack[] = {'\r'};
 
 const uint8_t uploadCompleteByte = 0xFE;
 
@@ -85,12 +84,6 @@ void writeProgramDataToFlash(uint8_t *buf)
     boot_spm_busy_wait();
     boot_rww_enable();
 
-    // Acknowledge that the 259 bytes of data were received
-    for (int i = 0; i < 259; ++i)
-    {
-        usartTransmit(ack, 1);
-    }
-
     usartTransmit(pageAck, 4);
 
     // Check page status byte.

diff --git a/bootloader-atmega128a/src/main.c b/bootloader-atmega128a/src/main.c
@@ -5,6 +5,8 @@
 #include "BootloadUtility.h"
 #include "Timer.h"
 
+const uint8_t ack[] = {'\r'};
+
 int main(void)
 {
     // Clear watchdog reset flag and disable watchdog timer.
@@ -70,6 +72,12 @@ int main(void)
             continue;
         }
 
+        // The microcontroller is writing to flash. Send a byte acknowledgement back to the server.
+        if (writingToFlash)
+        {
+            usartTransmit(ack, 1);
+        }
+
         // Check if the data buffer has been completely filled with page data
         if (bufferCounter == 259)
         {