Merge pull request #1 from perillamint/master

Some bug fixes
DangerousPrototypes · Oct 7, 2015 · 10f1ec1 · 10f1ec1
2 parents 29e65f5 + 1aee688
commit 10f1ec1
Show file tree

Hide file tree

Showing 7 changed files with 525 additions and 241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/Firmware/busPirate.X/build/default/
+/Firmware/busPirate.X/dist/
diff --git a/Firmware/UART.c b/Firmware/UART.c
@@ -259,7 +259,10 @@ void UARTsetup_exc(void)
 
     UART2Enable();
 
+#if !defined (BUSPIRATEV4) || defined(BPV4_DEBUG)
+	//BPv4 does not use U2BRG to communicate with PC unless it is in debug mode
 	if(U2BRG<U1BRG) BPMSG1249;
+#endif
 
 
 	#if defined(BUSPIRATEV4)
@@ -285,7 +288,10 @@ void UARTsetup_exc(void)
 
 		}
 		UART2Enable();
+#if !defined (BUSPIRATEV4) || defined(BPV4_DEBUG)
+		//BPv4 does not use U2BRG to communicate with PC unless it is in debug mode
 		if(U2BRG<U1BRG) BPMSG1249;
+#endif
 	}
 	#endif
 
@@ -409,7 +415,10 @@ void UARTmacro(unsigned int macro)
 			UART2Disable();
 			UARTgetbaud(0);
 			UART2Enable();
+#if !defined (BUSPIRATEV4) || defined(BPV4_DEBUG)
+			//BPv4 does not use U2BRG to communicate with PC unless it is in debug mode
 			if(U2BRG<U1BRG) BPMSG1249;
+#endif
 			break;			
 		default:
 			//bpWmessage(MSG_ERROR_MACRO);

diff --git a/Firmware/busPirate.X/nbproject/Makefile-genesis.properties b/Firmware/busPirate.X/nbproject/Makefile-genesis.properties
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/Firmware/busPirate.X/build/default/
		/Firmware/busPirate.X/dist/