Skip to content

Tasmota changes #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Feb 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0ad68df
Tasmota changes
Jason2866 Jan 15, 2023
9079da9
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Jan 27, 2023
abdd82b
Update install-platformio-esp32.sh
Jason2866 Feb 6, 2023
1e1ddc1
Fix conflicts
Jason2866 Feb 6, 2023
519142e
Merge pull request #189 from tasmota/espressif_master
Jason2866 Feb 6, 2023
366d297
Tasmota repos
Jason2866 Feb 6, 2023
1bec616
Merge branch 'Tasmota/207' into espressif_master
Jason2866 Feb 6, 2023
40ebf94
Merge pull request #190 from tasmota/espressif_master
Jason2866 Feb 6, 2023
0695d57
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Feb 6, 2023
8563b31
overlooked `timeout` change to `timeout_ms`
Jason2866 Feb 6, 2023
2768fe7
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Feb 7, 2023
5456de7
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Feb 8, 2023
664e36e
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Feb 10, 2023
353ce92
Merge branch 'Tasmota/207' into release/v2.x
Jason2866 Feb 10, 2023
7ff5055
Merge pull request #191 from tasmota/release/v2.x
Jason2866 Feb 10, 2023
1ab3a68
Merge branch 'espressif:release/v2.x' into release/v2.x
Jason2866 Feb 13, 2023
cfd008b
Merge branch 'espressif:master' into Tasmota/207
Jason2866 Feb 13, 2023
2ac2764
Merge pull request #194 from tasmota/Tasmota/207
Jason2866 Feb 13, 2023
d2662f2
Sets correct code for UART baud rate detection
Jason2866 Feb 14, 2023
5e27555
Merge branch 'espressif:release/v2.x' into release/v2.x
Jason2866 Feb 15, 2023
a3c4a0e
General examples updates (#7727) (#196)
Jason2866 Feb 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
overlooked timeout change to timeout_ms
  • Loading branch information
Jason2866 authored Feb 6, 2023
commit 8563b310e1e5ad9f3d9f9a8baa68a839b75c5591
4 changes: 2 additions & 2 deletions libraries/WiFi/src/WiFiClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,10 @@ int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout_ms)
}
if (srv6.type == IPADDR_TYPE_V4) {
IPAddress ip(srv6.u_addr.ip4.addr);
return connect(ip, port, timeout);
return connect(ip, port, timeout_ms);
} else {
IPAddress ip(IPv6, (uint8_t*)&srv6.u_addr.ip6.addr[0]);
return connect(ip, port, timeout);
return connect(ip, port, timeout_ms);
}
}
IPAddress srv((uint32_t)0);
Expand Down