zhangbo
2 天以前 a842ed1ea9caa76785625ad6b7728a919bb4ce2c
Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ

# Conflicts:
# keil/JLinkLog.txt
# keil/Listings/uwb_simple_example.map
# keil/Objects/uwb_simple_example.build_log.htm
# keil/Objects/uwb_simple_example.htm
# keil/Objects/uwb_simple_example_MK8000 Release.dep
# keil/include/main/main.c
# keil/include/src/TCPClient.c
# keil/uwb_simple_example.uvoptx
已修改1个文件
2 ■■■ 文件已修改
keil/include/main/main.c 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/main/main.c
@@ -962,7 +962,7 @@
    wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
    LED_output_init();//配置彩色灯引脚
//    PCA9555_Set_One_Value_Output(TTS_ENABLE,1);
    PCA9555_Set_One_Value_Output(TTS_ENABLE,1);
    WT588E02B_Init();
    adc_open(&usr_adc_cfg);
    uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);