Unverified Commit 96601b68 authored by Arnim Läuger's avatar Arnim Läuger Committed by GitHub
Browse files

Merge pull request #2269 from nwf/for-upstream-sdk22

Update to sdk 2.2
parents be53d5c9 f3ebfa9b
...@@ -576,8 +576,11 @@ static int esp8266_Sleep( sqlite3_vfs * vfs, int microseconds ) ...@@ -576,8 +576,11 @@ static int esp8266_Sleep( sqlite3_vfs * vfs, int microseconds )
static int esp8266_CurrentTime( sqlite3_vfs * vfs, double * result ) static int esp8266_CurrentTime( sqlite3_vfs * vfs, double * result )
{ {
time_t t = time(NULL); // This is stubbed out until we have a working RTCTIME solution;
*result = t / 86400.0 + 2440587.5; // as it stood, this would always have returned the UNIX epoch.
// time_t t = time(NULL);
// *result = t / 86400.0 + 2440587.5;
*result = 2440587.5;
dbg_printf("esp8266_CurrentTime: %g\n", *result); dbg_printf("esp8266_CurrentTime: %g\n", *result);
return SQLITE_OK; return SQLITE_OK;
} }
......
...@@ -24,7 +24,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit ...@@ -24,7 +24,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# makefile at its root level - these are then overridden # makefile at its root level - these are then overridden
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
DEFINES += -DESP_INIT_DATA_DEFAULT="\"$(SDK_DIR)/bin/esp_init_data_default.bin\"" DEFINES += -DESP_INIT_DATA_DEFAULT="\"$(SDK_DIR)/bin/esp_init_data_default_v05.bin\""
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
......
...@@ -6,3 +6,4 @@ ...@@ -6,3 +6,4 @@
!.gitignore !.gitignore
!blank.bin !blank.bin
!esp_init_data_default.bin !esp_init_data_default.bin
!esp_init_data_default_v05.bin
...@@ -116,7 +116,6 @@ SECTIONS ...@@ -116,7 +116,6 @@ SECTIONS
/* *libcrypto.a:*(.literal .text) - tested that safe to keep in iROM */ /* *libcrypto.a:*(.literal .text) - tested that safe to keep in iROM */
/* *libdriver.a:*(.literal .text) - not used anywhere in NodeMCU */ /* *libdriver.a:*(.literal .text) - not used anywhere in NodeMCU */
/* *libespnow.a:*(.literal .text) - not used anywhere in NodeMCU */ /* *libespnow.a:*(.literal .text) - not used anywhere in NodeMCU */
/* *libmesh.a:*(.literal .text) - not used anywhere in NodeMCU */
/* *liblwip_536.a:*(.literal .text) - source-based library used instead */ /* *liblwip_536.a:*(.literal .text) - source-based library used instead */
/* *libpwm.a:*(.literal .text) - our own implementation used instead */ /* *libpwm.a:*(.literal .text) - our own implementation used instead */
/* *libwpa.a:*(.literal .text) - tested that safe to keep in iROM */ /* *libwpa.a:*(.literal .text) - tested that safe to keep in iROM */
......
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