Merge pull request #4669 from sandeepmistry/software-serial-peek-cast

Add missing cast to SoftwareSerial::peek() when returning buffered value

2 files changed, 2 insertions, 2 deletions

diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.cpp b/libraries/SoftwareSerial/src/SoftwareSerial.cpp
index 0a16ff7..376762e 100644
--- a/libraries/SoftwareSerial/src/SoftwareSerial.cpp
+++ b/libraries/SoftwareSerial/src/SoftwareSerial.cpp
@@ -48,7 +48,7 @@ http://arduiniana.org.
 // Statics

 //

 SoftwareSerial *SoftwareSerial::active_object = 0;

-char SoftwareSerial::_receive_buffer[_SS_MAX_RX_BUFF]; 

+uint8_t SoftwareSerial::_receive_buffer[_SS_MAX_RX_BUFF]; 

 volatile uint8_t SoftwareSerial::_receive_buffer_tail = 0;

 volatile uint8_t SoftwareSerial::_receive_buffer_head = 0;

 

diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.h b/libraries/SoftwareSerial/src/SoftwareSerial.h
index 622e2a5..26183ba 100644
--- a/libraries/SoftwareSerial/src/SoftwareSerial.h
+++ b/libraries/SoftwareSerial/src/SoftwareSerial.h
@@ -66,7 +66,7 @@ private:
   uint16_t _inverse_logic:1;

 

   // static data

-  static char _receive_buffer[_SS_MAX_RX_BUFF]; 

+  static uint8_t _receive_buffer[_SS_MAX_RX_BUFF]; 

   static volatile uint8_t _receive_buffer_tail;

   static volatile uint8_t _receive_buffer_head;

   static SoftwareSerial *active_object;