RoboDuoduo/R1_up
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: RoboDuoduo:main
Branches Tags
RoboDuoduo:main
RoboDuoduo:上层测试
RoboDuoduo:运球赛
RoboDuoduo:快速版
..
compare: RoboDuoduo:上层测试
Branches Tags
RoboDuoduo:main
RoboDuoduo:上层测试
RoboDuoduo:运球赛
RoboDuoduo:快速版

No commits in common. "main" and "上层测试" have entirely different histories.
main ... 上层测试

2 changed files with 0 additions and 34 deletions
Show Stats Expand all files Collapse all files

33
MDK-ARM/R1.uvoptx
View File

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

1
User/module/ball.cpp
View File

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