MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/nodemcu/nodemcu-firmware into dev

This commit is contained in:
funshine 2015-02-11 21:21:37 +08:00
parent 2d711bbc0d 5d9caf23b6
commit a34e6e8e3d
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/include/user_config.h
View File

@ -13,6 +13,8 @@
// #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

4
app/platform/cpu_esp8266.h
View File

@ -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

6
app/platform/flash_api.c
View File

@ -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.

2
app/platform/flash_api.h
View File

@ -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;