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
c8e99d50
Commit
c8e99d50
authored
Apr 14, 2017
by
devsaurus
Browse files
Updated to latest IDF.
parent
90f5b769
Changes
3
Hide whitespace changes
Inline
Side-by-side
components/modules/bthci.c
View file @
c8e99d50
...
@@ -31,6 +31,9 @@
...
@@ -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)
...
@@ -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[] =
...
@@ -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
components/platform/flash_api.c
View file @
c8e99d50
...
@@ -29,8 +29,8 @@ static inline esp_image_header_t flash_load_rom_header (void)
...
@@ -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
.
device
I
d
,
g_rom_flashchip
.
device
_i
d
,
sz
,
sz
,
g_rom_flashchip
.
block_size
,
g_rom_flashchip
.
block_size
,
g_rom_flashchip
.
sector_size
,
g_rom_flashchip
.
sector_size
,
...
...
esp32-esp-idf
@
9050307d
Compare
ecbe5a66
...
9050307d
Subproject commit
ecbe5a66f2
47
8
87
9ea3ca4bd6d7cab92065604a9
Subproject commit
9050307dfe600c915adaccf8076220d6
47
4
87
6db
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