remove luacheck run for Travs and minor tweaks following nodemcu#2838 (…

…nodemcu#2845)
TerryE · Jul 23, 2019 · c7ff86f · c7ff86f
1 parent 98c2c05
commit c7ff86f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,9 +29,3 @@ script:
 - 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" = "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
-
diff --git a/app/driver/i2c_master.c b/app/driver/i2c_master.c
@@ -252,7 +252,7 @@ uint32 ICACHE_FLASH_ATTR
 i2c_master_setup(uint16 id, uint8 sda, uint8 scl, uint32 speed)
 {
     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
         return 0;

diff --git a/app/pm/pmSleep.c b/app/pm/pmSleep.c
@@ -370,7 +370,7 @@ void pmSleep_suspend(pmSleep_param_t *cfg){
 
     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);
 
     os_timer_disarm(&null_mode_check_timer);