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

remove luacheck run for Travs and minor tweaks following #2838 (#2845)

This commit is contained in:
Terry Ellison 2019-07-23 20:29:44 +03:00 committed by GitHub
parent 98c2c0520d
commit c7ff86ff27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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

2
app/driver/i2c_master.c
View File

@ -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;

2
app/pm/pmSleep.c
View File

@ -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);