[SoftwareSerial] Fix analog pins usage

fpistm · fpistm · commit 1a4f66badedd · 2020-06-10T11:48:23.000+02:00
Fix stm32duino#1093 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.cpp b/libraries/SoftwareSerial/src/SoftwareSerial.cpp
@@ -317,12 +317,12 @@ SoftwareSerial::SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool i
   _receive_buffer_tail(0),
   _receive_buffer_head(0)
 {
-  if ((receivePin < NUM_DIGITAL_PINS) || (transmitPin < NUM_DIGITAL_PINS)) {
-    /* Enable GPIO clock for tx and rx pin*/
-    set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(transmitPin)));
-    set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(receivePin)));
-  } else {
-    _Error_Handler("ERROR: invalid pin number\n", -1);
+  /* Enable GPIO clock for tx and rx pin*/
+  if (set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(transmitPin))) == 0) {
+    _Error_Handler("ERROR: invalid transmit pin number\n", -1);
+  }
+  if ((!_half_duplex) && (set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(receivePin))) == 0)) {
+    _Error_Handler("ERROR: invalid receive pin number\n", -1);
   }
 }
 
@@ -421,4 +421,4 @@ int SoftwareSerial::peek()
 void SoftwareSerial::setInterruptPriority(uint32_t preemptPriority, uint32_t subPriority)
 {
   timer.setInterruptPriority(preemptPriority, subPriority);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -317,12 +317,12 @@ SoftwareSerial::SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool i`
`317`	`317`	`_receive_buffer_tail(0),`
`318`	`318`	`_receive_buffer_head(0)`
`319`	`319`	`{`
`320`		`- if ((receivePin < NUM_DIGITAL_PINS) \|\| (transmitPin < NUM_DIGITAL_PINS)) {`
`321`		`- /* Enable GPIO clock for tx and rx pin*/`
`322`		`- set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(transmitPin)));`
`323`		`- set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(receivePin)));`
`324`		`- } else {`
`325`		`- _Error_Handler("ERROR: invalid pin number\n", -1);`
	`320`	`+ /* Enable GPIO clock for tx and rx pin*/`
	`321`	`+ if (set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(transmitPin))) == 0) {`
	`322`	`+ _Error_Handler("ERROR: invalid transmit pin number\n", -1);`
	`323`	`+ }`
	`324`	`+ if ((!_half_duplex) && (set_GPIO_Port_Clock(STM_PORT(digitalPinToPinName(receivePin))) == 0)) {`
	`325`	`+ _Error_Handler("ERROR: invalid receive pin number\n", -1);`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`
`@@ -421,4 +421,4 @@ int SoftwareSerial::peek()`
`421`	`421`	`void SoftwareSerial::setInterruptPriority(uint32_t preemptPriority, uint32_t subPriority)`
`422`	`422`	`{`
`423`	`423`	`timer.setInterruptPriority(preemptPriority, subPriority);`
`424`		`-}`
	`424`	`+}`