update

so much stuff

Author: joshua1024

README.txt

@@ -3,17 +3,27 @@ Setup lines: 1-5
 1: robot name
 2: ip
 3: port
-4: name of gamepad/joystick
+4: telemetry data
+5: free line
 
-Object lines: 5-
+Object lines: 6-
 	list groups of objects in order:
 		1:Buttons
 		2:Axes
 		3:UIButtons
-		4:UIJoysticks
-		5:UISliders
+		4:UIIndicators
+		5:UIJoysticks
+		6:UISliders
 	leave a blank line between groups
 
+-Variables-
+Imput Variables: (0-7)
+	variables that you send to the bot
+		-variables 1,2,3,4 are always forwards,strafe,turn,intake
+Output Variables: (8-15)
+	variables that you recieve from the bot
+		-variable 8 is always battery voltage
+
 -Object Descriptions-
 Imput Objects:
 	Buttons:
@@ -26,6 +36,10 @@ UI Objects:
 	UIButtons:
 		-controlled by a keyboard key and/or a gamepad button
 		-draws a button that can be pressed
+	UIIndicators:
+		-controlled by a variable
+		-activates when variable is within set range
+		-draws a circle that changes color when activated
 	UIJoysticks:
 		-controlled by two outputs, one for x and one for y
 		-draws a square with a circle inside that moves in 2 dimensions
@@ -34,13 +48,17 @@ UI Objects:
 		-draws a rectangle with another rectangle inside that moves in one dimension
 
 -Object Variables-
-Buttons: variable,keyboardkey,gamepadbutton,onHold,onPressed,onReleased,onOff
+Buttons: variable,keyboardKey,gamepadButton,type,onHold,onPressed,onReleased,onOff
 	variable: int [0 to 7]
 		determines which variable is being modified
 	keyboardKey: letter or number
 		determines which key activates button
 	gamepadButton: (look up documentation)
 		determines which gamepad button activates button
+	type: int [1 or 2]
+		determines the behavior of button
+			1: standard button
+			2: toggle button
 	onHold: float [-1 to 1]
 		determines what number to set the specified output to while button is activated
 	onPressed: float [-1 to 1]
@@ -50,7 +68,7 @@ Buttons: variable,keyboardkey,gamepadbutton,onHold,onPressed,onReleased,onOff
 	onOff: float [-1 to 1]
 		determines what number to set the specified output to while button is not activated
 
-Axes: variable,keyboardkey1,keyboardkey2,gamepadAxis,type,step,min,max,inverted
+Axes: variable,keyboardKey1,keyboardKey2,gamepadAxis,type,step,min,max,inverted
 	variable: int [0 to 7]
 		determines which output is being modified
 	keyboardKey1: letter or number
@@ -59,7 +77,7 @@ Axes: variable,keyboardkey1,keyboardkey2,gamepadAxis,type,step,min,max,inverted
 		determines the positive key
 	gamepadAxis: (look up documentation)
 		determines which gamepad axis controls the axis
-	type: int 1 or 2 (or more if we add more modes)
+	type: int [1 or 2] (or more if we add more modes)
 		determines the behavior of axis
 			1: returns to 0
 			2: stays on value
@@ -72,26 +90,48 @@ Axes: variable,keyboardkey1,keyboardkey2,gamepadAxis,type,step,min,max,inverted
 	inverted: boolean
 		determines whether gamepad axis is flipped or not
 
-UIButtons: keyboardkey,gamepadbutton,x,y,color1,color2,size
-	keyboardkey: letter or number
+UIButtons: keyboardKey,gamepadButton,type,x,y,color1,color2,size
+	keyboardKey: letter or number
 		determines which key activates button
-	gamepadbutton: (look up documentation)
+	gamepadButton: (look up documentation)
 		determines which gamepad button activates button
+	type: int [1 or 2]
+		determines the behavior of button
+			1: standard button
+			2: toggle button
 	x: float [0 to 1]
 		determines how far left/right button appears (0 is left, 1 is right)
 	y: float [0 to 1]
 		determines how far up/down button appears (0 is up, 1 is down)
-	color1: ARGB hex value (alpha red green blue)
+	color1: RGB hex value
 		determines the color of button when activated
-	color2: ARGB hex value (alpha red green blue)
+	color2: RGB hex value
+		determines the color of button when not activated
+	size: int
+		determines size of button
+		
+UIIndicator: variable,min,max,x,y,color1,color2,size
+	variable: int [0 to 15]
+		determines what variable to indicate
+	min:
+		sets minimum for indtcated range
+	max:
+		sets maximum for indtcated range
+	x: float [0 to 1]
+		determines how far left/right button appears (0 is left, 1 is right)
+	y: float [0 to 1]
+		determines how far up/down button appears (0 is up, 1 is down)
+	color1: RGB hex value
+		determines the color of button when activated
+	color2: RGB hex value
 		determines the color of button when not activated
 	size: int
 		determines size of button
 
-UIJoysticks: xvariable,yvariable,x,y,color,size
-	xvariable: int [0 to 7]
+UIJoysticks: xVariable,yVariable,x,y,color,size
+	xVariable: int [0 to 15]
 		determines which output controls x axis of joystick
-	yvariable: int [0 to 7]
+	yVariable: int [0 to 15]
 		determines which output controls y axis of joystick
 	x: float [0 to 1]
 		determines how far left/right axis appears (0 is left, 1 is right)
@@ -102,9 +142,13 @@ UIJoysticks: xvariable,yvariable,x,y,color,size
 	size: int
 		determines size of joystick
 
-UISliders: variable,x,y,color,orientation,size
-	variable: int [0 to 7]
+UISliders: variable,min,max,x,y,color,orientation,size
+	variable: int [0 to 15]
 		determines which output controls slider
+	min: float [-1 to 1]
+		determines the min value of slider
+	max: float [-1 to 1]
+		determines the max value of slider
 	x: float [0 to 1]
 		determines how far left/right slider appears (0 is left, 1 is right)
 	y: float [0 to 1]
@@ -116,4 +160,7 @@ UISliders: variable,x,y,color,orientation,size
 			1: vertical
 			2: horizontal
 	size: int
-		determines size of slider
+		determines size of slider
+
+window size and layout can be changed in the setup.txt file
+ask weston or joshua if you want to edit that

rcmds/Axis.pde

@@ -11,7 +11,7 @@ class Axis {
   boolean invert;
   Axis (String[] configData) {
     variable = int(configData[0]);
-    if (configData[1].length()!=0) {
+    if (!configData[1].equals("")) {
       if (configData[1].length()>1) {
         keyboardKey1=int(configData[1]);
       } else {
@@ -20,7 +20,7 @@ class Axis {
     } else {
       keyboardKey1 = 0;
     }
-    if (configData[2].length()!=0) {
+    if (!configData[2].equals("")) {
       if (configData[2].length()>1) {
         keyboardKey2=int(configData[2]);
       } else {
@@ -29,7 +29,7 @@ class Axis {
     } else {
       keyboardKey2 = 0;
     }
-    if (configData[3].length()>0) {
+    if (!configData[3].equals("")) {
       gamepadAxis = configData[3];
     } else {
       gamepadAxis = null;
@@ -44,48 +44,48 @@ class Axis {
 
     //spring
     if (type == 1) {
-      toSend[variable] = 0;
+      data[variable] = 0;
 
       if (keyboardCtrl.isPressed(keyboardKey1)) {
-          toSend[variable] = min;
+          data[variable] = min;
       }
 
       if (keyboardCtrl.isPressed(keyboardKey2)) {
-          toSend[variable] = max;
+          data[variable] = max;
       }
 
-      if (toSend[variable] == 0) {
+      if (data[variable] == 0) {
         if (invert) {
-          toSend[variable] = (max-min)/2*-gamepadVal(gamepadAxis, toSend[variable])+(max+min)/2;
+          data[variable] = (max-min)/2*-gamepadVal(gamepadAxis, data[variable])+(max+min)/2;
         } else {
-          toSend[variable] = (max-min)/2*gamepadVal(gamepadAxis, toSend[variable])+(max+min)/2;
+          data[variable] = (max-min)/2*gamepadVal(gamepadAxis, data[variable])+(max+min)/2;
         }
       }
     }
 
     //sticky
     if (type == 2) {      
       if (keyboardCtrl.isPressed(int(keyboardKey1))) {
-          toSend[variable] -= step;
+          data[variable] -= step;
       }
 
       if (keyboardCtrl.isPressed(int(keyboardKey2))) {
-          toSend[variable] += step;
+          data[variable] += step;
       }
 
       if (abs(gamepadVal(gamepadAxis, 0)) > 0.15) {
         if (invert) {
-          toSend[variable] -= 2*step*gamepadVal(gamepadAxis, 0);
+          data[variable] -= 2*step*gamepadVal(gamepadAxis, 0);
         } else {
-          toSend[variable] += 2*step*gamepadVal(gamepadAxis, 0);
+          data[variable] += 2*step*gamepadVal(gamepadAxis, 0);
         }
       }
 
-      if (toSend[variable]>max) {
-        toSend[variable]=max;
+      if (data[variable]>max) {
+        data[variable]=max;
       }
-      if (toSend[variable]<min) {
-        toSend[variable]=min;
+      if (data[variable]<min) {
+        data[variable]=min;
       }
     }
 

rcmds/Button.pde

@@ -1,17 +1,19 @@
-//variable,keyboardkey,gamepadbutton,onHold,onPressed,onReleased,onOff
+//variable,keyboardkey,gamepadbutton,type,onHold,onPressed,onReleased,onOff
 class Button {
   int variable;
   int keyboardKey;
   String gamepadButton;
+  int type;
   float onHold;
   float onPressed;
   float onReleased;
   float onOff;
-  boolean pressed;
+  boolean pressed = false;
   boolean wasPressed = false;
+  boolean wasKeyPressed = false;
   Button (String[] configData) {
     variable = int(configData[0]);
-    if (configData[1].length()!=0) {
+    if (!configData[1].equals("")) {
       if (configData[1].length()>1) {
         keyboardKey=int(configData[1]);
       } else {
@@ -20,37 +22,42 @@ class Button {
     } else {
       keyboardKey = 0;
     }
-    if (configData[2].length()>0) {
+    if (!configData[2].equals("")) {
       gamepadButton = configData[2];
     } else {
       gamepadButton = null;
     }
-    onHold = float(configData[3]);
-    onPressed = float(configData[4]);
-    onReleased = float(configData[5]);
-    onOff = float(configData[6]);
+    type = int(configData[3]);
+    onHold = float(configData[4]);
+    onPressed = float(configData[5]);
+    onReleased = float(configData[6]);
+    onOff = float(configData[7]);
   }
   boolean run() {
 
-    pressed = keyboardCtrl.isPressed(keyboardKey);
-    if (!pressed) {
-      pressed = gamepadButton(gamepadButton, pressed);
+    if (type == 1) {
+      pressed = keyboardCtrl.isPressed(keyboardKey) || gamepadButton(gamepadButton, false)||virtualKeyboardButton.contains(keyboardKey)||virtualGamepadButton.contains(gamepadButton);
+    } else {
+      if ((keyboardCtrl.isPressed(keyboardKey) || gamepadButton(gamepadButton, false)||virtualKeyboardButton.contains(keyboardKey)||virtualGamepadButton.contains(gamepadButton)) && !wasKeyPressed) {
+        pressed = !pressed;
+      }
+      wasKeyPressed = keyboardCtrl.isPressed(keyboardKey) || gamepadButton(gamepadButton, false)||virtualKeyboardButton.contains(keyboardKey)||virtualGamepadButton.contains(gamepadButton);
     }
 
     if (pressed && wasPressed && !Float.isNaN(onHold)) {
-      toSend[variable] = onHold;
+      data[variable] = onHold;
     }
 
     if (pressed && !wasPressed && !Float.isNaN(onPressed)) {
-      toSend[variable] = onPressed;
+      data[variable] = onPressed;
     }
 
     if (!pressed && wasPressed && !Float.isNaN(onReleased)) {
-      toSend[variable] = onReleased;
+      data[variable] = onReleased;
     }
 
     if (!pressed && !wasPressed && !Float.isNaN(onOff)) {
-      toSend[variable] = onOff;
+      data[variable] = onOff;
     }
     wasPressed = pressed;