Merge pull request #284 from nodemcu/dev

Sync from dev to dev096.

app/modules/node.c

@@ -117,15 +117,10 @@ static int node_flashid( lua_State* L )
 // Lua: flashsize()
 static int node_flashsize( lua_State* L )
 {
-  //uint32_t sz = 0;
+  if (lua_type(L, 1) == LUA_TNUMBER)
-  //if(lua_type(L, 1) == LUA_TNUMBER)
+  {
-  //{
+    flash_rom_set_size_byte(luaL_checkinteger(L, 1));
-  //  sz = luaL_checkinteger(L, 1);
+  }
-  //  if(sz > 0)
-  //  {
-  //    flash_set_size_byte(sz);
-  //  }
-  //}
 #if defined(FLASH_SAFE_API)
   uint32_t sz = flash_safe_get_size_byte();
 #else

app/platform/flash_api.c

@@ -149,27 +149,21 @@ bool flash_rom_set_size_type(uint8_t size)
     // Dangerous, here are dinosaur infested!!!!!
     // Reboot required!!!
     // If you don't know what you're doing, your nodemcu may turn into stone ...
-#if defined(FLASH_SAFE_API)
+    NODE_DBG("\nBEGIN SET FLASH HEADER\n");
     uint8_t data[SPI_FLASH_SEC_SIZE] ICACHE_STORE_ATTR;
-    flash_safe_read(0, (uint32 *)data, sizeof(data));
+    if (SPI_FLASH_RESULT_OK == spi_flash_read(0, (uint32 *)data, SPI_FLASH_SEC_SIZE))
-    SPIFlashInfo *p_spi_flash_info = (SPIFlashInfo *)(data);
+    {
-    p_spi_flash_info->size = size;
+        ((SPIFlashInfo *)(&data[0]))->size = size;
-    flash_safe_erase_sector(0);
+        if (SPI_FLASH_RESULT_OK == spi_flash_erase_sector(0 * SPI_FLASH_SEC_SIZE))
-    flash_safe_write(0, (uint32 *)data, sizeof(data));
+        {
-    // TODO: CHECKSUM Firmware
+            NODE_DBG("\nERASE SUCCESS\n");
-    //p_spi_flash_info = flash_rom_getinfo();
+        }
-    //p_spi_flash_info->size = size;
+        if (SPI_FLASH_RESULT_OK == spi_flash_write(0, (uint32 *)data, SPI_FLASH_SEC_SIZE))
-#else
+        {
-    uint8_t data[SPI_FLASH_SEC_SIZE] ICACHE_STORE_ATTR;
+            NODE_DBG("\nWRITE SUCCESS, %u\n", size);
-    spi_flash_read(0, (uint32 *)data, sizeof(data));
+        }
-    SPIFlashInfo *p_spi_flash_info = (SPIFlashInfo *)(data);
+    }
-    p_spi_flash_info->size = size;
+    NODE_DBG("\nEND SET FLASH HEADER\n");
-    spi_flash_erase_sector(0);
-    spi_flash_write(0, (uint32 *)data, sizeof(data));
-    // TODO: CHECKSUM Firmware
-    //p_spi_flash_info = flash_rom_getinfo();
-    //p_spi_flash_info->size = size;
-#endif // defined(FLASH_SAFE_API)
     return true;
 }
 
@@ -207,6 +201,16 @@ bool flash_rom_set_size_byte(uint32_t size)
         flash_size = SIZE_32MBIT;
         flash_rom_set_size_type(flash_size);
         break;
+    case 8 * 1024 * 1024:
+        // 64Mbit, 8MByte
+        flash_size = SIZE_64MBIT;
+        flash_rom_set_size_type(flash_size);
+        break;
+    case 16 * 1024 * 1024:
+        // 128Mbit, 16MByte
+        flash_size = SIZE_128MBIT;
+        flash_rom_set_size_type(flash_size);
+        break;
     default:
         // Unknown flash size.
         result = false;
@@ -272,6 +276,46 @@ uint32_t flash_rom_get_speed(void)
     return speed;
 }
 
+bool flash_rom_set_speed(uint32_t speed)
+{
+    // Dangerous, here are dinosaur infested!!!!!
+    // Reboot required!!!
+    // If you don't know what you're doing, your nodemcu may turn into stone ...
+    NODE_DBG("\nBEGIN SET FLASH HEADER\n");
+    uint8_t data[SPI_FLASH_SEC_SIZE] ICACHE_STORE_ATTR;
+    uint8_t speed_type = SPEED_40MHZ;
+    if (speed < 26700000)
+    {
+        speed_type = SPEED_20MHZ;
+    }
+    else if (speed < 40000000)
+    {
+        speed_type = SPEED_26MHZ;
+    }
+    else if (speed < 80000000)
+    {
+        speed_type = SPEED_40MHZ;
+    }
+    else if (speed >= 80000000)
+    {
+        speed_type = SPEED_80MHZ;
+    }
+    if (SPI_FLASH_RESULT_OK == spi_flash_read(0, (uint32 *)data, SPI_FLASH_SEC_SIZE))
+    {
+        ((SPIFlashInfo *)(&data[0]))->speed = speed_type;
+        if (SPI_FLASH_RESULT_OK == spi_flash_erase_sector(0 * SPI_FLASH_SEC_SIZE))
+        {
+            NODE_DBG("\nERASE SUCCESS\n");
+        }
+        if (SPI_FLASH_RESULT_OK == spi_flash_write(0, (uint32 *)data, SPI_FLASH_SEC_SIZE))
+        {
+            NODE_DBG("\nWRITE SUCCESS, %u\n", speed_type);
+        }
+    }
+    NODE_DBG("\nEND SET FLASH HEADER\n");
+    return true;
+}
+
 bool flash_init_data_written(void)
 {
     // FLASH SEC - 4
@@ -356,3 +400,28 @@ uint8_t byte_of_aligned_array(const uint8_t *aligned_array, uint32_t index)
     uint8_t *p = (uint8_t *) (&v);
     return p[ (index % 4) ];
 }
+
+// uint8_t flash_rom_get_checksum(void)
+// {
+//     // SPIFlashInfo spi_flash_info ICACHE_STORE_ATTR = flash_rom_getinfo();
+//     // uint32_t address = sizeof(spi_flash_info) + spi_flash_info.segment_size;
+//     // uint32_t address_aligned_4bytes = (address + 3) & 0xFFFFFFFC;
+//     // uint8_t buffer[64] = {0};
+//     // spi_flash_read(address, (uint32 *) buffer, 64);
+//     // uint8_t i = 0;
+//     // c_printf("\nBEGIN DUMP\n");
+//     // for (i = 0; i < 64; i++)
+//     // {
+//     //     c_printf("%02x," , buffer[i]);
+//     // }
+//     // i = (address + 0x10) & 0x10 - 1;
+//     // c_printf("\nSIZE:%d CHECK SUM:%02x\n", spi_flash_info.segment_size, buffer[i]);
+//     // c_printf("\nEND DUMP\n");
+//     // return buffer[0];
+//     return 0;
+// }
+
+// uint8_t flash_rom_calc_checksum(void)
+// {
+//     return 0;
+// }

app/platform/flash_api.h

@@ -57,8 +57,8 @@ do { \
 
 typedef struct
 {
-    uint8_t e9;
+    uint8_t header_magic;
-    uint8_t segments;
+    uint8_t segment_count;
     enum
     {
         MODE_QIO = 0,
@@ -83,6 +83,9 @@ typedef struct
         SIZE_64MBIT = 5,
         SIZE_128MBIT = 6,
     } size : 4;
+    uint32_t entry_point;
+    uint32_t memory_offset;
+    uint32_t segment_size; 
 } ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo;
 
 uint32_t flash_detect_size_byte(void);
@@ -104,5 +107,7 @@ bool flash_init_data_default(void);
 bool flash_init_data_blank(void);
 bool flash_self_destruct(void);
 uint8_t byte_of_aligned_array(const uint8_t* aligned_array, uint32_t index);
+// uint8_t flash_rom_get_checksum(void);
+// uint8_t flash_rom_calc_checksum(void);
 
 #endif // __FLASH_API_H__

app/user/user_main.c

@@ -61,6 +61,18 @@ void nodemcu_init(void)
         return;
     }
 
+#if defined(FLASH_SAFE_API)
+    if( flash_safe_get_size_byte() != flash_rom_get_size_byte()) {
+        NODE_ERR("Self adjust flash size.\n");
+        // Fit hardware real flash size.
+        flash_rom_set_size_byte(flash_safe_get_size_byte());
+        // Flash init data at FLASHSIZE - 0x04000 Byte.
+        flash_init_data_default();
+        // Flash blank data at FLASHSIZE - 0x02000 Byte.
+        flash_init_data_blank();        
+    }
+#endif // defined(FLASH_SAFE_API)
+
     if( !flash_init_data_written() ){
         NODE_ERR("Restore init data.\n");
         // Flash init data at FLASHSIZE - 0x04000 Byte.