8000 Tasmota changes by Jason2866 · Pull Request #638 · tasmota/arduino-esp32 · GitHub
[go: up one dir, main page]
Skip to content

Tasmota changes #638

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.

Sign up for GitHub

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

8000
Merged
merged 21 commits into from
May 19, 2025
Merged

Tasmota changes #638

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4f4477c
Tasmota changes
Jason2866 Feb 13, 2025
2523582
Merge branch 'espressif:master' into main
Jason2866 Feb 17, 2025
4bb8927
Fix HardwareSerial config
Jason2866 Feb 26, 2025
f840325
Fix HardwareSerial config
Jason2866 Feb 26, 2025
022923a
fix P4 compile error
Jason2866 Mar 5, 2025
e94e0a6
fix(network): fixes a macro name conflict warning
Jason2866 Mar 10, 2025
4d5dc7d
revert change NetworkClient.cpp
Jason2866 Mar 10, 2025
a94bc2d
fix(UART): sets the correct uart clock source when using begin(baudrate)
Jason2866 Mar 13, 2025
5e85ac4
fix(UART): sets the correct uart clock source when using begin(baudrate)
Jason2866 Mar 13, 2025
97ae20d
Update esp32-hal-uart.c
Jason2866 Mar 14, 2025
7706fbf
Update esp32-hal-uart.c
Jason2866 Mar 14, 2025
e323d05
Update esp32-hal-uart.c
Jason2866 Mar 14, 2025
2b0719a
Update USB.cpp
Jason2866 Apr 7, 2025
1318e72
Update esp32-hal-bt.c
Jason2866 Apr 11, 2025
0840603
Update esp32-hal-bt.h
Jason2866 Apr 11, 2025
0b4dfd4
Update esp32-hal-misc.c
Jason2866 Apr 11, 2025
11539ae
IDF 5.3.3 after https://github.com/tasmota/esp-idf/commit/53ab7b89f82…
Jason2866 May 13, 2025
abf7ea5
Update esp32-hal-i2c-slave.c
Jason2866 May 13, 2025
525a092
Update esp32-hal-bt.c
Jason2866 May 18, 2025
c3b254d
Update esp32-hal-bt.h
Jason2866 May 18, 2025
c5d1f15
Update esp32-hal-misc.c
Jason2866 May 18, 2025
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
fix(network): fixes a macro name conflict warning
  • Loading branch information
@Jason2866
Jason2866 authored Mar 10, 2025
commit e94e0a69a5f4b960e44847d605a46c12ed1fa1b7
6 changes: 5 additions & 1 deletion libraries/Network/src/NetworkClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
#include <lwip/netdb.h>
#include <errno.h>

#define IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
// It is already defined in IDF as:
//#define IN6_IS_ADDR_V4MAPPED(a) ip6_addr_isipv4mappedipv6((ip6_addr_t*)(a))
//#define ip6_addr_isipv4mappedipv6(ip6addr) (((ip6addr)->addr[0] == 0) && ((ip6addr)->addr[1] == 0) && (((ip6addr)->addr[2]) == PP_HTONL(0x0000FFFFUL)))
// Keeping as a memory of the change.
//#define _IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))

#define WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000)
#define WIFI_CLIENT_MAX_WRITE_RETRY (10)
Expand Down
0