MDK-ARM/R1.uvoptx

@@ -154,10 +154,6 @@
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 上层测试
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -172,58 +168,29 @@
         <Ww>
           <count>2</count>
           <WinNumber>1</WinNumber>
-<<<<<<< HEAD
-          <ItemText>ball,0x0A</ItemText>
-=======
           <ItemText>ball</ItemText>
->>>>>>> 上层测试
         </Ww>
         <Ww>
           <count>3</count>
           <WinNumber>1</WinNumber>
-<<<<<<< HEAD
-          <ItemText>nucbuf</ItemText>
-=======
           <ItemText>and1</ItemText>
->>>>>>> 上层测试
         </Ww>
         <Ww>
           <count>4</count>
           <WinNumber>1</WinNumber>
-<<<<<<< HEAD
-          <ItemText>nuc_v</ItemText>
-=======
           <ItemText>and1</ItemText>
->>>>>>> 上层测试
         </Ww>
         <Ww>
           <count>5</count>
           <WinNumber>1</WinNumber>
-<<<<<<< HEAD
-          <ItemText>abc,0x0A</ItemText>
-=======
           <ItemText>nucbuf</ItemText>
->>>>>>> 上层测试
         </Ww>
         <Ww>
           <count>6</count>
           <WinNumber>1</WinNumber>
-<<<<<<< HEAD
-          <ItemText>shoot_wait,0x0A</ItemText>
-        </Ww>
-        <Ww>
-          <count>7</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>error_code</ItemText>
-        </Ww>
-      </WatchWindow1>
-=======
->>>>>>> 上层测试
-=======
           <ItemText>drop_message,0x0A</ItemText>
         </Ww>
       </WatchWindow1>
->>>>>>> 上层测试
       <MemoryWindow4>
         <Mm>
           <WinNumber>4</WinNumber>

User/module/ball.cpp

@@ -9,7 +9,6 @@
 extern RC_ctrl_t rc_ctrl;
 extern int ball_exit;
 
-// 外死点168  外163 中150  内127  限位124.8
 // 伸缩
 //外死点89  外85 中75  内49  限位46