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

Updated to latest IDF.

This commit is contained in:
devsaurus 2017-04-14 00:01:29 +02:00
parent 90f5b7696b
commit c8e99d50a5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/modules/bthci.c
View File

@ -31,6 +31,9 @@
* @author Johny Mattsson <jmattsson@dius.com.au> * @author Johny Mattsson <jmattsson@dius.com.au>
*/ */
#include "sdkconfig.h"
#ifdef CONFIG_LUA_MODULE_BTHCI
#include "module.h" #include "module.h"
#include "lauxlib.h" #include "lauxlib.h"
#include "task/task.h" #include "task/task.h"
@ -327,7 +330,8 @@ static int lbthci_init (lua_State *L)
for (int i = 0; i < MAX_CMD_Q; ++i) for (int i = 0; i < MAX_CMD_Q; ++i)
cmd_q[i].cb_ref = LUA_NOREF; cmd_q[i].cb_ref = LUA_NOREF;
esp_bt_controller_init (); esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
esp_bt_controller_init (&bt_cfg);
esp_vhci_host_register_callback (&bthci_callbacks); esp_vhci_host_register_callback (&bthci_callbacks);
@ -573,3 +577,4 @@ static const LUA_REG_TYPE bthci_map[] =
}; };
NODEMCU_MODULE(BTHCI, "bthci", bthci_map, lbthci_init); NODEMCU_MODULE(BTHCI, "bthci", bthci_map, lbthci_init);
#endif

4
components/platform/flash_api.c
View File

@ -29,8 +29,8 @@ static inline esp_image_header_t flash_load_rom_header (void)
#define IRAM_SECTION __attribute__((section(".iram1"))) #define IRAM_SECTION __attribute__((section(".iram1")))
static void IRAM_SECTION update_flash_chip_size (uint32_t sz) static void IRAM_SECTION update_flash_chip_size (uint32_t sz)
{ {
SPIParamCfg ( esp_rom_spiflash_config_param (
g_rom_flashchip.deviceId, g_rom_flashchip.device_id,
sz, sz,
g_rom_flashchip.block_size, g_rom_flashchip.block_size,
g_rom_flashchip.sector_size, g_rom_flashchip.sector_size,

2
sdk/esp32-esp-idf

@ -1 +1 @@
Subproject commit ecbe5a66f2478879ea3ca4bd6d7cab92065604a9 Subproject commit 9050307dfe600c915adaccf8076220d6474876db