zhangbo
3 天以前 ae0b42614c7f3de6f13c2ebacd3c1b46662ed9e9
现场试用版
已修改10个文件
36071 ■■■■ 文件已修改
keil/JLinkLog.txt 14760 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Listings/uwb_simple_example.map 6652 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.build_log.htm 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.hex 11398 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.htm 3056 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example_MK8000 Release.dep 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/main/main.c 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/src/Radio/lora_1268.c 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/uwb_simple_example.uvoptx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
user_config.h 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/JLinkLog.txt
ÎļþÌ«´ó
keil/Listings/uwb_simple_example.map
ÎļþÌ«´ó
keil/Objects/uwb_simple_example.build_log.htm
@@ -26,81 +26,9 @@
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
Rebuild Project 'uwb_simple_example' - Target 'MK8000 Release'
compiling mk_reset.c...
compiling system_MK800X.c...
compiling mk_io.c...
compiling startup_MK800X.c...
compiling mk_aes.c...
compiling cmp_svec.c...
compiling mk_dual_timer.c...
compiling mk_gpio.c...
compiling mk_dma.c...
compiling mk_clock.c...
compiling mk_misc.c...
compiling mk_calib.c...
compiling mk_adc.c...
compiling mk_power.c...
compiling mk_flash.c...
compiling mk_rtc.c...
compiling mk_sleep_timer.c...
compiling sn74hc595.c...
compiling mk_wdt.c...
compiling mk_timer.c...
compiling mk_uart.c...
compiling PCA9555.c...
compiling mk_uwb.c...
compiling Usart1.c...
compiling mk_spi.c...
compiling mk_4G.c...
compiling mk_trace.c...
compiling dw_app_anchor.c...
compiling Usart.c...
compiling global_param.c...
compiling serial_at_cmd_app.c...
compiling pin_config.c...
compiling lis3dh_driver.c...
compiling board.c...
compiling lora_3029.c...
compiling gps.c...
compiling wsf_assert.c...
compiling TCPClient.c...
compiling main.c...
compiling uwb_app.c...
compiling wsf_buf.c...
compiling wsf_bufio.c...
compiling wsf_heap.c...
compiling wsf_msg.c...
compiling wsf_os.c...
compiling wsf_nvm.c...
compiling wsf_queue.c...
compiling wsf_timer.c...
compiling wsf_trace.c...
compiling crc.c...
compiling pal_uart.c...
compiling pal_sys.c...
compiling pal_flash.c...
compiling libc.c...
compiling AIR780ECSQ.c...
compiling Module.c...
compiling Internet.c...
compiling AIR780EDriver.c...
compiling Socket.c...
compiling AIR780ESocket.c...
compiling AIR780EFSM.c...
compiling UART.c...
compiling delay.c...
compiling sx126x-board.c...
compiling sx126x.c...
compiling lora_1268.c...
compiling radio.c...
linking...
D:\zhangbo\2024\Code\ChinaUWB\3Shuanxing\ceshigujian\ChinaUWBProject-biaoqian-RX - BT-jinkoulora\keil\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
Program Size: Code=87792 RO-data=9096 RW-data=1784 ZI-data=28928
Finished: 0 information, 1 warning and 0 error messages.
FromELF: creating hex file...
Build Project 'uwb_simple_example' - Target 'MK8000 Release'
After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\zhangbo\2024\Code\ChinaUWB\3Shuanxing\ceshigujian\ChinaUWBProject-biaoqian-RX - BT-jinkoulora\keil\Objects\uwb_simple_example.axf"
".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s).
".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2>
@@ -114,7 +42,7 @@
  D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed:  00:00:03
Build Time Elapsed:  00:00:01
</pre>
</body>
</html>
keil/Objects/uwb_simple_example.hex
ÎļþÌ«´ó
keil/Objects/uwb_simple_example.htm
ÎļþÌ«´ó
keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -757,7 +757,7 @@
I (include\drivers\mk_gpio.h)(0x67C6A898)
I (include\drivers\Usart.h)(0x682C4B3A)
I (..\keil\lora_3029.h)(0x67C6A898)
F (.\include\main\main.c)(0x6837BC7A)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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)(0x68463948)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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)(0x67C6A898)
I (include\drivers\mk_common.h)(0x67C6A898)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -874,7 +874,7 @@
I (D:\keil\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
I (include\drivers\mk_gpio.h)(0x67C6A898)
I (include\drivers\mk_io.h)(0x67C6A898)
F (.\uwb_app.c)(0x6836A9B6)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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)(0x68463866)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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)(0x67C6A898)
I (include\drivers\mk_common.h)(0x67C6A898)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -1439,7 +1439,7 @@
I (include\devices\MK800X\Include\system_MK800X.h)(0x67C6A898)
I (..\user_config.h)(0x6835688C)
I (include\drivers\mk_dma.h)(0x67C6A898)
F (.\include\src\Radio\lora_1268.c)(0x6836A9B6)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -ffunction-sections -w -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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/lora_1268.o -MD)
F (.\include\src\Radio\lora_1268.c)(0x68465522)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__MICROLIB -gdwarf-3 -O0 -ffunction-sections -w -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 -I ./include/src/Radio -I ./include/src/SC7A22H_lib -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/lora_1268.o -MD)
I (D:\keil\ARM\ARMCLANG\include\math.h)(0x5DDFFD6C)
I (D:\keil\ARM\ARMCLANG\include\string.h)(0x5DDFFD6C)
I (include\src\Radio\sx126x.h)(0x67C6A898)
keil/include/main/main.c
@@ -495,53 +495,53 @@
{    
 UART0_CheckReceive();
 UART_CheckReceive();
//if(read_5v_input_pca())
//    {
//            chongman_time=0;
//                RED_LED_ON;
//                        GREEN_LED_OFF;
//                        UWB_LED_OFF;
//                        BT_LED_OFF;
//                        LORA_LED_OFF;
//            while(1)
//            {
//                nomove_count = 0;
if(read_5v_input_pca())
    {
            chongman_time=0;
                RED_LED_ON;
                        GREEN_LED_OFF;
                        UWB_LED_OFF;
                        BT_LED_OFF;
                        LORA_LED_OFF;
            while(1)
            {
                nomove_count = 0;
//                if(HIDO_TimerGetTick()-adctick>600)  //10分钟采样一次 ç”µé‡
//                {
//                    chongman_time=chongman_time+60;
//                    adctick = HIDO_TimerGetTick();
//                    PCA9555_Set_One_Value_Output(PWR_GND,0);//拉低
//                    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
//                }
//                if(bat_percent>=99&&chongman_time>=180)
//                {
//                   GREEN_LED_ON;
//                                     RED_LED_OFF;
//                }
//                                else
//                                {
//                   RED_LED_ON;
//                                     GREEN_LED_OFF;
//                }
//                        UART_CheckReceive();
//                        if(input5v_time)
//              {
//               if(!read_5v_input_pca())
//                {
//                break;
//                }
//                            }
//            }
//                            sys_reset(0);
////            NVIC_SystemReset();
////            input5vflag=1;
//        }
//    else
//    {
//
////     sys_reset(0);
//    }
                if(HIDO_TimerGetTick()-adctick>600)  //10分钟采样一次 ç”µé‡
                {
                    chongman_time=chongman_time+60;
                    adctick = HIDO_TimerGetTick();
                    PCA9555_Set_One_Value_Output(PWR_GND,0);//拉低
                    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
                }
                if(bat_percent>=99&&chongman_time>=180)
                {
                   GREEN_LED_ON;
                                     RED_LED_OFF;
                }
                                else
                                {
                   RED_LED_ON;
                                     GREEN_LED_OFF;
                }
                        UART_CheckReceive();
                        if(input5v_time)
              {
               if(!read_5v_input_pca())
                {
                break;
                }
                            }
            }
                            sys_reset(0);
//            NVIC_SystemReset();
//            input5vflag=1;
        }
    else
    {
//     sys_reset(0);
    }
}
int bind_check(void)
keil/include/src/Radio/lora_1268.c
@@ -300,19 +300,19 @@
        
        Radio.Send(lora_sendbuffer,BT_SEND_lenth);    
        LORA_POLL_COUNT++;
#ifdef CESHIGUJIAN
        uint16_t log_info_bt[10];
        uint16_t log_info_uwb[10];
        memcpy(log_info_bt,&lora_sendbuffer[LORA_RETRANSNUSSION_BT+1],BT_NUM*2+1);
        memcpy(log_info_uwb,&lora_sendbuffer[BT_ANCID_IDX+1],report_ancnum*2);
        uint16_t corrected_value =(log_info_bt[0] << 8) | (log_info_bt[0] >> 8);
        uint16_t corrected_value2 =(log_info_bt[1] << 8) | (log_info_bt[1] >> 8);
        LOG_INFO(TRACE_MODULE_APP,"BTNUM:%d,基站ID1: %04x ,基站ID2: %04x è¿åŠ¨çŠ¶æ€:%d,步数: %d\r\n",BT_NUM,corrected_value,corrected_value2,lora_sendbuffer[EXERCISE_STATE],lora_sendbuffer[STEP_COUNT]);
        LOG_INFO(TRACE_MODULE_APP,"UWBNUM:%d,基站ID1: %x,基站ID2: %x \r\n",report_ancnum,log_info_uwb[0],log_info_uwb[1]);
        memset(log_info_uwb,0,10);
        taglist_num==0;
#endif
//#ifdef CESHIGUJIAN
//        uint16_t log_info_bt[10];
//        uint16_t log_info_uwb[10];
//        memcpy(log_info_bt,&lora_sendbuffer[LORA_RETRANSNUSSION_BT+1],BT_NUM*2+1);
//        memcpy(log_info_uwb,&lora_sendbuffer[BT_ANCID_IDX+1],report_ancnum*2);
//
//        uint16_t corrected_value =(log_info_bt[0] << 8) | (log_info_bt[0] >> 8);
//        uint16_t corrected_value2 =(log_info_bt[1] << 8) | (log_info_bt[1] >> 8);
//        LOG_INFO(TRACE_MODULE_APP,"BTNUM:%d,基站ID1: %04x ,基站ID2: %04x è¿åŠ¨çŠ¶æ€:%d,步数: %d\r\n",BT_NUM,corrected_value,corrected_value2,lora_sendbuffer[EXERCISE_STATE],lora_sendbuffer[STEP_COUNT]);
//        LOG_INFO(TRACE_MODULE_APP,"UWBNUM:%d,基站ID1: %x,基站ID2: %x \r\n",report_ancnum,log_info_uwb[0],log_info_uwb[1]);
//        memset(log_info_uwb,0,10);
//        taglist_num==0;
//#endif
//        LORA_3029_SINGLE_SEND(lora_sendbuffer,ANCID_IDX+report_ancnum*4+BT_NUM*4+4,0);
//        }
//        else
keil/uwb_simple_example.uvoptx
@@ -120,7 +120,7 @@
        <SetRegEntry>
          <Number>0</Number>
          <Key>DLGUARM</Key>
          <Name></Name>
          <Name>d</Name>
        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
user_config.h
@@ -193,6 +193,7 @@
#define WSF_EN
#define DW1000
#define GROUPID_SWITCH
#define CESHIGUJIAN
//#define TEST_FREQ
/* =========================================================================================================================== */
/* ================                                           End                                             ================ */