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
6d81dd6c
Commit
6d81dd6c
authored
Jul 23, 2019
by
Terry Ellison
Committed by
Marcel Stör
Jun 09, 2020
Browse files
Rebased against current dev
parent
ce2e50c6
Changes
15
Hide whitespace changes
Inline
Side-by-side
app/driver/pwm2.c
View file @
6d81dd6c
...
...
@@ -7,11 +7,13 @@
#include <stddef.h>
#include <stdint.h>
#include <string.h>
#include "mem.h"
#include "pin_map.h"
#include "platform.h"
#include "hw_timer.h"
#include "driver/pwm2.h"
#include "user_interface.h"
#define PWM2_TMR_MAGIC_80MHZ 16
#define PWM2_TMR_MAGIC_160MHZ 32
...
...
app/include/pm/pmSleep.h
View file @
6d81dd6c
...
...
@@ -15,7 +15,7 @@
#if defined(PMSLEEP_DEBUG)
#define PMSLEEP_DBG(fmt, ...) dbg_printf("\tPMSLEEP(%s):"fmt"\n", __FUNCTION__, ##__VA_ARGS__)
#else
#define PMSLEEP_DBG(...) //
c_
printf(__VA_ARGS__)
#define PMSLEEP_DBG(...) //printf(__VA_ARGS__)
#endif
#if defined(NODE_ERROR)
...
...
app/lua/lflash.c
View file @
6d81dd6c
...
...
@@ -14,6 +14,7 @@
#include "lfunc.h"
#include "lflash.h"
#include "platform.h"
#include "user_interface.h"
#include "vfs.h"
#include "uzlib.h"
...
...
app/modules/bme280.c
View file @
6d81dd6c
...
...
@@ -11,6 +11,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include <math.h>
/****************************************************/
...
...
app/modules/bme680.c
View file @
6d81dd6c
...
...
@@ -9,6 +9,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include <math.h>
#include "bme680_defs.h"
...
...
app/modules/bmp085.c
View file @
6d81dd6c
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include <stdlib.h>
#include <string.h>
...
...
app/modules/file.c
View file @
6d81dd6c
...
...
@@ -585,7 +585,7 @@ static int file_putfile( lua_State* L )
// Lua: fsinfo()
static
int
file_fsinfo
(
lua_State
*
L
)
{
u32_t
total
,
used
;
u
int
32_t
total
,
used
;
if
(
vfs_fsinfo
(
""
,
&
total
,
&
used
))
{
return
luaL_error
(
L
,
"file system failed"
);
}
...
...
app/modules/hdc1080.c
View file @
6d81dd6c
...
...
@@ -7,6 +7,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include <stdlib.h>
#include <string.h>
#include <math.h>
...
...
app/modules/rc.c
View file @
6d81dd6c
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include "rom.h"
//#include "driver/easygpio.h"
//static Ping_Data pingA;
#define defPulseLen 185
...
...
app/modules/rotary.c
View file @
6d81dd6c
...
...
@@ -9,6 +9,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "task/task.h"
#include <stdint.h>
#include <stdlib.h>
#include "user_interface.h"
...
...
app/modules/tcs34725.c
View file @
6d81dd6c
...
...
@@ -22,6 +22,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
#include <math.h>
// #define TCS34725_ADDRESS (0x29<<1)
...
...
@@ -352,4 +353,4 @@ LROT_BEGIN(tcs34725)
LROT_END
(
tcs34725
,
NULL
,
0
)
NODEMCU_MODULE
(
TCS34725
,
"tcs34725"
,
tcs34725
,
NULL
);
\ No newline at end of file
NODEMCU_MODULE
(
TCS34725
,
"tcs34725"
,
tcs34725
,
NULL
);
app/modules/uart.c
View file @
6d81dd6c
...
...
@@ -45,7 +45,7 @@ static int l_uart_on( lua_State* L )
}
}
if
(
lua_anyfunction
(
L
,
stack
))
{
if
(
lua_
is
anyfunction
(
L
,
stack
))
{
if
(
lua_isnumber
(
L
,
stack
+
1
)
&&
lua_tointeger
(
L
,
stack
+
1
)
==
0
)
{
run_input
=
false
;
}
...
...
app/modules/wps.c
View file @
6d81dd6c
...
...
@@ -4,6 +4,7 @@
#include "module.h"
#include "lauxlib.h"
#include "platform.h"
#include "user_interface.h"
static
int
wps_callback_ref
;
...
...
app/platform/platform.c
View file @
6d81dd6c
...
...
@@ -1124,7 +1124,7 @@ static void platform_task_dispatch (os_event_t *e) {
static
int
task_init_handler
(
void
)
{
int
p
,
qlen
=
TASK_DEFAULT_QUEUE_LEN
;
for
(
p
=
0
;
p
<
TASK_PRIORITY_COUNT
;
p
++
){
TQB
.
task_Q
[
p
]
=
(
os_event_t
*
)
c_
malloc
(
sizeof
(
os_event_t
)
*
qlen
);
TQB
.
task_Q
[
p
]
=
(
os_event_t
*
)
malloc
(
sizeof
(
os_event_t
)
*
qlen
);
if
(
TQB
.
task_Q
[
p
])
{
os_memset
(
TQB
.
task_Q
[
p
],
0
,
sizeof
(
os_event_t
)
*
qlen
);
system_os_task
(
platform_task_dispatch
,
p
,
TQB
.
task_Q
[
p
],
TASK_DEFAULT_QUEUE_LEN
);
...
...
@@ -1146,7 +1146,7 @@ static int task_init_handler (void) {
*/
platform_task_handle_t
platform_task_get_id
(
platform_task_callback_t
t
)
{
if
(
(
TQB
.
task_count
&
(
TH_ALLOCATION_BRICK
-
1
))
==
0
)
{
TQB
.
task_func
=
(
platform_task_callback_t
*
)
os_
realloc
(
TQB
.
task_func
=
(
platform_task_callback_t
*
)
realloc
(
TQB
.
task_func
,
sizeof
(
platform_task_callback_t
)
*
(
TQB
.
task_count
+
TH_ALLOCATION_BRICK
));
if
(
!
TQB
.
task_func
)
{
...
...
app/platform/sdcard.c
View file @
6d81dd6c
#include "platform.h"
#include "driver/spi.h"
#include <stdint.h>
#include "user_interface.h"
#include "sdcard.h"
...
...
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