038ffb0327e40886b4db2eb8b3fcd1653aa264a3..566ed7f3c2620e22f0e7df0c733b31a4187da502
2025-07-29 zhangbo
V1.69
566ed7 对比 | 目录
2025-07-29 zhangbo
修改can模块的通讯速率500k
ec5131 对比 | 目录
已修改4个文件
109 ■■■■ 文件已修改
源码/核心板/MDK-ARM/Project.uvoptx 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/MDK-ARM/Project.uvprojx 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/dw_app.c 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/main.c 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/MDK-ARM/Project.uvoptx
@@ -162,66 +162,82 @@
        <Bp>
          <Number>0</Number>
          <Type>0</Type>
          <LineNumber>27</LineNumber>
          <LineNumber>327</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>134254632</Address>
          <Address>134266338</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\beep_logic_app.c</Filename>
          <Filename>D:\zhangbo\2024\Code\F103\UWB_SmallModule_F103\濠ф劗鐖淺Src\main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression>\\UWB_Projects\../Src/application/beep_logic_app.c\27</Expression>
          <Expression>\\UWB_Projects\../Src/main.c\327</Expression>
        </Bp>
        <Bp>
          <Number>1</Number>
          <Type>0</Type>
          <LineNumber>431</LineNumber>
          <LineNumber>329</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>134250984</Address>
          <Address>134266350</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename>
          <Filename>D:\zhangbo\2024\Code\F103\UWB_SmallModule_F103\濠ф劗鐖淺Src\main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression>\\UWB_Projects\../Src/application/dw_app.c\431</Expression>
          <Expression>\\UWB_Projects\../Src/main.c\329</Expression>
        </Bp>
        <Bp>
          <Number>2</Number>
          <Type>0</Type>
          <LineNumber>1104</LineNumber>
          <LineNumber>331</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>134241968</Address>
          <Address>134266362</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename>
          <Filename>D:\zhangbo\2024\Code\F103\UWB_SmallModule_F103\濠ф劗鐖淺Src\main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression>\\UWB_Projects\../Src/application/dw_app.c\1104</Expression>
          <Expression>\\UWB_Projects\../Src/main.c\331</Expression>
        </Bp>
        <Bp>
          <Number>3</Number>
          <Type>0</Type>
          <LineNumber>1042</LineNumber>
          <LineNumber>333</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>0</Address>
          <Address>134266374</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>0</BreakIfRCount>
          <Filename>..\Src\application\dw_app.c</Filename>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>D:\zhangbo\2024\Code\F103\UWB_SmallModule_F103\濠ф劗鐖淺Src\main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression></Expression>
          <Expression>\\UWB_Projects\../Src/main.c\333</Expression>
        </Bp>
        <Bp>
          <Number>4</Number>
          <Type>0</Type>
          <LineNumber>335</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>134266386</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>D:\zhangbo\2024\Code\F103\UWB_SmallModule_F103\濠ф劗鐖淺Src\main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression>\\UWB_Projects\../Src/main.c\335</Expression>
        </Bp>
      </Breakpoint>
      <WatchWindow1>
@@ -383,7 +399,7 @@
      <DebugFlag>
        <trace>0</trace>
        <periodic>1</periodic>
        <aLwin>0</aLwin>
        <aLwin>1</aLwin>
        <aCover>0</aCover>
        <aSer1>0</aSer1>
        <aSer2>0</aSer2>
源码/核心板/MDK-ARM/Project.uvprojx
@@ -10,7 +10,7 @@
      <TargetName>STM32</TargetName>
      <ToolsetNumber>0x4</ToolsetNumber>
      <ToolsetName>ARM-ADS</ToolsetName>
      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
      <uAC6>0</uAC6>
      <TargetOption>
        <TargetCommonOption>
@@ -185,6 +185,7 @@
            <uocXRam>0</uocXRam>
            <RvdsVP>0</RvdsVP>
            <RvdsMve>0</RvdsMve>
            <RvdsCdeCp>0</RvdsCdeCp>
            <hadIRAM2>0</hadIRAM2>
            <hadIROM2>0</hadIROM2>
            <StupSel>8</StupSel>
@@ -351,7 +352,7 @@
            <NoWarn>0</NoWarn>
            <uSurpInc>0</uSurpInc>
            <useXO>0</useXO>
            <uClangAs>0</uClangAs>
            <ClangAsOpt>4</ClangAsOpt>
            <VariousControls>
              <MiscControls></MiscControls>
              <Define></Define>
@@ -664,4 +665,19 @@
    <files/>
  </RTE>
  <LayerInfo>
    <Layers>
      <Layer>
        <LayName>&lt;Project Info&gt;</LayName>
        <LayDesc></LayDesc>
        <LayUrl></LayUrl>
        <LayKeys></LayKeys>
        <LayCat></LayCat>
        <LayLic></LayLic>
        <LayTarg>0</LayTarg>
        <LayPrjMark>1</LayPrjMark>
      </Layer>
    </Layers>
  </LayerInfo>
</Project>
源码/核心板/Src/application/dw_app.c
@@ -9,7 +9,7 @@
    NEARPOLL,
}tag_state=NEARPOLL;
static dwt_config_t config = {
    2,               /* Channel number. */
    5,               /* Channel number. */
    DWT_PRF_64M,     /* Pulse repetition frequency. */
    DWT_PLEN_128,    /* Preamble length. */
    DWT_PAC8,        /* Preamble acquisition chunk size. Used in RX only. */
源码/核心板/Src/main.c
@@ -142,7 +142,7 @@
        
    OUT485_ENABLE;
    ComMapCheck();    
    g_com_map[VERSION] = 1<<8|68;
    g_com_map[VERSION] = 1<<8|69;
    FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
    dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
     if(dist_threshold<300)
@@ -224,7 +224,7 @@
void IdleTask(void)
{
        
            UART_CheckReceive();
        UART_CheckReceive();
        UART_CheckSend();
    
    if(heartbeat_timer>1000)
@@ -245,7 +245,7 @@
//                        NVIC_SystemReset();
//                    }
//                }
      flag_newsecond=0;
        flag_newsecond=0;
        tagpos_binary=0;
        memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
        ancidlist_num=0;
@@ -308,6 +308,32 @@
        g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;
    }
uint8_t at_cmd[3]={0x2B,0x2B,0x2B};
uint8_t at_cmd1[2]={0x41,0x54};
char at_cmd2[20]={"AT+CAN=500,70,NDTF\r\n"};  //AT+CAN?\r\n
char at_cmd3[9]={"AT+CAN?\r\n"};
char at_cmd4[9]={"AT+EXAT\r\n"};
void send_to_ECAN()
{
//  UART_PushFrame(at_cmd,3);
//
//  UART_PushFrame(at_cmd1,2);
////  delay_ms(1);
//  UART_PushFrame((uint8_t*)at_cmd2,20);
////  delay_ms(1);
//  UART_PushFrame((uint8_t*)at_cmd3,9);
////  delay_ms(1);
//  UART_PushFrame((uint8_t*)at_cmd4,9);
 printf("+++");
 delay_ms(20);
 printf("AT");
 delay_ms(20);
 printf("AT+CAN=500,0,NDTF\r\n");
 delay_ms(1);
 printf("AT+CAN?\r\n");
 delay_ms(1);
 printf("AT+EXAT\r\n");
}
    
int main(void)
{
@@ -324,9 +350,10 @@
    usart_send[1]=0xAA;
    usart_send_anc[0]=0x55;
    usart_send_anc[1]=0xAA;
    send_to_ECAN();
    while(1)
    {
    g_start_sync_flag=0;
    if(g_start_send_flag)
    {