Skip to content

Commit

Permalink
Исправление бага с Бимами
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamsaywhat
iamsaywhat committed Jun 8, 2020
1 parent 9fcc1fb commit 87d5102
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 142 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Objects/
Listings/
debug.log
BUP.uvguix.*
*.scvd
83 changes: 32 additions & 51 deletions BUP.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
<tRSysVw>1</tRSysVw>
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<nTsel>1</nTsel>
<bEvRecOn>1</bEvRecOn>
<nTsel>0</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
Expand All @@ -122,7 +123,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
<Name>(1010=1094,359,1504,906,0)(1007=105,137,282,402,0)(1008=1140,131,1506,357,0)(1009=1600,398,1834,936,0)</Name>
<Name>(1010=1094,317,1504,864,0)(1007=105,137,282,402,0)(1008=1140,131,1506,357,0)(1009=1302,326,1536,864,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
Expand All @@ -144,50 +145,50 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>444</LineNumber>
<LineNumber>34</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134245508</Address>
<Address>134272330</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\selftesting.c</Filename>
<Filename>.\main.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
<Expression>\\BK_BRPU\main.c\34</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>34</LineNumber>
<LineNumber>132</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134269830</Address>
<Address>134246806</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\main.c</Filename>
<Filename>.\taskmanager.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
<Expression>\\BK_BRPU\taskmanager.c\132</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>132</LineNumber>
<LineNumber>83</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134246322</Address>
<Address>134244444</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\taskmanager.c</Filename>
<Filename>.\selftesting.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\BK_BRPU\taskmanager.c\132</Expression>
<Expression>\\BK_BRPU\selftesting.c\83</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
Expand Down Expand Up @@ -216,6 +217,11 @@
<WinNumber>1</WinNumber>
<ItemText>bupDataStorage</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>systemState</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
Expand Down Expand Up @@ -353,6 +359,13 @@
</DebugFlag>
<LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
</TargetOption>
</Target>

Expand All @@ -367,7 +380,6 @@
<FileNumber>1</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\main.c</PathWithFileName>
Expand All @@ -380,7 +392,6 @@
<FileNumber>2</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\irq.c</PathWithFileName>
Expand All @@ -393,7 +404,6 @@
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\debug.c</PathWithFileName>
Expand All @@ -406,7 +416,6 @@
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\loger.c</PathWithFileName>
Expand All @@ -418,8 +427,7 @@
<GroupNumber>1</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\selftesting.c</PathWithFileName>
Expand All @@ -432,7 +440,6 @@
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\taskmanager.c</PathWithFileName>
Expand All @@ -445,7 +452,6 @@
<FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\zpz.c</PathWithFileName>
Expand All @@ -458,7 +464,6 @@
<FileNumber>8</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\config.h</PathWithFileName>
Expand All @@ -471,7 +476,6 @@
<FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\bupdatastorage.c</PathWithFileName>
Expand All @@ -492,7 +496,6 @@
<FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\logfs\log.fs.c</PathWithFileName>
Expand All @@ -505,7 +508,6 @@
<FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\logfs\log.fs.platformdepend.c</PathWithFileName>
Expand All @@ -526,7 +528,6 @@
<FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\retarget.printf\Retarget.c</PathWithFileName>
Expand All @@ -539,7 +540,6 @@
<FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\retarget.printf\RetargetPrintf.c</PathWithFileName>
Expand All @@ -551,7 +551,7 @@

<Group>
<GroupName>math.model</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand All @@ -560,7 +560,6 @@
<FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\math.model\mathmodelapi.c</PathWithFileName>
Expand All @@ -573,7 +572,6 @@
<FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\math.model\flightRegulatorCFB\flightRegulatorCFB.c</PathWithFileName>
Expand All @@ -586,7 +584,6 @@
<FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\math.model\flightController\flightController.c</PathWithFileName>
Expand All @@ -607,7 +604,6 @@
<FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\HeightMap\heightmap.c</PathWithFileName>
Expand All @@ -620,7 +616,6 @@
<FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\HeightMap\heightmap.platformdepend.c</PathWithFileName>
Expand All @@ -633,7 +628,6 @@
<FileNumber>19</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\HeightMap\mapflashlayout.h</PathWithFileName>
Expand All @@ -645,7 +639,7 @@

<Group>
<GroupName>custom.drivers</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand All @@ -654,7 +648,6 @@
<FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\25q64fv.c</PathWithFileName>
Expand All @@ -667,7 +660,6 @@
<FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\1636pp52y.c</PathWithFileName>
Expand All @@ -680,7 +672,6 @@
<FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\analogio.c</PathWithFileName>
Expand All @@ -693,7 +684,6 @@
<FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\bims.c</PathWithFileName>
Expand All @@ -706,7 +696,6 @@
<FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\bupboard.c</PathWithFileName>
Expand All @@ -719,7 +708,6 @@
<FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\crc16.c</PathWithFileName>
Expand All @@ -732,7 +720,6 @@
<FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\crc32.c</PathWithFileName>
Expand All @@ -745,7 +732,6 @@
<FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\discreteio.c</PathWithFileName>
Expand All @@ -758,7 +744,6 @@
<FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\filters.c</PathWithFileName>
Expand All @@ -770,8 +755,7 @@
<GroupNumber>6</GroupNumber>
<FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<Focus>0</Focus>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\kmonshelf.c</PathWithFileName>
Expand All @@ -784,7 +768,6 @@
<FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\otherlib.c</PathWithFileName>
Expand All @@ -797,7 +780,6 @@
<FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\sws.c</PathWithFileName>
Expand All @@ -810,7 +792,6 @@
<FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\custom.drivers\radiostation.c</PathWithFileName>
Expand All @@ -830,7 +811,7 @@

<Group>
<GroupName>::Device</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>1</RteFlg>
Expand Down
Loading

0 comments on commit 87d5102

Please sign in to comment.