Merge pull request #427 from alibaba/update_1.3.2

Update 1.3.2
alibaba · Jul 18, 2018 · c8a29f3 · c8a29f3
2 parents 6529d16 + 29e7720
commit c8a29f3
Show file tree

Hide file tree

Showing 13 changed files with 3,077 additions and 6,140 deletions.
diff --git a/framework/connectivity/mqtt/mqtt_client.c b/framework/connectivity/mqtt/mqtt_client.c
diff --git a/framework/protocol/linkkit/dm/src/dm_thing_manager.c b/framework/protocol/linkkit/dm/src/dm_thing_manager.c
diff --git a/framework/protocol/linkkit/iotkit/hal-impl/rhino/HAL_AWSS_rhino.c b/framework/protocol/linkkit/iotkit/hal-impl/rhino/HAL_AWSS_rhino.c
diff --git a/framework/ywss4linkkit/lib/arm968es/libywss.a b/framework/ywss4linkkit/lib/arm968es/libywss.a
diff --git a/framework/ywss4linkkit/lib/cortex-m4/libywss.a b/framework/ywss4linkkit/lib/cortex-m4/libywss.a
diff --git a/framework/ywss4linkkit/lib/cortex-m4/vfp/libywss.a b/framework/ywss4linkkit/lib/cortex-m4/vfp/libywss.a
diff --git a/framework/ywss4linkkit/lib/linux/libywss.a b/framework/ywss4linkkit/lib/linux/libywss.a
diff --git a/framework/ywss4linkkit/lib/xtensa/esp32/libywss.a b/framework/ywss4linkkit/lib/xtensa/esp32/libywss.a
diff --git a/framework/ywss4linkkit/lib/xtensa/esp8266/libywss.a b/framework/ywss4linkkit/lib/xtensa/esp8266/libywss.a
diff --git a/include/hal/wifi.h b/include/hal/wifi.h
diff --git a/platform/mcu/esp8266/hal/wifi_port.c b/platform/mcu/esp8266/hal/wifi_port.c
@@ -677,6 +677,7 @@ static void stop_monitor(hal_wifi_module_t *m)
 {
  wifi_set_mode(STATION_MODE);
  wifi_promiscuous_enable(0);
+ wifi_set_promiscuous_rx_cb(NULL);
  data_cb = NULL;
 }