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
6798f027
Commit
6798f027
authored
Jan 30, 2024
by
Johny Mattsson
Committed by
J Mattsson
Feb 02, 2024
Browse files
Upgrade to IDF v5.1.2
parent
4816c168
Changes
7
Show whitespace changes
Inline
Side-by-side
components/base_nodemcu/include/nodemcu_esp_event.h
View file @
6798f027
...
...
@@ -61,7 +61,7 @@ typedef void (*nodemcu_esp_event_cb) (esp_event_base_t event_base, int32_t event
// Internal definitions
typedef
struct
{
esp_event_base_t
*
event_base_ptr
;
const
esp_event_base_t
*
event_base_ptr
;
int32_t
event_id
;
nodemcu_esp_event_cb
callback
;
}
nodemcu_esp_event_reg_t
;
...
...
components/modules/dac.c
View file @
6798f027
...
...
@@ -11,7 +11,7 @@
#define GET_CHN(idx) \
int chn = luaL_checkint( L, idx ); \
luaL_argcheck( L, chn >= DAC_CHAN
NEL_1
&& chn <= DAC_CHAN
NEL_MAX
, idx, "invalid channel" );
luaL_argcheck( L, chn >= DAC_CHAN
_0
&& chn <= DAC_CHAN
_1
, idx, "invalid channel" );
// Lua: enable( dac_channel )
static
int
ldac_enable
(
lua_State
*
L
)
...
...
@@ -56,8 +56,8 @@ LROT_BEGIN(dac, NULL, 0)
LROT_FUNCENTRY
(
enable
,
ldac_enable
)
LROT_FUNCENTRY
(
disable
,
ldac_disable
)
LROT_FUNCENTRY
(
write
,
ldac_write
)
LROT_NUMENTRY
(
CHANNEL_1
,
DAC_CHAN
NEL_1
)
LROT_NUMENTRY
(
CHANNEL_2
,
DAC_CHAN
NEL_2
)
LROT_NUMENTRY
(
CHANNEL_1
,
DAC_CHAN
_0
)
LROT_NUMENTRY
(
CHANNEL_2
,
DAC_CHAN
_1
)
LROT_END
(
dac
,
NULL
,
0
)
NODEMCU_MODULE
(
DAC
,
"dac"
,
dac
,
NULL
);
components/modules/eth.c
View file @
6798f027
...
...
@@ -48,7 +48,7 @@ typedef void (*fill_cb_arg_fn) (lua_State *L, const void *data);
typedef
struct
{
const
char
*
name
;
esp_event_base_t
*
event_base_ptr
;
const
esp_event_base_t
*
event_base_ptr
;
int32_t
event_id
;
fill_cb_arg_fn
fill_cb_arg
;
}
event_desc_t
;
...
...
components/modules/mqtt.c
View file @
6798f027
...
...
@@ -562,7 +562,8 @@ static int mqtt_subscribe(lua_State* L) {
ESP_LOGD
(
TAG
,
"MQTT subscribe client %p, topic %s"
,
client
,
topic
);
esp_err_t
err
=
esp_mqtt_client_subscribe
(
client
,
topic
,
qos
);
// We have to cast away the const due to _Generic expression :(
esp_err_t
err
=
esp_mqtt_client_subscribe
(
client
,
(
char
*
)
topic
,
qos
);
lua_pushboolean
(
L
,
err
==
ESP_OK
);
return
1
;
// one value returned, true on success, false on error.
...
...
components/modules/node.c
View file @
6798f027
...
...
@@ -362,7 +362,12 @@ static int node_dsleep (lua_State *L)
int
level
=
opt_checkint_range
(
L
,
"level"
,
1
,
0
,
1
);
if
(
pin_mask
)
{
esp_sleep_ext1_wakeup_mode_t
mode
=
(
level
==
1
)
?
ESP_EXT1_WAKEUP_ANY_HIGH
:
ESP_EXT1_WAKEUP_ALL_LOW
;
ESP_EXT1_WAKEUP_ANY_HIGH
:
#ifdef CONFIG_IDF_TARGET_ESP32
ESP_EXT1_WAKEUP_ALL_LOW
;
#else
ESP_EXT1_WAKEUP_ANY_LOW
;
#endif
int
err
=
esp_sleep_enable_ext1_wakeup
(
pin_mask
,
mode
);
if
(
err
)
{
return
luaL_error
(
L
,
"Error %d returned from esp_sleep_enable_ext1_wakeup"
,
err
);
...
...
components/modules/wifi_common.h
View file @
6798f027
...
...
@@ -56,7 +56,7 @@ typedef void (*fill_cb_arg_fn) (lua_State *L, const void *data);
typedef
struct
{
const
char
*
name
;
esp_event_base_t
*
event_base_ptr
;
const
esp_event_base_t
*
event_base_ptr
;
int32_t
event_id
;
fill_cb_arg_fn
fill_cb_arg
;
}
event_desc_t
;
...
...
esp32-esp-idf
@
482a8fb2
Compare
5181de8a
...
482a8fb2
Subproject commit
5181de8ac5ec5e18f04f634da8ce173b7ef5ab7
3
Subproject commit
482a8fb2d78e3b58eb21b26da8a5bedf9062321
3
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