Merge branch 'mbw' of https://gitee.com/SXDT-Embedded/ble_-tyq_-bjq_-ch32-v303 into mbw
This commit is contained in:
commit
a26e8a73b5
|
@ -646,4 +646,4 @@
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
||||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||||
</cproject>
|
</cproject>
|
|
@ -59,4 +59,4 @@
|
||||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||||
<listEntry value="4"/>
|
<listEntry value="4"/>
|
||||||
</listAttribute>
|
</listAttribute>
|
||||||
</launchConfiguration>
|
</launchConfiguration>
|
|
@ -564,7 +564,6 @@ int ml307_netdev_check_link_status(struct netdev *netdev)
|
||||||
char tname[RT_NAME_MAX] = {0};
|
char tname[RT_NAME_MAX] = {0};
|
||||||
if (netdev == RT_NULL)
|
if (netdev == RT_NULL)
|
||||||
{
|
{
|
||||||
LOG_E("input network interface device is NULL.\n");
|
|
||||||
return -RT_ERROR;
|
return -RT_ERROR;
|
||||||
}
|
}
|
||||||
// RT_ASSERT(netdev);
|
// RT_ASSERT(netdev);
|
||||||
|
@ -947,7 +946,7 @@ static void ml307_init_thread_entry(void *parameter)
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
/*设置心跳包*/
|
/*设置心跳包*/
|
||||||
if (at_obj_exec_cmd(device->client, resp, "AT+MIPTKA=0,1,120,60,3") != RT_EOK)
|
if (at_obj_exec_cmd(device->client, resp, "AT+MIPTKA=0,1,60,30,3") != RT_EOK)
|
||||||
{
|
{
|
||||||
result = -RT_ERROR;
|
result = -RT_ERROR;
|
||||||
goto __exit;
|
goto __exit;
|
||||||
|
@ -1134,12 +1133,12 @@ static void ml307_init_thread_entry(void *parameter)
|
||||||
result = -RT_ERROR;
|
result = -RT_ERROR;
|
||||||
goto __exit;
|
goto __exit;
|
||||||
}
|
}
|
||||||
if (at_obj_exec_cmd(device->client, resp, "AT+MIPCALL=1,1") != RT_EOK)
|
// if (at_obj_exec_cmd(device->client, resp, "AT+MIPCALL=1,1") != RT_EOK)
|
||||||
// if (at_obj_exec_cmd(device->client, resp, "AT+MIPCALL=0") != RT_EOK)
|
// // if (at_obj_exec_cmd(device->client, resp, "AT+MIPCALL=0") != RT_EOK)
|
||||||
{
|
// {
|
||||||
result = -RT_ERROR;
|
// result = -RT_ERROR;
|
||||||
goto __exit;
|
// goto __exit;
|
||||||
}
|
// }
|
||||||
#if defined(AT_DEBUG)
|
#if defined(AT_DEBUG)
|
||||||
/* check the GPRS network IP address */
|
/* check the GPRS network IP address */
|
||||||
for (i = 0; i < IPADDR_RETRY; i++)
|
for (i = 0; i < IPADDR_RETRY; i++)
|
||||||
|
|
|
@ -134,7 +134,7 @@
|
||||||
#define RT_USING_AT
|
#define RT_USING_AT
|
||||||
// #define NETDEV_USING_PING//用来监测和平台之间的延时
|
// #define NETDEV_USING_PING//用来监测和平台之间的延时
|
||||||
#ifdef ENABLE_LOG_ALL
|
#ifdef ENABLE_LOG_ALL
|
||||||
#define AT_DEBUG
|
// #define AT_DEBUG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define AT_USING_CLIENT
|
#define AT_USING_CLIENT
|
||||||
|
|
Loading…
Reference in New Issue