8000 Merge branch 'master' into poc-cache-config · esp8266/Arduino@86c4e5a · GitHub
[go: up one dir, main page]

Skip to content

Commit 86c4e5a

Browse files
committed
Merge branch 'master' into poc-cache-config
rebuilt eboot.elf
2 parents 5786ec1 + ace5e98 commit 86c4e5a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

bootloaders/eboot/eboot.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ int main()
237237

238238
if (cmd.action == ACTION_COPY_RAW) {
239239
uint32_t cp = S('c', 'p', ':', 0);
240-
ets_printf((const char *)cp);
240+
ets_printf((const char *)&cp);
241241

242242
ets_wdt_disable();
243243
res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], false);
244244
ets_wdt_enable();
245245

246246
cp = S('0' + res, '\n', 0, 0 );
247-
ets_printf((const char *)cp);
247+
ets_printf((const char *)&cp);
248248
#if 0
249249
//devyte: this verify step below (cmp:) only works when the end of copy operation above does not overwrite the
250250
//beginning of the image in the empty area, see #7458. Disabling for now.
@@ -261,7 +261,7 @@ int main()
261261
}
262262

263263
cp = S('0' + res, '\n', 0, 0 );
264-
ets_printf((const char *)cp);
264+
ets_printf((const char *)&cp);
265265
#endif
266266
if (res == 0) {
267267
cmd.action = ACTION_LOAD_APP;

bootloaders/eboot/eboot.elf

-136 Bytes
Binary file not shown.

libraries/Netdump/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ sentence=tcpdump-like logger for esp8266/Arduino
66
paragraph=Dumps input / output packets on "Print"able type, or provide a TCP server for the real tcpdump. Check examples. Some other unrelated and independant tools are included.
77
category=Communication
88
url=https://
9-
architectures=esp8266 lwip
9+
architectures=esp8266

0 commit comments

Comments
 (0)
0