From 2d80042f91c21ca7cc99cd1a3811a6a774abdcb4 Mon Sep 17 00:00:00 2001 From: Gregor Date: Fri, 12 Jul 2019 21:40:11 +0200 Subject: [PATCH] update file permission --- app/include/user_config.h | 4 ++-- app/include/user_modules.h | 36 +++++++++++++++++------------------ app/lwip/core/dhcp.c | 11 +++++++++++ lua_modules/bh1750/bh1750.lua | 26 ++++++++++++------------- tools/update_buildinfo.sh | 0 5 files changed, 44 insertions(+), 33 deletions(-) mode change 100644 => 100755 tools/update_buildinfo.sh diff --git a/app/include/user_config.h b/app/include/user_config.h index 4866e6a9..283ef9d4 100644 --- a/app/include/user_config.h +++ b/app/include/user_config.h @@ -46,7 +46,7 @@ // LUA_FLASH_STORE defines the default partition size if the NodeMCU partition // tool is not used. -//#define LUA_FLASH_STORE 0x10000 +#define LUA_FLASH_STORE 0x40000 // By default Lua executes the file init.lua at start up. The following // define allows you to replace this with an alternative startup. Warning: @@ -135,7 +135,7 @@ #define WIFI_EVENT_MONITOR_DISCONNECT_REASON_LIST_ENABLE // Enable use of the WiFi.monitor sub-module -//#define LUA_USE_MODULES_WIFI_MONITOR +#define LUA_USE_MODULES_WIFI_MONITOR // Whilst the DNS client details can be configured through the WiFi API, diff --git a/app/include/user_modules.h b/app/include/user_modules.h index 0b28dbe7..600add85 100644 --- a/app/include/user_modules.h +++ b/app/include/user_modules.h @@ -18,11 +18,11 @@ //#define LUA_USE_MODULES_BME280 //#define LUA_USE_MODULES_BME680 //#define LUA_USE_MODULES_COAP -//#define LUA_USE_MODULES_COLOR_UTILS +#define LUA_USE_MODULES_COLOR_UTILS //#define LUA_USE_MODULES_CRON -//#define LUA_USE_MODULES_CRYPTO +#define LUA_USE_MODULES_CRYPTO #define LUA_USE_MODULES_DHT -//#define LUA_USE_MODULES_ENCODER +#define LUA_USE_MODULES_ENCODER //#define LUA_USE_MODULES_ENDUSER_SETUP // USE_DNS in dhcpserver.h needs to be enabled for this module to work. #define LUA_USE_MODULES_FILE //#define LUA_USE_MODULES_GDBSTUB @@ -30,35 +30,35 @@ //#define LUA_USE_MODULES_GPIO_PULSE //#define LUA_USE_MODULES_HDC1080 //#define LUA_USE_MODULES_HMC5883L -//#define LUA_USE_MODULES_HTTP +#define LUA_USE_MODULES_HTTP //#define LUA_USE_MODULES_HX711 #define LUA_USE_MODULES_I2C -//#define LUA_USE_MODULES_L3G4200D +#define LUA_USE_MODULES_L3G4200D //#define LUA_USE_MODULES_MCP4725 -//#define LUA_USE_MODULES_MDNS -#define LUA_USE_MODULES_MQTT +#define LUA_USE_MODULES_MDNS +//#define LUA_USE_MODULES_MQTT #define LUA_USE_MODULES_NET #define LUA_USE_MODULES_NODE #define LUA_USE_MODULES_OW //#define LUA_USE_MODULES_PCM //#define LUA_USE_MODULES_PERF -//#define LUA_USE_MODULES_PIPE -//#define LUA_USE_MODULES_PWM +#define LUA_USE_MODULES_PIPE +#define LUA_USE_MODULES_PWM //#define LUA_USE_MODULES_PWM2 //#define LUA_USE_MODULES_RC //#define LUA_USE_MODULES_RFSWITCH //#define LUA_USE_MODULES_ROTARY -//#define LUA_USE_MODULES_RTCFIFO -//#define LUA_USE_MODULES_RTCMEM -//#define LUA_USE_MODULES_RTCTIME +#define LUA_USE_MODULES_RTCFIFO +#define LUA_USE_MODULES_RTCMEM +#define LUA_USE_MODULES_RTCTIME //#define LUA_USE_MODULES_SI7021 //#define LUA_USE_MODULES_SIGMA_DELTA -//#define LUA_USE_MODULES_SJSON -//#define LUA_USE_MODULES_SNTP +#define LUA_USE_MODULES_SJSON +#define LUA_USE_MODULES_SNTP //#define LUA_USE_MODULES_SOMFY #define LUA_USE_MODULES_SPI //#define LUA_USE_MODULES_SQLITE3 -//#define LUA_USE_MODULES_STRUCT +#define LUA_USE_MODULES_STRUCT //#define LUA_USE_MODULES_SWITEC //#define LUA_USE_MODULES_TCS34725 //#define LUA_USE_MODULES_TM1829 @@ -70,11 +70,11 @@ //#define LUA_USE_MODULES_UCG //#define LUA_USE_MODULES_WEBSOCKET #define LUA_USE_MODULES_WIFI -//#define LUA_USE_MODULES_WIFI_MONITOR +#define LUA_USE_MODULES_WIFI_MONITOR //#define LUA_USE_MODULES_WPS //#define LUA_USE_MODULES_WS2801 -//#define LUA_USE_MODULES_WS2812 -//#define LUA_USE_MODULES_WS2812_EFFECTS +#define LUA_USE_MODULES_WS2812 +#define LUA_USE_MODULES_WS2812_EFFECTS //#define LUA_USE_MODULES_XPT2046 //debug modules diff --git a/app/lwip/core/dhcp.c b/app/lwip/core/dhcp.c index 88ac82a6..526bebc7 100644 --- a/app/lwip/core/dhcp.c +++ b/app/lwip/core/dhcp.c @@ -593,6 +593,17 @@ dhcp_handle_ack(struct netif *netif) n++; } #endif /* LWIP_DNS */ +/* + if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_NTP)) { + ip4_addr_set_u32(&dhcp->offered_ntp_addr, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_NTP))); + char buf[64]; + c_sprintf(buf, "%d.%d.%d.%d", IP2STR(&dhcp->offered_ntp_addr)); + platform_print_deprecation_note("found NTP ip", buf); + } + else + { + platform_print_deprecation_note("found NO NTP ip", "never"); + }*/ } /** Set a statically allocated struct dhcp to work with. diff --git a/lua_modules/bh1750/bh1750.lua b/lua_modules/bh1750/bh1750.lua index 5a06611e..175f87e7 100644 --- a/lua_modules/bh1750/bh1750.lua +++ b/lua_modules/bh1750/bh1750.lua @@ -9,19 +9,19 @@ local moduleName = ... local M = {} _G[moduleName] = M - --I2C slave address of GY-30 - local GY_30_address = 0x23 - -- i2c interface ID - local id = 0 - --LUX - local l - --CMD - local CMD = 0x10 - local init = false - --Make it more faster - local i2c = i2c - function M.init(sda, scl) - i2c.setup(id, sda, scl, i2c.SLOW) +--I2C slave address of GY-30 +local GY_30_address = 0x23 +-- i2c interface ID +local id = 0 +--LUX +local l +--CMD +local CMD = 0x10 +local init = false +--Make it more faster +local i2c = i2c +function M.init(sda, scl) + i2c.setup(id, sda, scl, i2c.SLOW) --print("i2c ok..") init = true end diff --git a/tools/update_buildinfo.sh b/tools/update_buildinfo.sh old mode 100644 new mode 100755