Fix compilation of HardwareSerial.cpp (#5677)

everslick · web-flow · commit 91bca6c074b8 · 2021-10-01T15:06:16.000+03:00
Fix compilation in case NO_GLOBAL_INSTANCES || NO_GLOBAL_SERIAL is defined.
diff --git a/cores/esp32/HardwareSerial.cpp b/cores/esp32/HardwareSerial.cpp
@@ -87,7 +87,6 @@ HardwareSerial Serial1(1);
 #if SOC_UART_NUM > 2
 HardwareSerial Serial2(2);
 #endif
-#endif
 
 void serialEventRun(void)
 {
@@ -105,6 +104,7 @@ void serialEventRun(void)
     if(Serial2.available()) serialEvent2();
 #endif
 }
+#endif
 
 
 HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL), _rxBufferSize(256) {}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ HardwareSerial Serial1(1);`
`87`	`87`	`#if SOC_UART_NUM > 2`
`88`	`88`	`HardwareSerial Serial2(2);`
`89`	`89`	`#endif`
`90`		`-#endif`
`91`	`90`
`92`	`91`	`void serialEventRun(void)`
`93`	`92`	`{`
`@@ -105,6 +104,7 @@ void serialEventRun(void)`
`105`	`104`	`if(Serial2.available()) serialEvent2();`
`106`	`105`	`#endif`
`107`	`106`	`}`
	`107`	`+#endif`
`108`	`108`
`109`	`109`
`110`	`110`	`HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL), _rxBufferSize(256) {}`