Actioned Issue 89 as feature/serial2

README.md

@@ -1,6 +1,5 @@
 # Spark Core Firmware [![Backlog](https://badge.waffle.io/spark/core-firmware.png?label=backlog&title=backlog)](https://waffle.io/spark/core-firmware)
 
-
 This is the main source code repository of the Spark Core firmware libraries.
 
 This firmware depends on two other libraries: the [Spark Common Library](http://www.github.com/spark/core-common-lib) and the [Spark Communication Library](http://www.github.com/spark/core-communication-lib)

build/makefile

@@ -45,6 +45,10 @@ include $(SRC_MAKEFILES)
 # Paths to dependant projects, referenced from root of this project
 LIB_CORE_COMMON_PATH = ../core-common-lib
 LIB_CORE_COMMUNICATION_PATH = ../core-communication-lib
+LIB_CORE_LIBRARIES_PATH = libraries/
+
+# Include directoris for optional "libraries" (eg. Serial2.h)
+INCLUDE_DIRS += $(LIB_CORE_LIBRARIES_PATH)/Serial2
 
 # Additional include directories, applied to objects built for this target.
 INCLUDE_DIRS += $(LIB_CORE_COMMON_PATH)/CMSIS/Include

inc/spark_wiring_usartserial.h

@@ -39,45 +39,46 @@ typedef struct Ring_Buffer
 } Ring_Buffer;
 
 typedef enum USART_Num_Def {
-  USART_1 = 0,
-  USART_2
+  USART_TX_RX =0,
+  USART_D1_D0
 } USART_Num_Def;
-
 #define TOTAL_USARTS 2
+
+#define GPIO_Remap_None 0
+
 typedef struct STM32_USART_Info {
   USART_TypeDef* usart_peripheral;
   __IO uint32_t* usart_apbReg;
   uint32_t usart_clock_en; 
 
-  // buffer pointers need to be in global scope for int handler access
-  Ring_Buffer* usart_rx_buffer;
-  Ring_Buffer* usart_tx_buffer;
-
   IRQn usart_int_n;
 
   uint16_t usart_tx_pin;
   uint16_t usart_rx_pin;
 
   uint32_t usart_pin_remap;
 
+  // Buffer pointers. These need to be global for IRQ handler access
+  Ring_Buffer* usart_tx_buffer;
+  Ring_Buffer* usart_rx_buffer;
+
 } STM32_USART_Info;
+extern STM32_USART_Info USART_MAP[TOTAL_USARTS];
 
 extern STM32_Pin_Info PIN_MAP[];
 
 class USARTSerial : public Stream
 {
-  protected:
+  private:
     static USART_InitTypeDef USART_InitStructure;
     static bool USARTSerial_Enabled;
     bool transmitting;
-    Ring_Buffer __rx_buffer;
-    Ring_Buffer __tx_buffer;
-    Ring_Buffer* _rx_buffer;
-    Ring_Buffer* _tx_buffer;
-    STM32_USART_Info* myUSART;
+    Ring_Buffer _rx_buffer;
+    Ring_Buffer _tx_buffer;
+    STM32_USART_Info *usartMap; // pointer to USART_MAP[] containing USART peripheral register locations (etc)
 
   public:
-    USARTSerial(USART_Num_Def usartNum);
+    USARTSerial(STM32_USART_Info *usartMapPtr);
     virtual ~USARTSerial() {};
     void begin(unsigned long);
     void begin(unsigned long, uint8_t);
@@ -102,7 +103,7 @@ class USARTSerial : public Stream
 
 };
 
-extern USARTSerial Serial1;  // USART2 on PA2/3
+extern USARTSerial Serial1; // USART2 on PA2/3 (Spark TX, RX)
 extern USARTSerial Serial2; // USART1 on alternate PB6/7 (Spark D1, D0)
 
 #endif

libraries/Serial2/Serial2.h

@@ -0,0 +1,11 @@
+#ifndef __LIB_SERIAL2_H
+#define __LIB_SERIAL2_H
+
+#include "spark_wiring_usartserial.h"
+
+// instantiate Serial2
+USARTSerial Serial2(&USART_MAP[USART_D1_D0]);
+
+#endif
+
+

src/application.cpp

@@ -44,25 +44,12 @@ void setup()
 	Spark.function("analogread", tinkerAnalogRead);
 	Spark.function("analogwrite", tinkerAnalogWrite);
 
-  Serial1.begin(9600);
-  Serial2.begin(9600);
-
 }
 
 /* This function loops forever --------------------------------------------*/
 void loop()
 {
 	//This will run in a loop
-  static int x = 0;
-  Serial1.print("TestX ");
-  Serial1.println(x++, DEC);
-
-  Serial2.print("TestZ ");
-  Serial2.println(x++, DEC);
-  // Serial2.write('Z');
-
-  delay(500);
-
 }
 
 /*******************************************************************************