Fixes for esp-open-sdk #37
Conversation
…ayer into fix-open-sdk
| @@ -22,7 +22,10 @@ patches: .patched | |||
| .patched: | |||
| for p in ../../patches/*.patch; do echo "--------- APPLY PATCH $${p#../../}:"; patch -d .. -p1 < $$p; done | |||
There was a problem hiding this comment.
for p in ../../patches/*.patch ../../patches/$(target)/*.patch; do ... ?
| @@ -58,7 +58,11 @@ void sntp_set_system_time (uint32_t t); | |||
|
|
|||
| #include "mem.h" // useful for os_malloc used in esp-arduino's mDNS | |||
|
|
|||
| #include "glue.h" // include assembly locking macro used below | |||
There was a problem hiding this comment.
I added the defines in this file to avoid duplication because they are needed on both sides.
What was the issue when using glue.h ?
There was a problem hiding this comment.
Okay I traced down the issue. It's that ARDUINO gets defined in glue.h. This causes an issue for my project that has another cross-platform library that also uses ARDUINO as a build select.
There was a problem hiding this comment.
Maybe we can change like this, what do you think ?
#define ARDUINO 0
#endif
#ifndef OPENSDK
#define OPENSDK 0
#endif
#if !ARDUINO && !OPENSDK
#error Must defined ARDUINO or OPENSDK
#endif
to
#if (!defined(ARDUINO) || !ARDUINO) && (!defined(OPENSDK) || !OPENSDK)
#error Must defined ARDUINO or OPENSDK
#endif
There was a problem hiding this comment.
If you don't mind changing ARDUINO to BLD_LWIP_ARDUINO and OPENSDK to BLD_LWIP_OPENSDK, that would resolve the issue for my project. I feel a bit silly requesting to change it just for my project, but the other library is huge and used by several developers and in other projects. If you're OK with that, I can make the changes and re-do the PR, and would make it easier for me to submit PRs in the future
|
That's OK I should have used less generic names. |
Including
glue.hinglue-lwip/arch/cc.hcauses errors when trying to compile in the target project sinceglue.handgluedebug.hdon't get copied into the system include folder and it will error. Doesn't hurt to just have a copy of the definition incc.h, at least IMO.Create an
arduinodir for arduino-specific patches, similar to open-sdk-specific patches. Putcyclic-timers-to-pmem.patchinto arduino dir and add logic inMakefile.lwip2to execute it for arduino builds.remove
napt.has part of clean directiveEnable
TCP_RANDOM_PORTfor open-sdklwipopts.h