bugfix режима зпз: при выдаче информации от СНС считалась контрольная…

… сумма другого пакета;
iamsaywhat · Jan 23, 2020 · 1719763 · 1719763
1 parent 3d215d2
commit 1719763
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/BUP.uvoptx b/BUP.uvoptx
@@ -140,7 +140,24 @@
           <Name>-UV0010M9E -O142 -S0 -C0 -P00 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO23 -FD20000000 -FC8000 -FN1 -FF01986BE9x.FLM -FS08000000 -FL020000 -FP0($$Device:MDR1986BE93$Flash/1986BE9x.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>71</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134267128</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\main.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\BK_BRPU\main.c\71</Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -219,6 +236,16 @@
           <WinNumber>2</WinNumber>
           <ItemText>systemTime</ItemText>
         </Ww>
+        <Ww>
+          <count>9</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>SNS_orientation</ItemText>
+        </Ww>
+        <Ww>
+          <count>10</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>SNS_position</ItemText>
+        </Ww>
       </WatchWindow2>
       <MemoryWindow1>
         <Mm>
@@ -457,7 +484,7 @@
 
   <Group>
     <GroupName>Math_model</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -495,8 +522,8 @@
       <Focus>0</Focus>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>.\Math_model\EasyReg\Easy_reg.c</PathWithFileName>
-      <FilenameWithoutPath>Easy_reg.c</FilenameWithoutPath>
+      <PathWithFileName>.\Math_model\flightController\flightController.c</PathWithFileName>
+      <FilenameWithoutPath>flightController.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

diff --git a/BUP.uvprojx b/BUP.uvprojx
@@ -542,9 +542,9 @@
               </FileOption>
             </File>
             <File>
-              <FileName>Easy_reg.c</FileName>
+              <FileName>flightController.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\Math_model\EasyReg\Easy_reg.c</FilePath>
+              <FilePath>.\Math_model\flightController\flightController.c</FilePath>
             </File>
           </Files>
         </Group>

diff --git a/ZPZ.c b/ZPZ.c
@@ -1617,7 +1617,7 @@ static void ZPZ_Response_REQ_SNS_POS (uint16_t NumPacket)
 	for(uint8_t i = 4; i < SizeAnsPDR; i++)
 	{
 		/* Побайтово досчитываем контрольную сумму */
-		ZPZ_Response.Struct.CRC = Crc16(&SNS_orientation.Buffer[i], 1, ZPZ_Response.Struct.CRC);
+		ZPZ_Response.Struct.CRC = Crc16(&SNS_position.Buffer[i], 1, ZPZ_Response.Struct.CRC);
 		/* И отправляем */
 		UARTSendByte_by_SLIP (ZPZ_UART, SNS_position.Buffer[i]);
 	}