Skip to content

Commit 1436f8d

Browse files
authored
Merge branch 'master' into release/v3.0.x
2 parents 2719b4e + 0515264 commit 1436f8d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

libraries/ESP32/examples/Timer/RepeatTimer/RepeatTimer.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void setup() {
3333
Serial.begin(115200);
3434

3535
// Set BTN_STOP_ALARM to input mode
36-
pinMode(BTN_STOP_ALARM, INPUT);
36+
pinMode(BTN_STOP_ALARM, INPUT_PULLUP);
3737

3838
// Create semaphore to inform us when the timer has fired
3939
timerSemaphore = xSemaphoreCreateBinary();

libraries/Network/src/NetworkClient.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class ESPLwIPClient : public Client {
3535

3636
class NetworkClient : public ESPLwIPClient {
3737
protected:
38-
std::shared_ptr<NetworkClientSocketHandle> clientSocketHandle;
39-
std::shared_ptr<NetworkClientRxBuffer> _rxBuffer;
40-
bool _connected;
41-
bool _sse;
38+
std::shared_ptr<NetworkClientSocketHandle> clientSocketHandle = nullptr;
39+
std::shared_ptr<NetworkClientRxBuffer> _rxBuffer = nullptr;
40+
bool _connected = false;
41+
bool _sse = false;
4242
int _timeout;
43-
int _lastWriteTimeout;
44-
int _lastReadTimeout;
43+
int _lastWriteTimeout = 0;
44+
int _lastReadTimeout = 0;
4545

4646
public:
4747
NetworkClient *next;

0 commit comments

Comments
 (0)