Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
a34e6e8e
Commit
a34e6e8e
authored
Feb 11, 2015
by
funshine
Browse files
Merge branch 'dev' of
https://github.com/nodemcu/nodemcu-firmware
into dev
parents
2d711bbc
5d9caf23
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/include/user_config.h
View file @
a34e6e8e
...
...
@@ -13,6 +13,8 @@
// #define FLASH_1M
// #define FLASH_2M
// #define FLASH_4M
// #define FLASH_8M
// #define FLASH_16M
#define FLASH_AUTOSIZE
// #define DEVELOP_VERSION
#define FULL_VERSION_FOR_USER
...
...
app/platform/cpu_esp8266.h
View file @
a34e6e8e
...
...
@@ -25,6 +25,10 @@
#define FLASH_SEC_NUM 0x200
#elif defined(FLASH_4M)
#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)
#define FLASH_SEC_NUM (flash_get_sec_num())
#else
...
...
app/platform/flash_api.c
View file @
a34e6e8e
...
...
@@ -56,6 +56,12 @@ uint32_t flash_get_size_byte(void)
case
SIZE_32MBIT
:
// 32Mbit, 4MByte
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
;
default:
// Unknown flash size, fall back mode.
...
...
app/platform/flash_api.h
View file @
a34e6e8e
...
...
@@ -52,6 +52,8 @@ typedef struct
SIZE_8MBIT
=
2
,
SIZE_16MBIT
=
3
,
SIZE_32MBIT
=
4
,
SIZE_64MBIT
=
5
,
SIZE_128MBIT
=
6
,
}
size
:
4
;
}
ICACHE_STORE_TYPEDEF_ATTR
SPIFlashInfo
;
...
...
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