From 0401ba0353be795d83dad129a942d892c7f13eb5 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期六, 23 三月 2024 19:51:13 +0800 Subject: [PATCH] 修改同步时间,lora发送长度也会影响同步延迟的参数。 2.增加回复基站随机5个抢占位。 --- MDK-ARM/L051.uvoptx | 472 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 274 insertions(+), 198 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 7f5c6a1..c4b8766 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -8,7 +8,7 @@ <Extensions> <cExt>*.c</cExt> <aExt>*.s*; *.src; *.a*</aExt> - <oExt>*.obj</oExt> + <oExt>*.obj; *.o</oExt> <lExt>*.lib</lExt> <tExt>*.txt; *.h; *.inc</tExt> <pExt>*.plm</pExt> @@ -26,7 +26,7 @@ <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> - <CLKADS>32000000</CLKADS> + <CLKADS>8000000</CLKADS> <OPTTT> <gFlags>1</gFlags> <BeepAtEnd>1</BeepAtEnd> @@ -88,7 +88,7 @@ <sRmem>1</sRmem> <sRfunc>1</sRfunc> <sRbox>1</sRbox> - <tLdApp>1</tLdApp> + <tLdApp>0</tLdApp> <tGomain>1</tGomain> <tRbreak>1</tRbreak> <tRwatch>1</tRwatch> @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>6</nTsel> + <nTsel>4</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -113,7 +113,7 @@ <tDllPa></tDllPa> <tDlgDll></tDlgDll> <tDlgPa></tDlgPa> - <tIfile></tIfile> + <tIfile>.\Loader.ini</tIfile> <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> @@ -125,7 +125,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name>d</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -145,7 +145,7 @@ <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> + <Name>-U20090928 -O70 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -158,44 +158,27 @@ <Name>-U066CFF564948897767122910 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>142</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134250444</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>../Src/main.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/main.c\142</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>recbase_num</ItemText> + <ItemText>wg_lost_count,0x0A</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>intheight,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>bat_percent,0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>motor_ontime</ItemText> + <ItemText>bat_volt</ItemText> </Ww> <Ww> <count>4</count> @@ -205,106 +188,59 @@ <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>tag_state</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>module_power,0x0A</ItemText> + <ItemText>rec_ancdistlist</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>seq_num,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>slotpos_intoatl,0x0A</ItemText> + <ItemText>motor_keeptime,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>key_keeptime</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>wg_report_id</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>wg_report_freq,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>minid</ItemText> + <ItemText>delaytime,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>temp_dist,0x0A</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>1</WinNumber> - <ItemText>nearbase_switchdistlist,0x0A</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>1</WinNumber> - <ItemText>tag_state</ItemText> - </Ww> - <Ww> - <count>17</count> - <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> - </Ww> - <Ww> - <count>18</count> - <WinNumber>1</WinNumber> - <ItemText>rec_nearbaseid</ItemText> - </Ww> - <Ww> - <count>19</count> - <WinNumber>1</WinNumber> - <ItemText>mainbase_lost_count</ItemText> - </Ww> - <Ww> - <count>20</count> - <WinNumber>1</WinNumber> - <ItemText>motor_state</ItemText> - </Ww> - <Ww> - <count>21</count> - <WinNumber>1</WinNumber> - <ItemText>motor_keeptime</ItemText> + <ItemText>report_ancnum</ItemText> </Ww> </WatchWindow1> - <WatchWindow2> - <Ww> - <count>0</count> - <WinNumber>2</WinNumber> - <ItemText>current_slotnum</ItemText> - </Ww> - <Ww> - <count>1</count> - <WinNumber>2</WinNumber> - <ItemText>current_slotnum</ItemText> - </Ww> - </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> <SubType>0</SubType> - <ItemText>headerBuffer</ItemText> + <ItemText>0x0800FC00</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -366,18 +302,6 @@ <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> - <File> - <GroupNumber>1</GroupNumber> - <FileNumber>1</FileNumber> - <FileType>2</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>startup_stm32l051xx.s</PathWithFileName> - <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> </Group> <Group> @@ -388,6 +312,18 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>2</GroupNumber> + <FileNumber>1</FileNumber> + <FileType>2</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>startup_stm32l051xx.s</PathWithFileName> + <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> @@ -395,6 +331,30 @@ <bDave2>0</bDave2> <PathWithFileName>..\Drivers\ExternlDrivers\lis3dh_driver.c</PathWithFileName> <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>3</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\ExternalDevices\dps310.c</PathWithFileName> + <FilenameWithoutPath>dps310.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>4</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\ExternalDevices\dps368_test.c</PathWithFileName> + <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -408,7 +368,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>3</FileNumber> + <FileNumber>5</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -420,7 +380,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -432,7 +392,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -452,7 +412,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>6</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -472,7 +432,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>7</FileNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -484,7 +444,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>8</FileNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -496,7 +456,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -508,7 +468,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -536,7 +496,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>11</FileNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -548,7 +508,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -560,13 +520,37 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\serial_at_cmd_app.c</PathWithFileName> <FilenameWithoutPath>serial_at_cmd_app.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>16</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\CRC.c</PathWithFileName> + <FilenameWithoutPath>CRC.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>17</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\dw_mbx_tag.c</PathWithFileName> + <FilenameWithoutPath>dw_mbx_tag.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -580,7 +564,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -592,7 +576,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -604,7 +588,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -617,14 +601,114 @@ </Group> <Group> - <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> - <tvExp>1</tvExp> + <GroupName>Drivers/CMSIS</GroupName> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>21</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> + <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>radio</GroupName> + <tvExp>1</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>22</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\crc.c</PathWithFileName> + <FilenameWithoutPath>crc.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>23</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\delay.c</PathWithFileName> + <FilenameWithoutPath>delay.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>24</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\radio.c</PathWithFileName> + <FilenameWithoutPath>radio.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>25</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\sx126x.c</PathWithFileName> + <FilenameWithoutPath>sx126x.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>26</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\sx126x-board.c</PathWithFileName> + <FilenameWithoutPath>sx126x-board.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>27</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\Lora.c</PathWithFileName> + <FilenameWithoutPath>Lora.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -635,8 +719,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>18</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -647,8 +731,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>19</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -659,8 +743,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>20</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -671,8 +755,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>21</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -683,8 +767,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>22</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -695,8 +779,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>23</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -707,8 +791,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>24</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -719,8 +803,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>25</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -731,8 +815,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>26</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -743,8 +827,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>27</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -755,8 +839,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>28</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -767,8 +851,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>29</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -779,8 +863,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>30</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -791,8 +875,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>31</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -803,8 +887,20 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>32</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>43</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_iwdg.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_iwdg.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -815,44 +911,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>33</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_spi.c</PathWithFileName> - <FilenameWithoutPath>stm32l0xx_hal_spi.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>9</GroupNumber> - <FileNumber>34</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim.c</PathWithFileName> - <FilenameWithoutPath>stm32l0xx_hal_tim.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>9</GroupNumber> - <FileNumber>35</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim_ex.c</PathWithFileName> - <FilenameWithoutPath>stm32l0xx_hal_tim_ex.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>9</GroupNumber> - <FileNumber>36</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -863,8 +923,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>37</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -874,23 +934,39 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> - </Group> - - <Group> - <GroupName>Drivers/CMSIS</GroupName> - <tvExp>1</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>0</RteFlg> <File> - <GroupNumber>10</GroupNumber> - <FileNumber>38</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> - <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_spi.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_spi.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>48</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_tim.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>49</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim_ex.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_tim_ex.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> -- Gitblit v1.9.3