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
c7ff86ff
Unverified
Commit
c7ff86ff
authored
Jul 23, 2019
by
Terry Ellison
Committed by
GitHub
Jul 23, 2019
Browse files
remove luacheck run for Travs and minor tweaks following #2838 (#2845)
parent
98c2c052
Changes
3
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
c7ff86ff
...
@@ -29,9 +29,3 @@ script:
...
@@ -29,9 +29,3 @@ script:
-
if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-linux.sh; fi
-
if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-linux.sh; fi
-
if [ "$OS" = "windows" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-windows-ms.sh; fi
-
if [ "$OS" = "windows" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/ci-build-windows-ms.sh; fi
-
if [ "$OS" = "linux" -a "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/pr-build.sh; fi
-
if [ "$OS" = "linux" -a "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/pr-build.sh; fi
-
cd "$TRAVIS_BUILD_DIR"
-
echo "checking:"
-
find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo
-
find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 $LUACC -p
-
if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/run-luacheck.sh ||
true
; fi
app/driver/i2c_master.c
View file @
c7ff86ff
...
@@ -252,7 +252,7 @@ uint32 ICACHE_FLASH_ATTR
...
@@ -252,7 +252,7 @@ uint32 ICACHE_FLASH_ATTR
i2c_master_setup
(
uint16
id
,
uint8
sda
,
uint8
scl
,
uint32
speed
)
i2c_master_setup
(
uint16
id
,
uint8
sda
,
uint8
scl
,
uint32
speed
)
{
{
if
(
NULL
==
i2c
[
id
]){
if
(
NULL
==
i2c
[
id
]){
i2c
[
id
]
=
(
i2c_master_state_t
*
)
c_
malloc
(
sizeof
(
i2c_master_state_t
));
i2c
[
id
]
=
(
i2c_master_state_t
*
)
malloc
(
sizeof
(
i2c_master_state_t
));
}
}
if
(
NULL
==
i2c
[
id
]){
// if malloc failed
if
(
NULL
==
i2c
[
id
]){
// if malloc failed
return
0
;
return
0
;
...
...
app/pm/pmSleep.c
View file @
c7ff86ff
...
@@ -370,7 +370,7 @@ void pmSleep_suspend(pmSleep_param_t *cfg){
...
@@ -370,7 +370,7 @@ void pmSleep_suspend(pmSleep_param_t *cfg){
wifi_fpm_set_wakeup_cb
(
resume_cb
);
// Set resume C callback
wifi_fpm_set_wakeup_cb
(
resume_cb
);
// Set resume C callback
c_
memcpy
(
&
current_config
,
cfg
,
sizeof
(
pmSleep_param_t
));
memcpy
(
&
current_config
,
cfg
,
sizeof
(
pmSleep_param_t
));
PMSLEEP_DBG
(
"sleep duration is %d"
,
current_config
.
sleep_duration
);
PMSLEEP_DBG
(
"sleep duration is %d"
,
current_config
.
sleep_duration
);
os_timer_disarm
(
&
null_mode_check_timer
);
os_timer_disarm
(
&
null_mode_check_timer
);
...
...
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