Separated USB Serial functionality definitions from the BOOTLOADER_maple definition, so that generic boards can use USB serial without needing to have the bootloader and the disconnect hardware. NOTE. I have only tested the SERIAL_USB on the F103ZE board, it may not work on other generic boards

rogerclarkmelbourne · rogerclarkmelbourne · commit fddefc13a945 · 2015-04-25T15:28:45.000+10:00
diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt
diff --git a/STM32F1/cores/maple/HardwareSerial.cpp b/STM32F1/cores/maple/HardwareSerial.cpp
@@ -47,7 +47,7 @@
                         BOARD_USART##n##_TX_PIN,                   \
                         BOARD_USART##n##_RX_PIN)						
 						
-#ifdef BOOTLOADER_maple 
+#ifdef SERIAL_USB
 	#if BOARD_HAVE_USART1
 	DEFINE_HWSERIAL(Serial1, 1);
 	#endif
diff --git a/STM32F1/cores/maple/HardwareSerial.h b/STM32F1/cores/maple/HardwareSerial.h
@@ -164,7 +164,7 @@ class HardwareSerial : public Stream {
 #endif
 };
 
-#ifdef BOOTLOADER_maple 
+#ifdef SERIAL_USB 
 	#if BOARD_HAVE_USART1
 	extern HardwareSerial Serial1;
 	#endif
diff --git a/STM32F1/cores/maple/usb_serial.cpp b/STM32F1/cores/maple/usb_serial.cpp
@@ -203,8 +203,7 @@ uint8 USBSerial::getRTS(void) {
 }
 
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-		//USBSerial SerialUSB;
+	#ifdef SERIAL_USB 
 		USBSerial Serial;
 	#endif
 #endif
@@ -232,7 +231,7 @@ static void ifaceSetupHook(unsigned hook, void *requestvp) {
         return;
     }
 
-#if defined(BOOTLOADER_maple)
+#ifdef SERIAL_USB 
     // We need to see a negative edge on DTR before we start looking
     // for the in-band magic reset byte sequence.
     uint8 dtr = usb_cdcacm_get_dtr();
@@ -268,7 +267,7 @@ static void ifaceSetupHook(unsigned hook, void *requestvp) {
 }
 
 #define RESET_DELAY 100000
-#if defined(BOOTLOADER_maple)
+#ifdef SERIAL_USB 
 static void wait_reset(void) {
   delay_us(RESET_DELAY);
   nvic_sys_reset();
@@ -286,7 +285,7 @@ static void rxHook(unsigned hook, void *ignored) {
 
         if (usb_cdcacm_data_available() >= 4) {
             // The magic reset sequence is "1EAF".
-#if defined(BOOTLOADER_maple)
+#ifdef SERIAL_USB 
             static const uint8 magic[4] = {'1', 'E', 'A', 'F'};	
 #else
 	#if defined(BOOTLOADER_robotis)
@@ -307,7 +306,7 @@ static void rxHook(unsigned hook, void *ignored) {
                 }
             }
 
-#if defined(BOOTLOADER_maple)
+#ifdef SERIAL_USB 
             // Got the magic sequence -> reset, presumably into the bootloader.
             // Return address is wait_reset, but we must set the thumb bit.
             uintptr_t target = (uintptr_t)wait_reset | 0x1;
diff --git a/STM32F1/cores/maple/usb_serial.h b/STM32F1/cores/maple/usb_serial.h
@@ -74,8 +74,7 @@ class USBSerial : public Stream {
 };
 
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-	//extern USBSerial SerialUSB;
+	#ifdef SERIAL_USB 
 	extern USBSerial Serial;
 	#endif
 #endif
diff --git a/STM32F1/variants/generic_stm32f103c/wirish/boards.cpp b/STM32F1/variants/generic_stm32f103c/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/generic_stm32f103c/wirish/boards_setup.cpp b/STM32F1/variants/generic_stm32f103c/wirish/boards_setup.cpp
@@ -75,8 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-//          SerialUSB.begin();
+	#ifdef SERIAL_USB 
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
 #endif        
diff --git a/STM32F1/variants/generic_stm32f103rxx/wirish/boards.cpp b/STM32F1/variants/generic_stm32f103rxx/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/generic_stm32f103rxx/wirish/boards_setup.cpp b/STM32F1/variants/generic_stm32f103rxx/wirish/boards_setup.cpp
@@ -75,8 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-//          SerialUSB.begin();
+	#ifdef SERIAL_USB 
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
 #endif
diff --git a/STM32F1/variants/generic_stm32f103zxx/wirish/boards.cpp b/STM32F1/variants/generic_stm32f103zxx/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/generic_stm32f103zxx/wirish/boards_setup.cpp b/STM32F1/variants/generic_stm32f103zxx/wirish/boards_setup.cpp
@@ -75,8 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-//          SerialUSB.begin();
+	#ifdef SERIAL_USB 
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
 #endif
diff --git a/STM32F1/variants/maple/wirish/boards.cpp b/STM32F1/variants/maple/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/maple/wirish/boards_setup.cpp b/STM32F1/variants/maple/wirish/boards_setup.cpp
@@ -75,8 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-//          SerialUSB.begin();
+	#ifdef SERIAL_USB 
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
 #endif
diff --git a/STM32F1/variants/maple_mini/wirish/boards_setup.cpp b/STM32F1/variants/maple_mini/wirish/boards_setup.cpp
@@ -74,12 +74,10 @@ namespace wirish {
         }
 
         __weak void board_setup_usb(void) {
-#if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
+#ifdef SERIAL_USB
 //          SerialUSB.begin();
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
-	#endif
-#endif        
+#endif
 		}
 
         __weak void series_init(void) {
diff --git a/STM32F1/variants/microduino/wirish/boards.cpp b/STM32F1/variants/microduino/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/microduino/wirish/boards_setup.cpp b/STM32F1/variants/microduino/wirish/boards_setup.cpp
@@ -75,7 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
+	#ifdef SERIAL_USB 
 //          SerialUSB.begin();
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
diff --git a/STM32F1/variants/nucleo_f103rb/wirish/boards.cpp b/STM32F1/variants/nucleo_f103rb/wirish/boards.cpp
@@ -157,6 +157,10 @@ static void setup_clocks(void) {
 extern char __text_start__;
 
 static void setup_nvic(void) {
+
+nvic_init((uint32)VECT_TAB_ADDR, 0);
+
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
@@ -171,6 +175,8 @@ static void setup_nvic(void) {
     // should be the start of the vector table.
     nvic_init((uint32)&__text_start__, 0);
 #endif
+
+*/
 }
 
 static void adc_default_config(const adc_dev *dev) {
diff --git a/STM32F1/variants/nucleo_f103rb/wirish/boards_setup.cpp b/STM32F1/variants/nucleo_f103rb/wirish/boards_setup.cpp
@@ -75,8 +75,7 @@ namespace wirish {
 
         __weak void board_setup_usb(void) {
 #if BOARD_HAVE_SERIALUSB
-	#ifdef BOOTLOADER_maple 
-//          SerialUSB.begin();
+	#ifdef SERIAL_USB 
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
 	#endif
 #endif        
