Fixed issue caused by renaming SerialUSB to Serial for non Maple boards - i.e double definition of Serial

STM32F1XX/cores/maple/usb_serial.cpp

@@ -203,8 +203,10 @@ uint8 USBSerial::getRTS(void) {
 }
 
 #if BOARD_HAVE_SERIALUSB
-//USBSerial SerialUSB;
-USBSerial Serial;
+	#ifdef BOOTLOADER_maple 
+		//USBSerial SerialUSB;
+		USBSerial Serial;
+	#endif
 #endif
 
 /*

STM32F1XX/cores/maple/usb_serial.h

@@ -72,8 +72,10 @@ public:
 };
 
 #if BOARD_HAVE_SERIALUSB
-//extern USBSerial SerialUSB;
-extern USBSerial Serial;
+	#ifdef BOOTLOADER_maple 
+	//extern USBSerial SerialUSB;
+	extern USBSerial Serial;
+	#endif
 #endif
 
 #endif

STM32F1XX/variants/maple/wirish/boards_setup.cpp

@@ -75,8 +75,10 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
- //           SerialUSB.begin();
-			Serial.begin()
+	#ifdef BOOTLOADER_maple 
+//          SerialUSB.begin();
+			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
+	#endif
 #endif
         }
 

STM32F1XX/variants/maple_mini/wirish/boards_setup.cpp

@@ -75,11 +75,12 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-//            SerialUSB.begin();
-			
-			Serial.begin();// Roger Clark. Attempted to Change SerialUSB to Serial for Arduino sketch compatibility
-#endif
-        }
+	#ifdef BOOTLOADER_maple 
+//          SerialUSB.begin();
+			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
+	#endif
+#endif        
+		}
 
         __weak void series_init(void) {
             // Initialize AFIO here, too, so peripheral remaps and external