Timeout cleanup
This commit is contained in:
		@@ -610,8 +610,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -670,8 +670,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -480,8 +480,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -626,8 +626,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -722,8 +722,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -844,8 +844,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -687,8 +687,7 @@ public:
 | 
				
			|||||||
    streamWrite(tail...);
 | 
					    streamWrite(tail...);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  bool streamSkipUntil(char c) {
 | 
					  bool streamSkipUntil(char c, const unsigned long timeout = 1000L) {
 | 
				
			||||||
    const unsigned long timeout = 1000L;
 | 
					 | 
				
			||||||
    unsigned long startMillis = millis();
 | 
					    unsigned long startMillis = millis();
 | 
				
			||||||
    while (millis() - startMillis < timeout) {
 | 
					    while (millis() - startMillis < timeout) {
 | 
				
			||||||
      while (millis() - startMillis < timeout && !stream.available()) {
 | 
					      while (millis() - startMillis < timeout && !stream.available()) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user