Merge pull request rogerclarkmelbourne#183 from martinayotte/master

rogerclarkmelbourne · web-flow · commit ea6ec1d0aa4b · 2016-07-01T09:15:20.000+10:00
Fix LeafLab bug in USBSerial::disableBlockingTx() on F4 core
diff --git a/STM32F4/boards.txt b/STM32F4/boards.txt
@@ -79,7 +79,7 @@ netduino2plus.upload.dfuse_addr=0x8000000
 netduino2plus.build.mcu=cortex-m4
 netduino2plus.build.f_cpu=168000000L
 netduino2plus.build.core=maple
-netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4
+netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
 netduino2plus.build.ldscript=ld/jtag.ld
 netduino2plus.build.variant=discovery_f407
 netduino2plus.build.variant_system_lib=lib_f407.a
diff --git a/STM32F4/cores/maple/usb_serial.cpp b/STM32F4/cores/maple/usb_serial.cpp
@@ -149,7 +149,7 @@ void USBSerial::enableBlockingTx(void) {
 }
 
 void USBSerial::disableBlockingTx(void) {
-	usbEnableBlockingTx();
+	usbDisableBlockingTx();
 }
 
 USBSerial SerialUSB;

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ void USBSerial::enableBlockingTx(void) {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void USBSerial::disableBlockingTx(void) {`
`152`		`- usbEnableBlockingTx();`
	`152`	`+ usbDisableBlockingTx();`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`USBSerial SerialUSB;`