remove SERIAL_INTERFACES_COUNT macro

hathach · hathach · commit a00eb4fa703e · 2020-01-31T22:09:46.000+07:00
nrf52832 keep PIN_SERIAL_RX/TX
diff --git a/cores/nRF5/Uart.cpp b/cores/nRF5/Uart.cpp
@@ -26,12 +26,12 @@ void serialEventRun(void)
 {
   if (serialEvent && Serial.available() ) serialEvent();
 
-#ifndef NRF52832_XXAA // 832 only has 1 UART for Serial
+#if defined(PIN_SERIAL1_RX) && defined(PIN_SERIAL1_TX)
   if (serialEvent1 && Serial1.available() ) serialEvent1();
+#endif
 
-  #if SERIAL_INTERFACES_COUNT >= 2
+#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)
   if (serialEvent2 && Serial2.available() ) serialEvent2();
-  #endif
 #endif
 }
 
@@ -241,7 +241,11 @@ size_t Uart::write(const uint8_t *buffer, size_t size)
 }
 
 //------------- Serial1 (or Serial in case of nRF52832) -------------//
-Uart SERIAL_PORT_HARDWARE( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL1_RX, PIN_SERIAL1_TX );
+#ifdef NRF52832_XXAA
+  Uart Serial( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL_RX, PIN_SERIAL_TX );
+#else
+  Uart Serial1( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL1_RX, PIN_SERIAL1_TX );
+#endif
 
 extern "C"
 {
@@ -252,7 +256,7 @@ extern "C"
 }
 
 //------------- Serial2 -------------//
-#if SERIAL_INTERFACES_COUNT >= 2
+#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)
 Uart Serial2( NRF_UARTE1, UARTE1_IRQn, PIN_SERIAL2_RX, PIN_SERIAL2_TX );
 
 extern "C"
diff --git a/cores/nRF5/Uart.h b/cores/nRF5/Uart.h
@@ -104,6 +104,6 @@ class Uart : public HardwareSerial
 
 extern Uart SERIAL_PORT_HARDWARE;
 
-#if SERIAL_INTERFACES_COUNT >= 2
+#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)
 extern Uart Serial2;
 #endif
diff --git a/variants/circuitplayground_nrf52840/variant.h b/variants/circuitplayground_nrf52840/variant.h
@@ -91,8 +91,6 @@ static const uint8_t A9  = PIN_A9 ;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX       (0)
 #define PIN_SERIAL1_TX       (1)
 
diff --git a/variants/clue_nrf52840/variant.h b/variants/clue_nrf52840/variant.h
@@ -85,8 +85,6 @@ static const uint8_t A7  = PIN_A7 ;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX       (0)
 #define PIN_SERIAL1_TX       (1)
 
diff --git a/variants/feather_nrf52832/variant.h b/variants/feather_nrf52832/variant.h
@@ -87,10 +87,8 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
-#define PIN_SERIAL1_RX       (8)
-#define PIN_SERIAL1_TX       (6)
+#define PIN_SERIAL_RX       (8)
+#define PIN_SERIAL_TX       (6)
 
 /*
  * SPI Interfaces
diff --git a/variants/feather_nrf52840_express/variant.h b/variants/feather_nrf52840_express/variant.h
@@ -93,8 +93,6 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX       (1)
 #define PIN_SERIAL1_TX       (0)
 
diff --git a/variants/itsybitsy_nrf52840_express/variant.h b/variants/itsybitsy_nrf52840_express/variant.h
@@ -89,8 +89,6 @@ static const uint8_t A6  = PIN_A6 ;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX       (0)
 #define PIN_SERIAL1_TX       (1)
 
diff --git a/variants/metro_nrf52840_express/variant.h b/variants/metro_nrf52840_express/variant.h
@@ -94,8 +94,6 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX       (1)
 #define PIN_SERIAL1_TX       (0)
 
diff --git a/variants/particle_xenon/variant.h b/variants/particle_xenon/variant.h
@@ -146,8 +146,6 @@ static const uint8_t A5  = PIN_A5 ;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 1
-
 #define PIN_SERIAL1_RX         PIN_D9
 #define PIN_SERIAL1_TX         PIN_D10
 
diff --git a/variants/pca10056/variant.h b/variants/pca10056/variant.h
@@ -94,7 +94,6 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * Serial interfaces
  */
-#define SERIAL_INTERFACES_COUNT 2
 
 // Arduino Header D0, D1
 #define PIN_SERIAL1_RX      (33) // P1.01

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ void serialEventRun(void)`
`26`	`26`	`{`
`27`	`27`	`if (serialEvent && Serial.available() ) serialEvent();`
`28`	`28`
`29`		`-#ifndef NRF52832_XXAA // 832 only has 1 UART for Serial`
	`29`	`+#if defined(PIN_SERIAL1_RX) && defined(PIN_SERIAL1_TX)`
`30`	`30`	`if (serialEvent1 && Serial1.available() ) serialEvent1();`
	`31`	`+#endif`
`31`	`32`
`32`		`- #if SERIAL_INTERFACES_COUNT >= 2`
	`33`	`+#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)`
`33`	`34`	`if (serialEvent2 && Serial2.available() ) serialEvent2();`
`34`		`- #endif`
`35`	`35`	`#endif`
`36`	`36`	`}`
`37`	`37`
`@@ -241,7 +241,11 @@ size_t Uart::write(const uint8_t *buffer, size_t size)`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`//------------- Serial1 (or Serial in case of nRF52832) -------------//`
`244`		`-Uart SERIAL_PORT_HARDWARE( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL1_RX, PIN_SERIAL1_TX );`
	`244`	`+#ifdef NRF52832_XXAA`
	`245`	`+ Uart Serial( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL_RX, PIN_SERIAL_TX );`
	`246`	`+#else`
	`247`	`+ Uart Serial1( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL1_RX, PIN_SERIAL1_TX );`
	`248`	`+#endif`
`245`	`249`
`246`	`250`	`extern "C"`
`247`	`251`	`{`
`@@ -252,7 +256,7 @@ extern "C"`
`252`	`256`	`}`
`253`	`257`
`254`	`258`	`//------------- Serial2 -------------//`
`255`		`-#if SERIAL_INTERFACES_COUNT >= 2`
	`259`	`+#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)`
`256`	`260`	`Uart Serial2( NRF_UARTE1, UARTE1_IRQn, PIN_SERIAL2_RX, PIN_SERIAL2_TX );`
`257`	`261`
`258`	`262`	`extern "C"`