zhangbo
昨天 cb4eea8657ebe941b635da648f0d56d260c50664
现在串口升级初步测试升级成功
已修改9个文件
18883 ■■■■■ 文件已修改
keil/JLinkLog.txt 7969 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Listings/uwb_simple_example.map 7553 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.build_log.htm 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.htm 3217 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example_MK8000 Release.dep 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/drivers/Usart.c 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/main/main.c 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/uwb_app.c 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/uwb_simple_example.uvoptx 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/JLinkLog.txt
ÎļþÌ«´ó
keil/Listings/uwb_simple_example.map
ÎļþÌ«´ó
keil/Objects/uwb_simple_example.build_log.htm
@@ -27,8 +27,14 @@
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
Build Project 'uwb_simple_example' - Target 'MK8000 Release'
compiling uwb_app.c...
linking...
D:\zhangbo\2024\Code\ChinaUWB\ChinaUWBProject-1-5HZ\keil\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
Program Size: Code=85544 RO-data=11928 RW-data=2328 ZI-data=51324
Finished: 0 information, 1 warning and 0 error messages.
FromELF: creating hex file...
After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\zhangbo\2024\Code\ChinaUWB\ChinaUWBProject-1-5HZ\keil\Objects\uwb_simple_example.axf"
".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s).
<h2>Software Packages used:</h2>
@@ -42,7 +48,7 @@
  D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed:  00:00:00
Build Time Elapsed:  00:00:02
</pre>
</body>
</html>
keil/Objects/uwb_simple_example.htm
ÎļþÌ«´ó
keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -550,7 +550,7 @@
I (..\user_config.h)(0x687DA899)
I (include\drivers\mk_uart.h)(0x6721A6AD)
I (D:\keil\ARM\ARMCLANG\include\stdio.h)(0x5DDFFD72)
F (.\include\drivers\Usart.c)(0x68789C6C)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/usart.o -MD)
F (.\include\drivers\Usart.c)(0x687F0501)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/usart.o -MD)
I (include\drivers\Usart.h)(0x6721A6AD)
I (D:\keil\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)
I (D:\keil\ARM\ARMCLANG\include\string.h)(0x5DDFFD6C)
@@ -749,7 +749,7 @@
I (include\drivers\mk_gpio.h)(0x6721A6AD)
I (include\drivers\Usart.h)(0x6721A6AD)
I (include\drivers\global_param.h)(0x6878C20F)
F (.\include\main\main.c)(0x687E095E)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/main.o -MD)
F (.\include\main\main.c)(0x687F2EC9)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/main.o -MD)
I (include\drivers\mk_trace.h)(0x6721A6AD)
I (include\drivers\mk_common.h)(0x6721A6AD)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -850,7 +850,7 @@
I (include\drivers\mk_misc.h)(0x6721A6AD)
I (include\drivers\serial_at_cmd_app.h)(0x6879E03C)
I (include\drivers\DBG.h)(0x68510435)
F (.\uwb_app.c)(0x687DFEB3)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/uwb_app.o -MD)
F (.\uwb_app.c)(0x687F3EB2)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -I ../keil -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter -I./RTE/_MK8000_Release -ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include -ID:/keil/ARM/CMSIS/Include -D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC -o ./objects/uwb_app.o -MD)
I (include\drivers\mk_trace.h)(0x6721A6AD)
I (include\drivers\mk_common.h)(0x6721A6AD)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
keil/include/drivers/Usart.c
@@ -61,9 +61,18 @@
        // å¼ƒç”¨æ­¤éƒ¨åˆ†é€»è¾‘
        // Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
        // ä½¿ç”¨UART.c方法接入数据,以便使用STM32的逻辑
        Uart_SetChar(UART_ID_DBG_GPS, m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
        DBG_Poll();
//        Uart_SetChar(UART_ID_DBG_GPS, m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
//        DBG_Poll();
//        //waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
//        m_EUART_DMA_RXPtr++;
//        if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
//        {
//            m_EUART_DMA_RXPtr = 0;
//        }
//        DMACnt = EUART_RX_BUF_SIZE - cndtr;
//        MaxDataLen--;
        Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
        //waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
        m_EUART_DMA_RXPtr++;
        if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
keil/include/main/main.c
@@ -680,8 +680,8 @@
            } else {
                powerled = RED;
            }
            if(DBG_GetMode() == DBG_MODE_SHELL)
            {
//            if(DBG_GetMode() == DBG_MODE_SHELL)
//            {
                if(ota_flag==1)
                {
                    //                            OTA_Poll();
@@ -709,7 +709,7 @@
                led_offtask();
                UserKeyTask();
            }
//            }
            UART_CheckReceive();
            if(flag_secondtask)
            {
@@ -729,7 +729,7 @@
            }
            else
            {
                Set4LEDColor(0,0,0,powerled);
//                Set4LEDColor(0,0,0,powerled);
            }
            if(input5v_time)
            {
@@ -855,52 +855,52 @@
uint32_t elapsed_time_jibu;
extern uint8_t uwb_OpenClose_flag;
uint8_t uwb_close_count,uwb_close_count1;
void upload_apppoll()
{
//void upload_apppoll()
//{
    if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
    {
        if(g_com_map[UWBFrequency]>1)
        {
            elapsed_time_jibu = uwb_time_count - state_start_time;
            if(elapsed_time_jibu==1)
            {
                CloseUWB();
//                UWBSendUDPTask();
            }
            else if(elapsed_time_jibu==g_com_map[UWBFrequency])
            {
                taglist_num = 0;
                CloseUWB();
                Uwb_init();
                OpenUWB();
                state_start_time = uwb_time_count;
            }
        }
        else
        {}
    }
    else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
    {
        elapsed_time_jibu = uwb_time_count - state_start_time;
        switch(elapsed_time_jibu)
        {
        case UWB_OPEN_COUNT:
            CloseUWB();
//            UWBSendUDPTask();
//            uwb_close_count++;
            break;
//    if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
//    {
//        if(g_com_map[UWBFrequency]>1)
//        {
//            elapsed_time_jibu = uwb_time_count - state_start_time;
//            if(elapsed_time_jibu==1)
//            {
//                CloseUWB();
////                UWBSendUDPTask();
//            }
//            else if(elapsed_time_jibu==g_com_map[UWBFrequency])
//            {
//                taglist_num = 0;
//                CloseUWB();
//                Uwb_init();
//                OpenUWB();
//                state_start_time = uwb_time_count;
//            }
//        }
//        else
//        {}
//    }
//    else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
//    {
//        elapsed_time_jibu = uwb_time_count - state_start_time;
//        switch(elapsed_time_jibu)
//        {
//        case UWB_OPEN_COUNT:
//            CloseUWB();
////            UWBSendUDPTask();
////            uwb_close_count++;
//            break;
        case UWB_MEASUREMENT_INTERVAL_SLEEP:
            taglist_num = 0;
            CloseUWB();
            Uwb_init();
            OpenUWB();
            state_start_time = uwb_time_count;
//            uwb_close_count1++;
            break;
        }
    }
//        case UWB_MEASUREMENT_INTERVAL_SLEEP:
//            taglist_num = 0;
//            CloseUWB();
//            Uwb_init();
//            OpenUWB();
//            state_start_time = uwb_time_count;
////            uwb_close_count1++;
//            break;
//        }
//    }
//    switch (current_state)
//    {
////#ifdef UWB_1_5HZ
@@ -945,7 +945,7 @@
//            break;
//    }
}
//}
//uint8_t flag_4guart_needinit=0;
//uint8_t index1,index2,index3;
keil/uwb_app.c
@@ -356,7 +356,9 @@
        rx_length = 0;
//                OpenUWB();//再次开启UWB接收
    }
//    phy_timer_open(1, IRQ_PRIORITY_HIGH);
    OpenUWB();//再次开启UWB接收
//    LOG_INFO(TRACE_MODULE_APP,"RXdone_uwb_rx打开\r\n");
}
keil/uwb_simple_example.uvoptx
@@ -407,6 +407,21 @@
          <WinNumber>2</WinNumber>
          <ItemText>dev_id</ItemText>
        </Ww>
        <Ww>
          <count>12</count>
          <WinNumber>2</WinNumber>
          <ItemText>tagid_list</ItemText>
        </Ww>
        <Ww>
          <count>13</count>
          <WinNumber>2</WinNumber>
          <ItemText>poll_rx_num</ItemText>
        </Ww>
        <Ww>
          <count>14</count>
          <WinNumber>2</WinNumber>
          <ItemText>send_buffer</ItemText>
        </Ww>
      </WatchWindow2>
      <MemoryWindow1>
        <Mm>