diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.c b/APP_Framework/Framework/transform_layer/rtthread/transform.c index a053aede8..c17005e00 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.c +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.c @@ -240,7 +240,7 @@ void PrivTaskexitCritical() /*********************tick**********************/ #ifdef APP_USING_WEBNET -int GetTick(){ +int PriGetTick(){ return rt_tick_get()/RT_TICK_PER_SECOND; } #endif \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.h b/APP_Framework/Framework/transform_layer/rtthread/transform.h index 75ec5279d..c72cf9203 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.h +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.h @@ -224,7 +224,7 @@ void PrivTaskexitCritical(); /*********************tick**********************/ #ifdef APP_USING_WEBNET -int GetTick(); +int PriGetTick(); #endif #ifdef __cplusplus diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.c b/APP_Framework/Framework/transform_layer/xizi/transform.c index 06cbb6422..8cad69f8d 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.c +++ b/APP_Framework/Framework/transform_layer/xizi/transform.c @@ -220,6 +220,6 @@ int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_ } /*********************tick**********************/ -int GetTick(){ +int PriGetTick(){ return CurrentTicksGain() / TICK_PER_SECOND; } \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.h b/APP_Framework/Framework/transform_layer/xizi/transform.h index 9bdfe0b61..4d2bc7859 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.h +++ b/APP_Framework/Framework/transform_layer/xizi/transform.h @@ -268,7 +268,7 @@ int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg /*********************tick**********************/ -int GetTick(); +int PriGetTick(); #ifdef __cplusplus diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h index 4c850bd43..e8d0ff162 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h @@ -11,7 +11,7 @@ /** * @file inet.h * @brief using in webnet -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h index f93048413..82b6fd09c 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h @@ -11,7 +11,7 @@ /** * @file netdev.h * @brief Structure and function declarations of device and ipaddr -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h index 2a92dff57..4a8eaa381 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h @@ -11,7 +11,7 @@ /** * @file netdev_ipaddr.h * @brief Structure and function declarations of device and ipaddr -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c index f53f05a57..1121f6de3 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c @@ -11,7 +11,7 @@ /** * @file netdev.c * @brief functions of getting device address -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c index 5822fe24f..af54b5245 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c @@ -11,7 +11,7 @@ /** * @file netdev_ipaddr.c * @brief functions of getting device address -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */