Skip to content

Commit

Permalink
For speed null use the non blocking function. Bigger steps for the sl…
Browse files Browse the repository at this point in the history
…iders
  • Loading branch information
ulrichard committed Jan 24, 2012
1 parent d826aaf commit dbea4d7
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
*.zip
build/
*.log
*.pyc
racs/uc/buid
36 changes: 36 additions & 0 deletions racs/qt/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -58,6 +64,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -77,6 +89,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -96,6 +114,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -115,6 +139,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -134,6 +164,12 @@
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand Down
7 changes: 5 additions & 2 deletions racs/uc/RobotArm_RACSQT.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ int main(void)

char recbuf[16];
uint8_t bufpos = 0;
uint8_t servospeed = 3; // The speed (Fast 0 ...... 10 slow)
uint8_t servospeed = 0; // The speed (Fast 0 ...... 10 slow)
int verbose = 0;
// ---------------------------------------
// Main loop:
Expand Down Expand Up @@ -102,7 +102,10 @@ int main(void)
writeString_P("\n");
}

s_Move(servonum, servopos, servospeed);
if(0 == servospeed)
Move(servonum, servopos);
else
s_Move(servonum, servopos, servospeed);

bufpos = 0;
continue;
Expand Down

0 comments on commit dbea4d7

Please sign in to comment.