F103基站代码
上一版本: 35ee2267 | 补丁 | 提交 | 显示空白
zhyinch
2020-07-24 108bcd0a691130a98c71970b150b1dbde6906d08 
修改串口index bug 增加MAP表注释
已修改5个文件
3840 ■■■■■ 文件已修改
源码/核心板/MDK-ARM/Project.uvguix.Administrator 3728 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/MDK-ARM/Project.uvoptx 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/MDK-ARM/Project.uvprojx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/global_param.h 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
源码/核心板/Src/application/serial_at_cmd_app.c 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 Ô´Âë/ºËÐÄ°å/MDK-ARM/Project.uvguix.Administrator


ÎļþÌ«´ó




 Ô´Âë/ºËÐÄ°å/MDK-ARM/Project.uvoptx


@@ -103,7 +103,7 @@


        <bEvRecOn>1</bEvRecOn>


        <bSchkAxf>0</bSchkAxf>


        <bTchkAxf>0</bTchkAxf>


        <nTsel>12</nTsel>


        <nTsel>6</nTsel>


        <sDll></sDll>


        <sDllPa></sDllPa>


        <sDlgDll></sDlgDll>


@@ -114,13 +114,13 @@


        <tDlgDll></tDlgDll>


        <tDlgPa></tDlgPa>


        <tIfile></tIfile>


        <pMon>BIN\CMSIS_AGDI.dll</pMon>


        <pMon>Segger\JL2CM3.dll</pMon>


      </DebugOpt>


      <TargetDriverDllRegistry>


        <SetRegEntry>


          <Number>0</Number>


          <Key>DLGUARM</Key>


          <Name>d</Name>


          <Name></Name>


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


@@ -153,40 +153,7 @@


          <Name>-T0</Name>


        </SetRegEntry>


      </TargetDriverDllRegistry>


      <Breakpoint>


        <Bp>


          <Number>0</Number>


          <Type>0</Type>


          <LineNumber>166</LineNumber>


          <EnabledFlag>1</EnabledFlag>


          <Address>134245620</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\main.c</Filename>


          <ExecCommand></ExecCommand>


          <Expression>\\UWB_Projects\../Src/main.c\166</Expression>


        </Bp>


        <Bp>


          <Number>1</Number>


          <Type>0</Type>


          <LineNumber>170</LineNumber>


          <EnabledFlag>1</EnabledFlag>


          <Address>0</Address>


          <ByteObject>0</ByteObject>


          <HtxType>0</HtxType>


          <ManyObjects>0</ManyObjects>


          <SizeOfObject>0</SizeOfObject>


          <BreakByAccess>0</BreakByAccess>


          <BreakIfRCount>0</BreakIfRCount>


          <Filename>..\Src\main.c</Filename>


          <ExecCommand></ExecCommand>


          <Expression></Expression>


        </Bp>


      </Breakpoint>


      <Breakpoint/>


      <WatchWindow1>


        <Ww>


          <count>0</count>


@@ -223,6 +190,11 @@


          <WinNumber>1</WinNumber>


          <ItemText>tyncpoll_time,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>7</count>


          <WinNumber>1</WinNumber>


          <ItemText>ii,0x0A</ItemText>


        </Ww>


      </WatchWindow1>


      <MemoryWindow1>


        <Mm>




 Ô´Âë/ºËÐÄ°å/MDK-ARM/Project.uvprojx


@@ -138,7 +138,7 @@


          </Flash1>


          <bUseTDR>1</bUseTDR>


          <Flash2>BIN\UL2CM3.DLL</Flash2>


          <Flash3></Flash3>


          <Flash3>"" ()</Flash3>


          <Flash4></Flash4>


          <pFcarmOut></pFcarmOut>


          <pFcarmGrp></pFcarmGrp>




 Ô´Âë/ºËÐÄ°å/Src/application/global_param.h


@@ -8,46 +8,46 @@


#define DEFAULT_DEV_ID        5555        //默认设备ID是5555




/*---------------Map Definition-------------------*/


#define   MAP_SIGN_INDEX      0x0


#define     VERSION                    0x1		


#define   MAP_SIGN_INDEX      0x0        //MAP表初始化标志位


#define     VERSION                    0x1        //版本号


#define     DEV_ID                          0x2        //设备的Id


#define     COM_INTERVAL                0x3        //通讯间隔


#define     MAX_REPORT_ANC_NUM  0x4        //单次通讯基站上限


#define     GROUP_ID                      0x5        //单次通讯基站下限


#define     DIST_OFFSET                    0x6	


#define     GROUP_ID                      0x5        //组ID


#define     DIST_OFFSET                    0x6        //校准距离


#define     DEV_ROLE                        0x7        //该设备是anchor还是tag    


#define     ANC_POLL                        0x8        //基站主动测距




#define     ALARM_DEV                        0x9        //是哪个设备报警


#define        ALARM_DISTANCE1            0xA        //小于多少距离报警


#define        ALARM_DISTANCE2            0xB        //小于多少距离报警


#define        ALARM_DISTANCE3            0xC        //小于多少距离报警


#define        PAIR_ID                            0xD        //小于多少距离报警


#define        HEARTBEAT               0xE


#define        MODBUS_MODE                   0xF


#define     ALARM_DEV                        0x9        //报警接口


#define        ALARM_DISTANCE1            0xA        //无报警距离


#define        ALARM_DISTANCE2            0xB        //报警距离


#define        ALARM_DISTANCE3            0xC        //预警距离


#define        PAIR_ID                            0xD        //配对ID（无作用）


#define        HEARTBEAT               0xE   //心跳包 


#define        MODBUS_MODE                   0xF        //MOBUSģʽ




#define      NEARBASE_NUM     0x10


#define      NEARBASE_ID1     0x11


#define      NEARBASE_ID2     0x12


#define      NEARBASE_ID3     0x13


#define      NEARBASE_ID4     0x14


#define      NEARBASE_ID5     0x15


#define      NEARBASE_ID6     0x16


#define      NEARBASE_ID7     0x17


#define      NEARBASE_ID8     0x18


#define      NEARBASE_ID9     0x19


#define      NEARBASE_ID10    0x1a


#define      NEARBASE_NUM     0x10    //临近基站数量


#define      NEARBASE_ID1     0x11    //临近基站1 ID


#define      NEARBASE_ID2     0x12    //临近基站2 ID


#define      NEARBASE_ID3     0x13    //临近基站3 ID


#define      NEARBASE_ID4     0x14    //临近基站4 ID


#define      NEARBASE_ID5     0x15    //临近基站5 ID


#define      NEARBASE_ID6     0x16    //临近基站6 ID


#define      NEARBASE_ID7     0x17    //临近基站7 ID


#define      NEARBASE_ID8     0x18    //临近基站8 ID


#define      NEARBASE_ID9     0x19    //临近基站9 ID


#define      NEARBASE_ID10    0x1a    //临近基站10 ID




#define     POWER                   0x1B


#define        IMU_THRES                       0x1C


#define   NOMOVESLEEP_TIME    0x1D


#define   MOTOR_ENABLE        0x1E


#define   IMU_ENABLE          0x1F


#define     FILTER_COEFFICIENT  0x20


#define     POWER                   0x1B    //发射功率


#define        IMU_THRES                       0x1C    //加速计灵敏度


#define   NOMOVESLEEP_TIME    0x1D    //无运动休眠时间


#define   MOTOR_ENABLE        0x1E    //震动使能


#define   IMU_ENABLE          0x1F    //加速计使能


#define     FILTER_COEFFICIENT  0x20    //滤波参数




#define     CNT_RESTART                    0x30


#define     CNT_REBOOT                    0x31


#define     CNT_UPDATE                    0x32


#define     CNT_RESTART                    0x30    //重启


#define     CNT_REBOOT                    0x31    //恢复出厂设置


#define     CNT_UPDATE                    0x32    //升级






/*------------END Map Definition-------------------*/




 Ô´Âë/ºËÐÄ°å/Src/application/serial_at_cmd_app.c


@@ -31,7 +31,7 @@


    send_frame[2] = 0x03;


    send_frame[3] = data_length+5;


    send_frame[4] = CMD_REPLY;


    send_frame[5] = index;


    send_frame[5] = index<<1;


    send_frame[6] = data_length;


    memcpy(&send_frame[7], &g_com_map[index], data_length);


    for(int i = 0; i<(data_length+5); i++)