File tree 4 files changed +15
-19
lines changed
libraries/ESP8266mDNS/src
4 files changed +15
-19
lines changed Original file line number Diff line number Diff line change 31
31
#include < lwip/igmp.h>
32
32
#include < lwip/prot/dns.h>
33
33
34
+ // these should be defined at build time
35
+ #ifndef ARDUINO_BOARD
36
+ #define ARDUINO_BOARD " ESP8266_GENERIC"
37
+ #endif
38
+
39
+ #ifndef ARDUINO_BOARD_ID
40
+ #define ARDUINO_BOARD_ID " generic"
41
+ #endif
42
+
34
43
namespace esp8266
35
44
{
36
45
@@ -40,16 +49,6 @@ namespace esp8266
40
49
namespace MDNSImplementation
41
50
{
42
51
43
- /* *
44
- STRINGIZE
45
- */
46
- #ifndef STRINGIZE
47
- #define STRINGIZE (x ) #x
48
- #endif
49
- #ifndef STRINGIZE_VALUE_OF
50
- #define STRINGIZE_VALUE_OF (x ) STRINGIZE(x)
51
- #endif
52
-
53
52
/* *
54
53
INTERFACE
55
54
*/
@@ -1258,7 +1257,8 @@ namespace MDNSImplementation
1258
1257
{
1259
1258
if ((!addServiceTxt (hService, " tcp_check" , " no" ))
1260
1259
|| (!addServiceTxt (hService, " ssh_upload" , " no" ))
1261
- || (!addServiceTxt (hService, " board" , STRINGIZE_VALUE_OF (ARDUINO_BOARD)))
1260
+ || (!addServiceTxt (hService, " board" , ARDUINO_BOARD_ID))
1261
+ || (!addServiceTxt (hService, " description" , ARDUINO_BOARD))
1262
1262
|| (!addServiceTxt (hService, " auth_upload" , (p_bAuthUpload) ? " yes" : " no" )))
1263
1263
{
1264
1264
removeService (hService);
Original file line number Diff line number Diff line change @@ -132,11 +132,6 @@ namespace esp8266
132
132
namespace MDNSImplementation
133
133
{
134
134
135
- // this should be defined at build time
136
- #ifndef ARDUINO_BOARD
137
- #define ARDUINO_BOARD " generic"
138
- #endif
139
-
140
135
#define MDNS_IP4_SUPPORT
141
136
#if LWIP_IPV6
142
137
// #define MDNS_IP6_SUPPORT
Original file line number Diff line number Diff line change @@ -128,13 +128,13 @@ recipe.hooks.linking.prelink.3.pattern="{compiler.path}{compiler.c.cmd}" -CC -E
128
128
recipe.hooks.linking.prelink.4.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} {build.mmuflags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
129
129
130
130
## Compile c files
131
- recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
131
+ recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_BOARD_ID="{_id}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
132
132
133
133
## Compile c++ files
134
- recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
134
+ recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_BOARD_ID="{_id}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
135
135
136
136
## Compile S files
137
- recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
137
+ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_BOARD_ID="{_id}" {build.led} {build.flash_flags} {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
138
138
139
139
## Create archives
140
140
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
Original file line number Diff line number Diff line change @@ -127,6 +127,7 @@ def scons_patched_match_splitext(path, suffixes=None):
127
127
"_GNU_SOURCE" ,
128
128
("ARDUINO" , 10805 ),
129
129
("ARDUINO_BOARD" , '\\ "PLATFORMIO_%s\\ "' % env .BoardConfig ().id .upper ()),
130
+ ("ARDUINO_BOARD_ID" , '\\ "%s\\ "' % env .BoardConfig ().id ),
130
131
"FLASHMODE_${BOARD_FLASH_MODE.upper()}" ,
131
132
"LWIP_OPEN_SRC"
132
133
],
You can’t perform that action at this time.
0 commit comments