Merge branch 'dev095' of https://github.com/nodemcu/nodemcu-firmware into dev095
This commit is contained in:
commit
7839e9ba55
|
@ -13,7 +13,7 @@ bbs: [中文论坛Chinese bbs](http://bbs.nodemcu.com)<br />
|
||||||
Tencent QQ group QQ群: 309957875<br />
|
Tencent QQ group QQ群: 309957875<br />
|
||||||
|
|
||||||
# Change log
|
# Change log
|
||||||
2015-01-05<br />
|
2015-01-06<br />
|
||||||
update sdk to 0.9.5.<br />
|
update sdk to 0.9.5.<br />
|
||||||
pre_build bin now compiled by gcc toolchain.<br />
|
pre_build bin now compiled by gcc toolchain.<br />
|
||||||
memory/heap usage optimized.<br />
|
memory/heap usage optimized.<br />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define NODE_VERSION_INTERNAL 0U
|
#define NODE_VERSION_INTERNAL 0U
|
||||||
|
|
||||||
#define NODE_VERSION "NodeMcu 0.9.5"
|
#define NODE_VERSION "NodeMcu 0.9.5"
|
||||||
#define BUILD_DATE "build 20150105"
|
#define BUILD_DATE "build 20150106"
|
||||||
|
|
||||||
// #define FLASH_512K
|
// #define FLASH_512K
|
||||||
// #define FLASH_1M
|
// #define FLASH_1M
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "c_stdio.h"
|
#include "c_stdio.h"
|
||||||
// #include "driver/uart.h"
|
// #include "driver/uart.h"
|
||||||
|
|
||||||
unsigned char __print_buf[BUFSIZ];
|
|
||||||
int c_stdin = 999;
|
int c_stdin = 999;
|
||||||
int c_stdout = 1000;
|
int c_stdout = 1000;
|
||||||
int c_stderr = 1001;
|
int c_stderr = 1001;
|
||||||
|
|
|
@ -49,12 +49,13 @@ extern int c_stderr;
|
||||||
|
|
||||||
extern void output_redirect(const char *str);
|
extern void output_redirect(const char *str);
|
||||||
#define c_puts output_redirect
|
#define c_puts output_redirect
|
||||||
extern unsigned char __print_buf[BUFSIZ];
|
|
||||||
// #define c_printf os_printf
|
// #define c_printf os_printf
|
||||||
// int c_printf(const char *c, ...);
|
// int c_printf(const char *c, ...);
|
||||||
#define c_sprintf os_sprintf
|
#define c_sprintf os_sprintf
|
||||||
// #define c_vsprintf ets_vsprintf
|
// #define c_vsprintf ets_vsprintf
|
||||||
#define c_printf(...) do { \
|
#define c_printf(...) do { \
|
||||||
|
unsigned char __print_buf[BUFSIZ]; \
|
||||||
c_sprintf(__print_buf, __VA_ARGS__); \
|
c_sprintf(__print_buf, __VA_ARGS__); \
|
||||||
c_puts(__print_buf); \
|
c_puts(__print_buf); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue