Merge branch 'bootloader-serial-baud' of git://github.com/sandeepmistry/ArduinoCore-samd

cmaglie · cmaglie · commit a73e50de5396 · 2016-03-02T15:13:24.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 SAMD CORE 1.6.5
 
 * Set NVMCTRL.MANW bit to 1 (default is 0). This prevents accidental writes on program memory.
+* Bootloader: Fixed wrong UART speed (regression)
 
 SAMD CORE 1.6.4 2016.02.19
 
diff --git a/bootloaders/zero/sam_ba_serial.c b/bootloaders/zero/sam_ba_serial.c
@@ -108,8 +108,8 @@ void serial_open(void)
     /* Wait for synchronization */
   }
 
-	/* Baud rate 115200 - clock 8MHz -> BAUD value-50436 */
-	uart_basic_init(BOOT_USART_MODULE, 50436, BOOT_USART_PAD_SETTINGS);
+	/* Baud rate 115200 - clock 48MHz -> BAUD value-63018 */
+	uart_basic_init(BOOT_USART_MODULE, 63018, BOOT_USART_PAD_SETTINGS);
 
 	//Initialize flag
 	b_sharp_received = false;

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ void serial_open(void)`
`108`	`108`	`/* Wait for synchronization */`
`109`	`109`	`}`
`110`	`110`
`111`		`- /* Baud rate 115200 - clock 8MHz -> BAUD value-50436 */`
`112`		`- uart_basic_init(BOOT_USART_MODULE, 50436, BOOT_USART_PAD_SETTINGS);`
	`111`	`+ /* Baud rate 115200 - clock 48MHz -> BAUD value-63018 */`
	`112`	`+ uart_basic_init(BOOT_USART_MODULE, 63018, BOOT_USART_PAD_SETTINGS);`
`113`	`113`
`114`	`114`	`//Initialize flag`
`115`	`115`	`b_sharp_received = false;`