Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
96601b68
Unverified
Commit
96601b68
authored
Mar 20, 2018
by
Arnim Läuger
Committed by
GitHub
Mar 20, 2018
Browse files
Merge pull request #2269 from nwf/for-upstream-sdk22
Update to sdk 2.2
parents
be53d5c9
f3ebfa9b
Changes
24
Hide whitespace changes
Inline
Side-by-side
app/sqlite3/esp8266.c
View file @
96601b68
...
...
@@ -576,8 +576,11 @@ static int esp8266_Sleep( sqlite3_vfs * vfs, int microseconds )
static
int
esp8266_CurrentTime
(
sqlite3_vfs
*
vfs
,
double
*
result
)
{
time_t
t
=
time
(
NULL
);
*
result
=
t
/
86400
.
0
+
2440587
.
5
;
// This is stubbed out until we have a working RTCTIME solution;
// 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
);
return
SQLITE_OK
;
}
...
...
app/user/Makefile
View file @
96601b68
...
...
@@ -24,7 +24,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# makefile at its root level - these are then overridden
# 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!!
...
...
bin/.gitignore
View file @
96601b68
...
...
@@ -6,3 +6,4 @@
!.gitignore
!blank.bin
!esp_init_data_default.bin
!esp_init_data_default_v05.bin
ld/nodemcu.ld
View file @
96601b68
...
...
@@ -116,7 +116,6 @@ SECTIONS
/* *libcrypto.a:*(.literal .text) - tested that safe to keep in iROM */
/* *libdriver.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 */
/* *libpwm.a:*(.literal .text) - our own implementation used instead */
/* *libwpa.a:*(.literal .text) - tested that safe to keep in iROM */
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment