Commit 655b06b4 authored by devsaurus's avatar devsaurus
Browse files

Merge remote-tracking branch 'upstream/dev' into dev

parents 588ea031 2c5c00a5
...@@ -24,10 +24,26 @@ Tencent QQ group: 309957875<br /> ...@@ -24,10 +24,26 @@ Tencent QQ group: 309957875<br />
- fix wifi smart connect - fix wifi smart connect
- add spi module (done) - add spi module (done)
- add mqtt module (done) - add mqtt module (done)
- add coap module - add coap module (in coap branch)
- cross compiler - cross compiler (done)
# Change log # Change log
2015-02-13<br />
add node.compile() api to compile lua text file into lua bytecode file.<br />
this will reduce memory usage noticeably when require modules into NodeMCU.<br />
raise internal LUA_BUFFERSIZE from 1024 to 4096.<br />
lua require("mod") will load "mod.lc" file first if exist.<br />
build latest pre_build bin.
2015-02-12<br />
fix float print.<br />
update spiffs, add file.rename api to file module.<br />
fix some file system bug. need more tests.<br />
add support to 8Mbyte, 16Mbyte flash.<br />
remove node.led() and node.key() api.<br />
some update to lua_modules and examples.<br />
build latest pre_build bin.
2015-01-27<br /> 2015-01-27<br />
support floating point LUA.<br /> support floating point LUA.<br />
use macro LUA_NUMBER_INTEGRAL in user_config.h control this feature.<br /> use macro LUA_NUMBER_INTEGRAL in user_config.h control this feature.<br />
...@@ -44,27 +60,6 @@ added LUA examples and modules [by dvv](https://github.com/dvv). <br /> ...@@ -44,27 +60,6 @@ added LUA examples and modules [by dvv](https://github.com/dvv). <br />
added node.readvdd33() API [by alonewolfx2](https://github.com/alonewolfx2).<br /> added node.readvdd33() API [by alonewolfx2](https://github.com/alonewolfx2).<br />
build pre_build bin. build pre_build bin.
2015-01-24<br />
migrate to sdk 0.9.5 release.<br />
tmr.time() now return second(not precise yet). <br />
build pre_build bin.
2015-01-23<br />
merge mqtt branch to master.<br />
build pre_build bin.
2015-01-18<br />
merge mqtt module to [new branch mqtt](https://github.com/nodemcu/nodemcu-firmware/tree/mqtt) from [https://github.com/tuanpmt/esp_mqtt](https://github.com/tuanpmt/esp_mqtt).<br />
merge spi module from iabdalkader:spi. <br />
fix #110,set local port to random in client mode.<br />
modify gpio.read to NOT set pin to input mode automatic.<br />
add PATH env with C:\MinGW\bin;C:\MinGW\msys\1.0\bin;C:\Python27 in eclipse project. resolve #103.
2015-01-08<br />
fix net.socket:send() issue when multi sends are called. <br />
*NOTE*: if data length is bigger than 1460, send next packet AFTER "sent" callback is called.<br />
fix file.read() api, take 0xFF as a regular byte, not EOF.<br />
pre_build/latest/nodemcu_512k_latest.bin is removed. use pre_build/latest/nodemcu_latest.bin instead.
[more change log](https://github.com/nodemcu/nodemcu-firmware/wiki)<br /> [more change log](https://github.com/nodemcu/nodemcu-firmware/wiki)<br />
...@@ -309,6 +304,7 @@ cu:send("hello") ...@@ -309,6 +304,7 @@ cu:send("hello")
####Use DS18B20 module extends your esp8266 ####Use DS18B20 module extends your esp8266
```lua ```lua
-- read temperature with DS18B20 -- read temperature with DS18B20
node.compile("ds18b20.lua") -- run this only once to compile and save to "ds18b20.lc"
t=require("ds18b20") t=require("ds18b20")
t.setup(9) t.setup(9)
addrs=t.addrs() addrs=t.addrs()
......
...@@ -7,12 +7,16 @@ ...@@ -7,12 +7,16 @@
#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 20150127" #define BUILD_DATE "build 20150214"
// #define DEVKIT_VERSION_0_9 1 // define this only if you use NodeMCU devkit v0.9
// #define FLASH_512K // #define FLASH_512K
// #define FLASH_1M // #define FLASH_1M
// #define FLASH_2M // #define FLASH_2M
// #define FLASH_4M // #define FLASH_4M
// #define FLASH_8M
// #define FLASH_16M
#define FLASH_AUTOSIZE #define FLASH_AUTOSIZE
// #define DEVELOP_VERSION // #define DEVELOP_VERSION
#define FULL_VERSION_FOR_USER #define FULL_VERSION_FOR_USER
...@@ -48,6 +52,7 @@ ...@@ -48,6 +52,7 @@
#define BUILD_SPIFFS 1 #define BUILD_SPIFFS 1
#define LUA_USE_MODULES #define LUA_USE_MODULES
#ifdef LUA_USE_MODULES #ifdef LUA_USE_MODULES
#define LUA_USE_MODULES_NODE #define LUA_USE_MODULES_NODE
#define LUA_USE_MODULES_FILE #define LUA_USE_MODULES_FILE
...@@ -64,13 +69,16 @@ ...@@ -64,13 +69,16 @@
#define LUA_USE_MODULES_BIT #define LUA_USE_MODULES_BIT
#define LUA_USE_MODULES_U8G #define LUA_USE_MODULES_U8G
#define LUA_USE_MODULES_MQTT #define LUA_USE_MODULES_MQTT
#define LUA_USE_MODULES_WS2812 // #define LUA_USE_MODULES_WS2812 // TODO: put this device specific module to device driver section.
#endif /* LUA_USE_MODULES */ #endif /* LUA_USE_MODULES */
// TODO: put device specific module to device driver section.
#ifdef LUA_USE_DEVICE_DRIVER
#define LUA_USE_DEVICE_WS2812
#endif /* LUA_USE_DEVICE_DRIVER */
// #define LUA_NUMBER_INTEGRAL // #define LUA_NUMBER_INTEGRAL
#ifndef LUA_NUMBER_INTEGRAL
#define PRINTF_LONG_SUPPORT
#endif
#define LUA_OPTRAM #define LUA_OPTRAM
#ifdef LUA_OPTRAM #ifdef LUA_OPTRAM
...@@ -80,6 +88,8 @@ ...@@ -80,6 +88,8 @@
#endif /* LUA_OPTRAM */ #endif /* LUA_OPTRAM */
#define READLINE_INTERVAL 80 #define READLINE_INTERVAL 80
#ifdef DEVKIT_VERSION_0_9
#define KEY_SHORT_MS 200 #define KEY_SHORT_MS 200
#define KEY_LONG_MS 3000 #define KEY_LONG_MS 3000
#define KEY_SHORT_COUNT (KEY_SHORT_MS / READLINE_INTERVAL) #define KEY_SHORT_COUNT (KEY_SHORT_MS / READLINE_INTERVAL)
...@@ -87,6 +97,7 @@ ...@@ -87,6 +97,7 @@
#define LED_HIGH_COUNT_DEFAULT 10 #define LED_HIGH_COUNT_DEFAULT 10
#define LED_LOW_COUNT_DEFAULT 0 #define LED_LOW_COUNT_DEFAULT 0
#endif
// Configure U8glib fonts // Configure U8glib fonts
......
This diff is collapsed.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include "c_types.h" #include "c_types.h"
#include "c_string.h" #include "c_string.h"
#include "user_interface.h" #include "user_interface.h"
#include "user_config.h"
// const char *lua_init_value = "print(\"Hello world\")"; // const char *lua_init_value = "print(\"Hello world\")";
const char *lua_init_value = "@init.lua"; const char *lua_init_value = "@init.lua";
...@@ -12,8 +13,10 @@ const char *lua_init_value = "@init.lua"; ...@@ -12,8 +13,10 @@ const char *lua_init_value = "@init.lua";
// } // }
// void c_exit(int e){ // void c_exit(int e){
// } // }
const char *c_getenv(const char *__string){ const char *c_getenv(const char *__string)
if (c_strcmp(__string, "LUA_INIT") == 0){ {
if (c_strcmp(__string, "LUA_INIT") == 0)
{
return lua_init_value; return lua_init_value;
} }
return NULL; return NULL;
...@@ -55,14 +58,8 @@ const char *c_getenv(const char *__string){ ...@@ -55,14 +58,8 @@ const char *c_getenv(const char *__string){
#include <string.h> #include <string.h>
//#include "mprec.h" //#include "mprec.h"
double c_strtod(const char *string, char **endPtr) double powersOf10[] ICACHE_STORE_ATTR ICACHE_RODATA_ATTR = /* Table giving binary powers of 10. Entry */
{ {
int maxExponent = 511; /* Largest possible base 10 exponent. Any
* exponent larger than this will already
* produce underflow or overflow, so there's
* no need to worry about additional digits.
*/
double powersOf10[] = { /* Table giving binary powers of 10. Entry */
10., /* is 10^2^i. Used to convert decimal */ 10., /* is 10^2^i. Used to convert decimal */
100., /* exponents into floating-point numbers. */ 100., /* exponents into floating-point numbers. */
1.0e4, 1.0e4,
...@@ -72,7 +69,16 @@ double c_strtod(const char *string, char **endPtr) ...@@ -72,7 +69,16 @@ double c_strtod(const char *string, char **endPtr)
1.0e64, 1.0e64,
1.0e128, 1.0e128,
1.0e256 1.0e256
}; };
double c_strtod(const char *string, char **endPtr)
{
int maxExponent = 511; /* Largest possible base 10 exponent. Any
* exponent larger than this will already
* produce underflow or overflow, so there's
* no need to worry about additional digits.
*/
int sign, expSign = FALSE; int sign, expSign = FALSE;
double fraction, dblExp, *d; double fraction, dblExp, *d;
register const char *p; register const char *p;
...@@ -98,14 +104,19 @@ double c_strtod(const char *string, char **endPtr) ...@@ -98,14 +104,19 @@ double c_strtod(const char *string, char **endPtr)
*/ */
p = string; p = string;
while (isspace((unsigned char)(*p))) { while (isspace((unsigned char)(*p)))
{
p += 1; p += 1;
} }
if (*p == '-') { if (*p == '-')
{
sign = TRUE; sign = TRUE;
p += 1; p += 1;
} else { }
if (*p == '+') { else
{
if (*p == '+')
{
p += 1; p += 1;
} }
sign = FALSE; sign = FALSE;
...@@ -120,8 +131,10 @@ double c_strtod(const char *string, char **endPtr) ...@@ -120,8 +131,10 @@ double c_strtod(const char *string, char **endPtr)
for (mantSize = 0; ; mantSize += 1) for (mantSize = 0; ; mantSize += 1)
{ {
c = *p; c = *p;
if (!isdigit(c)) { if (!isdigit(c))
if ((c != '.') || (decPt >= 0)) { {
if ((c != '.') || (decPt >= 0))
{
break; break;
} }
decPt = mantSize; decPt = mantSize;
...@@ -138,44 +151,55 @@ double c_strtod(const char *string, char **endPtr) ...@@ -138,44 +151,55 @@ double c_strtod(const char *string, char **endPtr)
pExp = p; pExp = p;
p -= mantSize; p -= mantSize;
if (decPt < 0) { if (decPt < 0)
{
decPt = mantSize; decPt = mantSize;
} else { }
else
{
mantSize -= 1; /* One of the digits was the point. */ mantSize -= 1; /* One of the digits was the point. */
} }
if (mantSize > 18) { if (mantSize > 18)
{
fracExp = decPt - 18; fracExp = decPt - 18;
mantSize = 18; mantSize = 18;
} else { }
else
{
fracExp = decPt - mantSize; fracExp = decPt - mantSize;
} }
if (mantSize == 0) { if (mantSize == 0)
{
fraction = 0.0; fraction = 0.0;
p = string; p = string;
goto done; goto done;
} else { }
else
{
int frac1, frac2; int frac1, frac2;
frac1 = 0; frac1 = 0;
for ( ; mantSize > 9; mantSize -= 1) for ( ; mantSize > 9; mantSize -= 1)
{ {
c = *p; c = *p;
p += 1; p += 1;
if (c == '.') { if (c == '.')
{
c = *p; c = *p;
p += 1; p += 1;
} }
frac1 = 10*frac1 + (c - '0'); frac1 = 10 * frac1 + (c - '0');
} }
frac2 = 0; frac2 = 0;
for (; mantSize > 0; mantSize -= 1) for (; mantSize > 0; mantSize -= 1)
{ {
c = *p; c = *p;
p += 1; p += 1;
if (c == '.') { if (c == '.')
{
c = *p; c = *p;
p += 1; p += 1;
} }
frac2 = 10*frac2 + (c - '0'); frac2 = 10 * frac2 + (c - '0');
} }
fraction = (1.0e9 * frac1) + frac2; fraction = (1.0e9 * frac1) + frac2;
} }
...@@ -185,29 +209,39 @@ double c_strtod(const char *string, char **endPtr) ...@@ -185,29 +209,39 @@ double c_strtod(const char *string, char **endPtr)
*/ */
p = pExp; p = pExp;
if ((*p == 'E') || (*p == 'e')) { if ((*p == 'E') || (*p == 'e'))
{
p += 1; p += 1;
if (*p == '-') { if (*p == '-')
{
expSign = TRUE; expSign = TRUE;
p += 1; p += 1;
} else { }
if (*p == '+') { else
{
if (*p == '+')
{
p += 1; p += 1;
} }
expSign = FALSE; expSign = FALSE;
} }
if (!isdigit((unsigned char)(*p))) { if (!isdigit((unsigned char)(*p)))
{
p = pExp; p = pExp;
goto done; goto done;
} }
while (isdigit((unsigned char)(*p))) { while (isdigit((unsigned char)(*p)))
{
exp = exp * 10 + (*p - '0'); exp = exp * 10 + (*p - '0');
p += 1; p += 1;
} }
} }
if (expSign) { if (expSign)
{
exp = fracExp - exp; exp = fracExp - exp;
} else { }
else
{
exp = fracExp + exp; exp = fracExp + exp;
} }
...@@ -218,34 +252,45 @@ double c_strtod(const char *string, char **endPtr) ...@@ -218,34 +252,45 @@ double c_strtod(const char *string, char **endPtr)
* fraction. * fraction.
*/ */
if (exp < 0) { if (exp < 0)
{
expSign = TRUE; expSign = TRUE;
exp = -exp; exp = -exp;
} else { }
else
{
expSign = FALSE; expSign = FALSE;
} }
if (exp > maxExponent) { if (exp > maxExponent)
{
exp = maxExponent; exp = maxExponent;
// errno = ERANGE; // errno = ERANGE;
} }
dblExp = 1.0; dblExp = 1.0;
for (d = powersOf10; exp != 0; exp >>= 1, d += 1) { for (d = powersOf10; exp != 0; exp >>= 1, d += 1)
if (exp & 01) { {
if (exp & 01)
{
dblExp *= *d; dblExp *= *d;
} }
} }
if (expSign) { if (expSign)
{
fraction /= dblExp; fraction /= dblExp;
} else { }
else
{
fraction *= dblExp; fraction *= dblExp;
} }
done: done:
if (endPtr != NULL) { if (endPtr != NULL)
{
*endPtr = (char *) p; *endPtr = (char *) p;
} }
if (sign) { if (sign)
{
return -fraction; return -fraction;
} }
return fraction; return fraction;
......
...@@ -652,7 +652,8 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) { ...@@ -652,7 +652,8 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
typedef struct LoadFSF { typedef struct LoadFSF {
int extraline; int extraline;
int f; int f;
char buff[LUAL_BUFFERSIZE]; char *buff;
int len;
} LoadFSF; } LoadFSF;
...@@ -665,7 +666,7 @@ static const char *getFSF (lua_State *L, void *ud, size_t *size) { ...@@ -665,7 +666,7 @@ static const char *getFSF (lua_State *L, void *ud, size_t *size) {
return "\n"; return "\n";
} }
if (fs_eof(lf->f)) return NULL; if (fs_eof(lf->f)) return NULL;
*size = fs_read(lf->f, lf->buff, sizeof(lf->buff)); *size = fs_read(lf->f, lf->buff, (lf->len));
return (*size > 0) ? lf->buff : NULL; return (*size > 0) ? lf->buff : NULL;
} }
...@@ -684,6 +685,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) { ...@@ -684,6 +685,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
int c; int c;
int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */ int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
lf.extraline = 0; lf.extraline = 0;
// lf.len = LUAL_BUFFERSIZE;
lf.len = 0;
lf.buff = NULL;
if (filename == NULL) { if (filename == NULL) {
return luaL_error(L, "filename is NULL"); return luaL_error(L, "filename is NULL");
} }
...@@ -692,6 +696,10 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) { ...@@ -692,6 +696,10 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
lf.f = fs_open(filename, FS_RDONLY); lf.f = fs_open(filename, FS_RDONLY);
if (lf.f < FS_OPEN_OK) return errfsfile(L, "open", fnameindex); if (lf.f < FS_OPEN_OK) return errfsfile(L, "open", fnameindex);
} }
lf.len = fs_size(lf.f) + 32;
lf.buff = c_zalloc(lf.len);
if(!lf.buff) return LUA_ERRMEM;
c = fs_getc(lf.f); c = fs_getc(lf.f);
if (c == '#') { /* Unix exec. file? */ if (c == '#') { /* Unix exec. file? */
lf.extraline = 1; lf.extraline = 1;
...@@ -701,7 +709,13 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) { ...@@ -701,7 +709,13 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */ if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
fs_close(lf.f); fs_close(lf.f);
lf.f = fs_open(filename, FS_RDONLY); /* reopen in binary mode */ lf.f = fs_open(filename, FS_RDONLY); /* reopen in binary mode */
if (lf.f < FS_OPEN_OK) return errfsfile(L, "reopen", fnameindex); if (lf.f < FS_OPEN_OK){
if(lf.buff)
c_free(lf.buff);
lf.buff = NULL;
lf.len = 0;
return errfsfile(L, "reopen", fnameindex);
}
/* skip eventual `#!...' */ /* skip eventual `#!...' */
while ((c = fs_getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ; while ((c = fs_getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ;
lf.extraline = 0; lf.extraline = 0;
...@@ -711,6 +725,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) { ...@@ -711,6 +725,9 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
if (filename) fs_close(lf.f); /* close file (even in case of errors) */ if (filename) fs_close(lf.f); /* close file (even in case of errors) */
lua_remove(L, fnameindex); lua_remove(L, fnameindex);
if(lf.buff)
c_free(lf.buff);
lf.buff = NULL;
return status; return status;
} }
......
...@@ -30,10 +30,13 @@ lua_Load gLoad; ...@@ -30,10 +30,13 @@ lua_Load gLoad;
static const char *progname = LUA_PROGNAME; static const char *progname = LUA_PROGNAME;
#ifdef DEVKIT_VERSION_0_9
static int key_press_count = 0; static int key_press_count = 0;
int led_high_count = LED_HIGH_COUNT_DEFAULT; int led_high_count = LED_HIGH_COUNT_DEFAULT;
int led_low_count = LED_LOW_COUNT_DEFAULT; int led_low_count = LED_LOW_COUNT_DEFAULT;
static int led_count = 0; static int led_count = 0;
#endif
#if 0 #if 0
static void lstop (lua_State *L, lua_Debug *ar) { static void lstop (lua_State *L, lua_Debug *ar) {
(void)ar; /* unused arg. */ (void)ar; /* unused arg. */
...@@ -541,6 +544,7 @@ void dojob(lua_Load *load){ ...@@ -541,6 +544,7 @@ void dojob(lua_Load *load){
// NODE_DBG("dojob() is called with firstline.\n"); // NODE_DBG("dojob() is called with firstline.\n");
} }
#ifdef DEVKIT_VERSION_0_9
extern void key_long_press(void *arg); extern void key_long_press(void *arg);
extern void key_short_press(void *arg); extern void key_short_press(void *arg);
static bool key_short_pressed = false; static bool key_short_pressed = false;
...@@ -579,6 +583,7 @@ void update_key_led(){ ...@@ -579,6 +583,7 @@ void update_key_led(){
} }
} }
} }
#endif
#ifndef uart_putc #ifndef uart_putc
#define uart_putc uart0_putc #define uart_putc uart0_putc
...@@ -590,7 +595,9 @@ extern uint16_t need_len; ...@@ -590,7 +595,9 @@ extern uint16_t need_len;
extern int16_t end_char; extern int16_t end_char;
void readline(lua_Load *load){ void readline(lua_Load *load){
// NODE_DBG("readline() is called.\n"); // NODE_DBG("readline() is called.\n");
#ifdef DEVKIT_VERSION_0_9
update_key_led(); update_key_led();
#endif
char ch; char ch;
while (uart_getc(&ch)) while (uart_getc(&ch))
{ {
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
#ifndef LUA_RPC #ifndef LUA_RPC
#define LUA_PATH_DEFAULT "?.lua;?.lc" #define LUA_PATH_DEFAULT "?.lc;?.lua"
#define LUA_CPATH_DEFAULT "" #define LUA_CPATH_DEFAULT ""
#else // #ifndef LUA_RPC #else // #ifndef LUA_RPC
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT \
...@@ -601,8 +601,7 @@ extern int readline4lua(const char *prompt, char *buffer, int length); ...@@ -601,8 +601,7 @@ extern int readline4lua(const char *prompt, char *buffer, int length);
#endif // #if !defined LUA_INTEGRAL_LONGLONG #endif // #if !defined LUA_INTEGRAL_LONGLONG
#else #else
#define LUA_NUMBER_SCAN "%lf" #define LUA_NUMBER_SCAN "%lf"
//#define LUA_NUMBER_FMT "%.14g" #define LUA_NUMBER_FMT "%.14g"
#define LUA_NUMBER_FMT "%g"
#endif // #if defined LUA_NUMBER_INTEGRAL #endif // #if defined LUA_NUMBER_INTEGRAL
#define lua_number2str(s,n) c_sprintf((s), LUA_NUMBER_FMT, (n)) #define lua_number2str(s,n) c_sprintf((s), LUA_NUMBER_FMT, (n))
#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ #define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */
......
...@@ -125,7 +125,7 @@ static int file_remove( lua_State* L ) ...@@ -125,7 +125,7 @@ static int file_remove( lua_State* L )
if( len > FS_NAME_MAX_LENGTH ) if( len > FS_NAME_MAX_LENGTH )
return luaL_error(L, "filename too long"); return luaL_error(L, "filename too long");
file_close(L); file_close(L);
SPIFFS_remove(&fs, fname); SPIFFS_remove(&fs, (char *)fname);
return 0; return 0;
} }
...@@ -150,6 +150,31 @@ static int file_check( lua_State* L ) ...@@ -150,6 +150,31 @@ static int file_check( lua_State* L )
} }
#endif #endif
// Lua: rename("oldname", "newname")
static int file_rename( lua_State* L )
{
size_t len;
if((FS_OPEN_OK - 1)!=file_fd){
fs_close(file_fd);
file_fd = FS_OPEN_OK - 1;
}
const char *oldname = luaL_checklstring( L, 1, &len );
if( len > FS_NAME_MAX_LENGTH )
return luaL_error(L, "filename too long");
const char *newname = luaL_checklstring( L, 2, &len );
if( len > FS_NAME_MAX_LENGTH )
return luaL_error(L, "filename too long");
if(SPIFFS_OK==myspiffs_rename( oldname, newname )){
lua_pushboolean(L, 1);
} else {
lua_pushboolean(L, 0);
}
return 1;
}
#endif #endif
// g_read() // g_read()
...@@ -282,6 +307,7 @@ const LUA_REG_TYPE file_map[] = ...@@ -282,6 +307,7 @@ const LUA_REG_TYPE file_map[] =
{ LSTRKEY( "seek" ), LFUNCVAL( file_seek ) }, { LSTRKEY( "seek" ), LFUNCVAL( file_seek ) },
{ LSTRKEY( "flush" ), LFUNCVAL( file_flush ) }, { LSTRKEY( "flush" ), LFUNCVAL( file_flush ) },
// { LSTRKEY( "check" ), LFUNCVAL( file_check ) }, // { LSTRKEY( "check" ), LFUNCVAL( file_check ) },
{ LSTRKEY( "rename" ), LFUNCVAL( file_rename ) },
#endif #endif
#if LUA_OPTIMIZE_MEMORY > 0 #if LUA_OPTIMIZE_MEMORY > 0
......
...@@ -1241,6 +1241,31 @@ static int net_socket_unhold( lua_State* L ) ...@@ -1241,6 +1241,31 @@ static int net_socket_unhold( lua_State* L )
return 0; return 0;
} }
// Lua: ip,port = sk:getpeer()
static int net_socket_getpeer( lua_State* L )
{
lnet_userdata *nud;
const char *mt = "net.socket";
nud = (lnet_userdata *)luaL_checkudata(L, 1, mt);
luaL_argcheck(L, nud, 1, "Server/Socket expected");
if(nud!=NULL && nud->pesp_conn!=NULL ){
char temp[20] = {0};
c_sprintf(temp, IPSTR, IP2STR( &(nud->pesp_conn->proto.tcp->remote_ip) ) );
if ( nud->pesp_conn->proto.tcp->remote_port != 0 ) {
lua_pushstring( L, temp );
lua_pushinteger( L, nud->pesp_conn->proto.tcp->remote_port );
} else {
lua_pushnil( L );
lua_pushnil( L );
}
} else {
lua_pushnil( L );
lua_pushnil( L );
}
return 2;
}
// Lua: socket:dns( string, function(ip) ) // Lua: socket:dns( string, function(ip) )
static int net_socket_dns( lua_State* L ) static int net_socket_dns( lua_State* L )
{ {
...@@ -1302,6 +1327,7 @@ static const LUA_REG_TYPE net_socket_map[] = ...@@ -1302,6 +1327,7 @@ static const LUA_REG_TYPE net_socket_map[] =
{ LSTRKEY( "hold" ), LFUNCVAL ( net_socket_hold ) }, { LSTRKEY( "hold" ), LFUNCVAL ( net_socket_hold ) },
{ LSTRKEY( "unhold" ), LFUNCVAL ( net_socket_unhold ) }, { LSTRKEY( "unhold" ), LFUNCVAL ( net_socket_unhold ) },
{ LSTRKEY( "dns" ), LFUNCVAL ( net_socket_dns ) }, { LSTRKEY( "dns" ), LFUNCVAL ( net_socket_dns ) },
{ LSTRKEY( "getpeer" ), LFUNCVAL ( net_socket_getpeer ) },
// { LSTRKEY( "delete" ), LFUNCVAL ( net_socket_delete ) }, // { LSTRKEY( "delete" ), LFUNCVAL ( net_socket_delete ) },
{ LSTRKEY( "__gc" ), LFUNCVAL ( net_socket_delete ) }, { LSTRKEY( "__gc" ), LFUNCVAL ( net_socket_delete ) },
#if LUA_OPTIMIZE_MEMORY > 0 #if LUA_OPTIMIZE_MEMORY > 0
......
// Module for interfacing with system // Module for interfacing with system
//#include "lua.h" #include "lua.h"
#include "lualib.h"
#include "lauxlib.h" #include "lauxlib.h"
#include "ldo.h"
#include "lfunc.h"
#include "lmem.h"
#include "lobject.h"
#include "lopcodes.h"
#include "lstring.h"
#include "lundump.h"
#include "platform.h" #include "platform.h"
#include "auxmods.h" #include "auxmods.h"
#include "lrotable.h" #include "lrotable.h"
...@@ -14,6 +22,7 @@ ...@@ -14,6 +22,7 @@
//#include "spi_flash.h" //#include "spi_flash.h"
#include "user_interface.h" #include "user_interface.h"
#include "flash_api.h" #include "flash_api.h"
#include "flash_fs.h"
// Lua: restart() // Lua: restart()
static int node_restart( lua_State* L ) static int node_restart( lua_State* L )
...@@ -124,6 +133,9 @@ static int node_heap( lua_State* L ) ...@@ -124,6 +133,9 @@ static int node_heap( lua_State* L )
return 1; return 1;
} }
static lua_State *gL = NULL;
#ifdef DEVKIT_VERSION_0_9
extern int led_high_count; // this is defined in lua.c extern int led_high_count; // this is defined in lua.c
extern int led_low_count; extern int led_low_count;
// Lua: led(low, high) // Lua: led(low, high)
...@@ -155,7 +167,6 @@ static int node_led( lua_State* L ) ...@@ -155,7 +167,6 @@ static int node_led( lua_State* L )
static int long_key_ref = LUA_NOREF; static int long_key_ref = LUA_NOREF;
static int short_key_ref = LUA_NOREF; static int short_key_ref = LUA_NOREF;
static lua_State *gL = NULL;
void default_long_press(void *arg){ void default_long_press(void *arg){
if(led_high_count == 12 && led_low_count == 12){ if(led_high_count == 12 && led_low_count == 12){
...@@ -228,6 +239,7 @@ static int node_key( lua_State* L ) ...@@ -228,6 +239,7 @@ static int node_key( lua_State* L )
return 0; return 0;
} }
#endif
extern lua_Load gLoad; extern lua_Load gLoad;
extern os_timer_t lua_timer; extern os_timer_t lua_timer;
...@@ -308,6 +320,73 @@ static int node_output( lua_State* L ) ...@@ -308,6 +320,73 @@ static int node_output( lua_State* L )
return 0; return 0;
} }
static int writer(lua_State* L, const void* p, size_t size, void* u)
{
UNUSED(L);
int file_fd = *( (int *)u );
if((FS_OPEN_OK - 1)==file_fd)
return 1;
NODE_DBG("get fd:%d,size:%d\n",file_fd,size);
if(size!=0 && (size!=fs_write(file_fd, (const char *)p, size)) )
return 1;
NODE_DBG("write fd:%d,size:%d\n",file_fd,size);
return 0;
}
#define toproto(L,i) (clvalue(L->top+(i))->l.p)
// Lua: compile(filename) -- compile lua file into lua bytecode, and save to .lc
static int node_compile( lua_State* L )
{
Proto* f;
int file_fd = FS_OPEN_OK - 1;
size_t len;
const char *fname = luaL_checklstring( L, 1, &len );
if( len > FS_NAME_MAX_LENGTH )
return luaL_error(L, "filename too long");
char output[FS_NAME_MAX_LENGTH];
c_strcpy(output, fname);
// check here that filename end with ".lua".
if(len<4 || (c_strcmp( output+len-4,".lua")!=0) )
return luaL_error(L, "not a .lua file");
output[c_strlen(output)-2] = 'c';
output[c_strlen(output)-1] = '\0';
NODE_DBG(output);
NODE_DBG("\n");
if (luaL_loadfsfile(L,fname)!=0){
return luaL_error(L, lua_tostring(L,-1));
}
f = toproto(L,-1);
int stripping = 1; /* strip debug information? */
file_fd = fs_open(output, fs_mode2flag("w+"));
if(file_fd < FS_OPEN_OK)
{
return luaL_error(L, "cannot open/write to file");
}
lua_lock(L);
int result=luaU_dump(L,f,writer,&file_fd,stripping);
lua_unlock(L);
fs_flush(file_fd);
fs_close(file_fd);
file_fd = FS_OPEN_OK - 1;
if (result==LUA_ERR_CC_INTOVERFLOW){
return luaL_error(L, "value too big or small for target integer type");
}
if (result==LUA_ERR_CC_NOTINTEGER){
return luaL_error(L, "target lua_Number is integral but fractional value found");
}
return 0;
}
// Module function map // Module function map
#define MIN_OPT_LEVEL 2 #define MIN_OPT_LEVEL 2
#include "lrodefs.h" #include "lrodefs.h"
...@@ -320,11 +399,14 @@ const LUA_REG_TYPE node_map[] = ...@@ -320,11 +399,14 @@ const LUA_REG_TYPE node_map[] =
{ LSTRKEY( "flashid" ), LFUNCVAL( node_flashid ) }, { LSTRKEY( "flashid" ), LFUNCVAL( node_flashid ) },
{ LSTRKEY( "flashsize" ), LFUNCVAL( node_flashsize) }, { LSTRKEY( "flashsize" ), LFUNCVAL( node_flashsize) },
{ LSTRKEY( "heap" ), LFUNCVAL( node_heap ) }, { LSTRKEY( "heap" ), LFUNCVAL( node_heap ) },
#ifdef DEVKIT_VERSION_0_9
{ LSTRKEY( "key" ), LFUNCVAL( node_key ) }, { LSTRKEY( "key" ), LFUNCVAL( node_key ) },
{ LSTRKEY( "led" ), LFUNCVAL( node_led ) }, { LSTRKEY( "led" ), LFUNCVAL( node_led ) },
#endif
{ LSTRKEY( "input" ), LFUNCVAL( node_input ) }, { LSTRKEY( "input" ), LFUNCVAL( node_input ) },
{ LSTRKEY( "output" ), LFUNCVAL( node_output ) }, { LSTRKEY( "output" ), LFUNCVAL( node_output ) },
{ LSTRKEY( "readvdd33" ), LFUNCVAL( node_readvdd33) }, { LSTRKEY( "readvdd33" ), LFUNCVAL( node_readvdd33) },
{ LSTRKEY( "compile" ), LFUNCVAL( node_compile) },
// Combined to dsleep(us, option) // Combined to dsleep(us, option)
// { LSTRKEY( "dsleepsetoption" ), LFUNCVAL( node_deepsleep_setoption) }, // { LSTRKEY( "dsleepsetoption" ), LFUNCVAL( node_deepsleep_setoption) },
#if LUA_OPTIMIZE_MEMORY > 0 #if LUA_OPTIMIZE_MEMORY > 0
......
...@@ -256,8 +256,19 @@ static int wifi_setip( lua_State* L, uint8_t mode ) ...@@ -256,8 +256,19 @@ static int wifi_setip( lua_State* L, uint8_t mode )
ip = parse_key(L, "gateway"); ip = parse_key(L, "gateway");
if(ip!=0) if(ip!=0)
pTempIp.gw.addr = ip; pTempIp.gw.addr = ip;
if(STATION_IF == mode)
{
wifi_station_dhcpc_stop(); wifi_station_dhcpc_stop();
lua_pushboolean(L,wifi_set_ip_info(mode, &pTempIp)); lua_pushboolean(L,wifi_set_ip_info(mode, &pTempIp));
}
else
{
wifi_softap_dhcps_stop();
lua_pushboolean(L,wifi_set_ip_info(mode, &pTempIp));
wifi_softap_dhcps_start();
}
return 1; return 1;
} }
......
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
#define FLASH_SEC_NUM 0x200 #define FLASH_SEC_NUM 0x200
#elif defined(FLASH_4M) #elif defined(FLASH_4M)
#define FLASH_SEC_NUM 0x400 #define FLASH_SEC_NUM 0x400
#elif defined(FLASH_8M)
#define FLASH_SEC_NUM 0x800
#elif defined(FLASH_16M)
#define FLASH_SEC_NUM 0x1000
#elif defined(FLASH_AUTOSIZE) #elif defined(FLASH_AUTOSIZE)
#define FLASH_SEC_NUM (flash_get_sec_num()) #define FLASH_SEC_NUM (flash_get_sec_num())
#else #else
......
...@@ -56,6 +56,12 @@ uint32_t flash_get_size_byte(void) ...@@ -56,6 +56,12 @@ uint32_t flash_get_size_byte(void)
case SIZE_32MBIT: case SIZE_32MBIT:
// 32Mbit, 4MByte // 32Mbit, 4MByte
flash_size = 4 * 1024 * 1024; flash_size = 4 * 1024 * 1024;
case SIZE_64MBIT:
// 64Mbit, 8MByte
flash_size = 8 * 1024 * 1024;
case SIZE_128MBIT:
// 128Mbit, 16MByte
flash_size = 16 * 1024 * 1024;
break; break;
default: default:
// Unknown flash size, fall back mode. // Unknown flash size, fall back mode.
......
...@@ -52,6 +52,8 @@ typedef struct ...@@ -52,6 +52,8 @@ typedef struct
SIZE_8MBIT = 2, SIZE_8MBIT = 2,
SIZE_16MBIT = 3, SIZE_16MBIT = 3,
SIZE_32MBIT = 4, SIZE_32MBIT = 4,
SIZE_64MBIT = 5,
SIZE_128MBIT = 6,
} size : 4; } size : 4;
} ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo; } ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo;
......
...@@ -68,6 +68,8 @@ ...@@ -68,6 +68,8 @@
#define fs_format myspiffs_format #define fs_format myspiffs_format
#define fs_check myspiffs_check #define fs_check myspiffs_check
#define fs_rename myspiffs_rename
#define fs_size myspiffs_size
#define FS_NAME_MAX_LENGTH SPIFFS_OBJ_NAME_LEN #define FS_NAME_MAX_LENGTH SPIFFS_OBJ_NAME_LEN
......
...@@ -185,6 +185,8 @@ uint32_t platform_uart_setup( unsigned id, uint32_t baud, int databits, int pari ...@@ -185,6 +185,8 @@ uint32_t platform_uart_setup( unsigned id, uint32_t baud, int databits, int pari
{ {
switch( baud ) switch( baud )
{ {
case BIT_RATE_300:
case BIT_RATE_600:
case BIT_RATE_1200: case BIT_RATE_1200:
case BIT_RATE_2400: case BIT_RATE_2400:
case BIT_RATE_4800: case BIT_RATE_4800:
...@@ -195,8 +197,11 @@ uint32_t platform_uart_setup( unsigned id, uint32_t baud, int databits, int pari ...@@ -195,8 +197,11 @@ uint32_t platform_uart_setup( unsigned id, uint32_t baud, int databits, int pari
case BIT_RATE_74880: case BIT_RATE_74880:
case BIT_RATE_115200: case BIT_RATE_115200:
case BIT_RATE_230400: case BIT_RATE_230400:
case BIT_RATE_256000:
case BIT_RATE_460800: case BIT_RATE_460800:
case BIT_RATE_921600: case BIT_RATE_921600:
case BIT_RATE_1843200:
case BIT_RATE_3686400:
UartDev.baut_rate = baud; UartDev.baut_rate = baud;
break; break;
default: default:
......
The MIT License (MIT)
Copyright (c) 2013-2015 Peter Andersson (pelleplutt1976<at>gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
...@@ -40,7 +40,7 @@ Also, toss up some of the needed buffers: ...@@ -40,7 +40,7 @@ Also, toss up some of the needed buffers:
static u8_t spiffs_work_buf[LOG_PAGE_SIZE*2]; static u8_t spiffs_work_buf[LOG_PAGE_SIZE*2];
static u8_t spiffs_fds[32*4]; static u8_t spiffs_fds[32*4];
static u8_t spiffs_cache[(LOG_PAGE_SIZE+32)*4]; static u8_t spiffs_cache_buf[(LOG_PAGE_SIZE+32)*4];
Now, write the my_spiffs_mount function: Now, write the my_spiffs_mount function:
...@@ -50,7 +50,7 @@ Now, write the my_spiffs_mount function: ...@@ -50,7 +50,7 @@ Now, write the my_spiffs_mount function:
cfg.phys_addr = 0; // start spiffs at start of spi flash cfg.phys_addr = 0; // start spiffs at start of spi flash
cfg.phys_erase_block = 65536; // according to datasheet cfg.phys_erase_block = 65536; // according to datasheet
cfg.log_block_size = 65536; // let us not complicate things cfg.log_block_size = 65536; // let us not complicate things
cfg.log_block_size = LOG_PAGE_SIZE; // as we said cfg.log_page_size = LOG_PAGE_SIZE; // as we said
cfg.hal_read_f = my_spi_read; cfg.hal_read_f = my_spi_read;
cfg.hal_write_f = my_spi_write; cfg.hal_write_f = my_spi_write;
...@@ -61,8 +61,8 @@ Now, write the my_spiffs_mount function: ...@@ -61,8 +61,8 @@ Now, write the my_spiffs_mount function:
spiffs_work_buf, spiffs_work_buf,
spiffs_fds, spiffs_fds,
sizeof(spiffs_fds), sizeof(spiffs_fds),
spiffs_cache, spiffs_cache_buf,
sizeof(spiffs_cache), sizeof(spiffs_cache_buf),
0); 0);
printf("mount res: %i\n", res); printf("mount res: %i\n", res);
} }
...@@ -127,6 +127,29 @@ Compile, run, cross fingers hard, and you'll get the output: ...@@ -127,6 +127,29 @@ Compile, run, cross fingers hard, and you'll get the output:
Got errors? Check spiffs.h for error definitions to get a clue what went voodoo. Got errors? Check spiffs.h for error definitions to get a clue what went voodoo.
* THINGS TO CHECK
When you alter the spiffs_config values, make sure you also check the typedefs
in spiffs_config.h:
- spiffs_block_ix
- spiffs_page_ix
- spiffs_obj_id
- spiffs_span_ix
The sizes of these typedefs must not underflow, else spiffs might end up in
eternal loops. Each typedef is commented what check for.
Also, if you alter the code or just want to verify your configuration, you can
run
> make test
in the spiffs folder. This will run all testcases using the configuration in
default/spiffs_config.h and test/params_test.h. The tests are written for linux
but should run under cygwin also.
* INTEGRATING SPIFFS * INTEGRATING SPIFFS
In order to integrate spiffs to your embedded target, you will basically need: In order to integrate spiffs to your embedded target, you will basically need:
......
/*
* params_test.h
*
* Created on: May 26, 2013
* Author: petera
*/
#ifndef PARAMS_TEST_H_
#define PARAMS_TEST_H_
// // total emulated spi flash size
// #define PHYS_FLASH_SIZE (16*1024*1024)
// // spiffs file system size
// #define SPIFFS_FLASH_SIZE (2*1024*1024)
// // spiffs file system offset in emulated spi flash
// #define SPIFFS_PHYS_ADDR (4*1024*1024)
// #define SECTOR_SIZE 65536
// #define LOG_BLOCK (SECTOR_SIZE*2)
// #define LOG_PAGE (SECTOR_SIZE/256)
// #define FD_BUF_SIZE 64*6
// #define CACHE_BUF_SIZE (LOG_PAGE + 32)*8
// #define ASSERT(c, m) real_assert((c),(m), __FILE__, __LINE__);
typedef signed int s32_t;
typedef unsigned int u32_t;
typedef signed short s16_t;
typedef unsigned short u16_t;
typedef signed char s8_t;
typedef unsigned char u8_t;
void real_assert(int c, const char *n, const char *file, int l);
#endif /* PARAMS_TEST_H_ */
...@@ -98,7 +98,7 @@ int myspiffs_check( void ) ...@@ -98,7 +98,7 @@ int myspiffs_check( void )
} }
int myspiffs_open(const char *name, int flags){ int myspiffs_open(const char *name, int flags){
return (int)SPIFFS_open(&fs, name, (spiffs_flags)flags, 0); return (int)SPIFFS_open(&fs, (char *)name, (spiffs_flags)flags, 0);
} }
int myspiffs_close( int fd ){ int myspiffs_close( int fd ){
...@@ -162,6 +162,12 @@ int myspiffs_error( int fd ){ ...@@ -162,6 +162,12 @@ int myspiffs_error( int fd ){
void myspiffs_clearerr( int fd ){ void myspiffs_clearerr( int fd ){
fs.errno = SPIFFS_OK; fs.errno = SPIFFS_OK;
} }
int myspiffs_rename( const char *old, const char *newname ){
return SPIFFS_rename(&fs, (char *)old, (char *)newname);
}
size_t myspiffs_size( int fd ){
return SPIFFS_size(&fs, (spiffs_file)fd);
}
#if 0 #if 0
void test_spiffs() { void test_spiffs() {
char buf[12]; char buf[12];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment