Author: Paul_R
Date: 2008-07-17 16:42:49 +0200 (Thu, 17 Jul 2008)
New Revision: 1335
Modified:
software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
Log:
* Fix bug with the radio connection state
* Fix bug with the speed sliders
Modified:
software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
===================================================================
---
software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
2008-07-17 13:52:34 UTC (rev 1334)
+++
software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
2008-07-17 14:42:49 UTC (rev 1335)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
package GUI.control;
import GUI.mainWindow;
@@ -111,7 +111,7 @@
"onSpinCounter");
tux.event.handler.register(TuxAPIConst.ST_NAME_RADIO_STATE, this,
- "onRadioConnected");
+ "onRadioConnected", "True", null);
}
/* EYES CONTROL
----------------------------------------------------------*/
@@ -213,8 +213,8 @@
* @param count Nb of movements.
* @param fs Final state
*/
- public void moveFlippers(int count, String fs) {
- tux.flippers.onAsync(count, fs);
+ public void moveFlippers(int count, String fs, Integer speed) {
+ tux.flippers.onAsync(count, fs, speed);
}
/**
@@ -258,7 +258,7 @@
* @param value The nb of turn.
* @param dir The direction.
*/
- public void spinOn(Integer value, String dir) {
+ public void spinOn(Integer value, String dir, Integer speed) {
String charger = (String)tux.status.requestOne("charger_state")[0];
Double val = value.doubleValue();
if (!charger.equalsIgnoreCase("UNPLUGGED"))
@@ -268,9 +268,9 @@
}
if (dir.equalsIgnoreCase(TuxAPIConst.SSV_RIGHT))
- tux.spinning.leftOnAsync(val / 4, TuxAPIConst.SPV_VERYFAST);
+ tux.spinning.leftOnAsync(val / 4, speed);
else
- tux.spinning.rightOnAsync(val / 4, TuxAPIConst.SPV_VERYFAST);
+ tux.spinning.rightOnAsync(val / 4, speed);
}
/**
Modified: software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
2008-07-17 13:52:34 UTC (rev 1334)
+++ software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
2008-07-17 14:42:49 UTC (rev 1335)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
package GUI;
@@ -368,7 +368,7 @@
if (radFlippers.getSelection().equals(radFlippersCount.getModel()))
{
control.moveFlippers((Integer) spinFlippers.getValue() * 2,
- TuxAPIConst.SSV_NDEF);
+ TuxAPIConst.SSV_NDEF, (Integer)
slideFlippers.getValue());
btnFlippersRun.setIcon(iconStop);
flippersButtonActive = true;
}
@@ -445,12 +445,14 @@
if (radSpin.getSelection().equals(radSpinCount.getModel()))
{
- control.spinOn((Integer) spinSpin.getValue(), dir);
+ control.spinOn((Integer) spinSpin.getValue(), dir,
+ (Integer) slideSpin.getValue());
btnSpinRun.setIcon(iconStop);
spinButtonActive = true;
}
else
{
+ System.out.println((Integer) slideSpin.getValue());
control.spinDuring((Double) spinSpin.getValue(),
(Integer) slideSpin.getValue(), dir);
if ((Double) spinSpin.getValue() >= 0.5)
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
