autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0309' of https://gitlink.org.cn/wlyu/xiuos into 0309

This commit is contained in:
wlyu 2022-03-17 18:33:11 +08:00
parent be61178e44 e5d124231c
commit c61c6dafea
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
View File

@ -60,7 +60,11 @@ typedef struct PlcSocketParamStruct{
}PlcSocketParamType; }PlcSocketParamType;
//debug command //debug command
<<<<<<< HEAD
#define plc_print KPrintf #define plc_print KPrintf
=======
#define plc_print //KPrintf
>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914
#define plc_error KPrintf #define plc_error KPrintf
#define plc_notice KPrintf #define plc_notice KPrintf

3
Ubiquitous/XiZi/board/ok1052-c/board.c
View File

@ -71,7 +71,10 @@ int MountSDCard(void)
#endif #endif
#ifdef BSP_USING_LPUART #ifdef BSP_USING_LPUART
#include <connect_uart.h> #include <connect_uart.h>
<<<<<<< HEAD
#endif #endif
=======
>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914
#ifdef BSP_USING_ADC #ifdef BSP_USING_ADC
#include <connect_adc.h> #include <connect_adc.h>