Cleaned up project folder, updated Arduino sketch for new UDP API.

ericbarch · Sep 30, 2012 · 78ee50c · 78ee50c
1 parent 9e5e6c0
commit 78ee50c
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 3 deletions.
diff --git a/ArduinoRobotControl/ArduinoRobotControl.pde → ArduinoRobotControl/ArduinoRobotControl.ino b/ArduinoRobotControl/ArduinoRobotControl.pde → ArduinoRobotControl/ArduinoRobotControl.ino
@@ -4,7 +4,7 @@
 ************************************/
 #include <SPI.h>
 #include <Ethernet.h>
-#include <Udp.h>
+#include <EthernetUdp.h>
 #include <Servo.h>
 
 //Set the MAC address, static IP, gateway, and subnet of the network
@@ -13,13 +13,18 @@ byte ip[]  = { 192, 168, 1, 22 };
 
 //UDP Stuff
 const int PORT = 4444;            //Port of incoming UDP data
+
 const int PACKET_SIZE = 8;        //Size of the joystick data packet
 byte joystick_data[PACKET_SIZE];  //Byte array for incoming data - [0] = leftY, [1] = leftX, [2] = rightY, [3] = rightX
 
 //Robot specific stuff
 boolean lastState = false;           //Keeps track of when we go between enabled/disabled or vice versa   
 unsigned long lastUpdate = 0;        //Keeps track of the last time (ms) we received data
 
+// An EthernetUDP instance to let us send and receive packets over UDP
+EthernetUDP Udp;
+
+
 //Define robot outputs
 int pwm01 = 5;  //Digital Pin 5
 int pwm02 = 6;  //Digital Pin 6
@@ -53,8 +58,10 @@ void loop() {
 /* This function's sole purpose is to receive data and shove it into the joystick_data byte array */
 void xferdata()
 {
-  if (Udp.available()) {
-    Udp.readPacket(joystick_data,PACKET_SIZE);
+  int packetSize = Udp.parsePacket();
+  if(packetSize)
+  {
+    Udp.read(joystick_data, PACKET_SIZE);
     lastUpdate = millis();
   }
 }

diff --git a/...inoDriverStation/ArduinoDriverStation.pde → ...inoDriverStation/ArduinoDriverStation.pde b/...inoDriverStation/ArduinoDriverStation.pde → ...inoDriverStation/ArduinoDriverStation.pde
diff --git a/ArduinoDriverStation/PS2X_lib.zip → old_stuff/ArduinoDriverStation/PS2X_lib.zip b/ArduinoDriverStation/PS2X_lib.zip → old_stuff/ArduinoDriverStation/PS2X_lib.zip
diff --git a/Old/Java/RobotControlClient/build.xml → old_stuff/Java/RobotControlClient/build.xml b/Old/Java/RobotControlClient/build.xml → old_stuff/Java/RobotControlClient/build.xml
diff --git a/Old/Java/RobotControlClient/jinput-dx8.dll → ...ff/Java/RobotControlClient/jinput-dx8.dll b/Old/Java/RobotControlClient/jinput-dx8.dll → ...ff/Java/RobotControlClient/jinput-dx8.dll
diff --git a/...Java/RobotControlClient/jinput-dx8_64.dll → ...Java/RobotControlClient/jinput-dx8_64.dll b/...Java/RobotControlClient/jinput-dx8_64.dll → ...Java/RobotControlClient/jinput-dx8_64.dll
diff --git a/Old/Java/RobotControlClient/jinput-raw.dll → ...ff/Java/RobotControlClient/jinput-raw.dll b/Old/Java/RobotControlClient/jinput-raw.dll → ...ff/Java/RobotControlClient/jinput-raw.dll
diff --git a/...Java/RobotControlClient/jinput-raw_64.dll → ...Java/RobotControlClient/jinput-raw_64.dll b/...Java/RobotControlClient/jinput-raw_64.dll → ...Java/RobotControlClient/jinput-raw_64.dll
diff --git a/...Java/RobotControlClient/jinput-wintab.dll → ...Java/RobotControlClient/jinput-wintab.dll b/...Java/RobotControlClient/jinput-wintab.dll → ...Java/RobotControlClient/jinput-wintab.dll
diff --git a/Old/Java/RobotControlClient/jinput.jar → old_stuff/Java/RobotControlClient/jinput.jar b/Old/Java/RobotControlClient/jinput.jar → old_stuff/Java/RobotControlClient/jinput.jar
diff --git a/Old/Java/RobotControlClient/jutils.jar → old_stuff/Java/RobotControlClient/jutils.jar b/Old/Java/RobotControlClient/jutils.jar → old_stuff/Java/RobotControlClient/jutils.jar
diff --git a/...ava/RobotControlClient/libjinput-linux.so → ...ava/RobotControlClient/libjinput-linux.so b/...ava/RobotControlClient/libjinput-linux.so → ...ava/RobotControlClient/libjinput-linux.so
diff --git a/...a/RobotControlClient/libjinput-linux64.so → ...a/RobotControlClient/libjinput-linux64.so b/...a/RobotControlClient/libjinput-linux64.so → ...a/RobotControlClient/libjinput-linux64.so
diff --git a/...a/RobotControlClient/libjinput-osx.jnilib → ...a/RobotControlClient/libjinput-osx.jnilib b/...a/RobotControlClient/libjinput-osx.jnilib → ...a/RobotControlClient/libjinput-osx.jnilib
diff --git a/Old/Java/RobotControlClient/manifest.mf → ...stuff/Java/RobotControlClient/manifest.mf b/Old/Java/RobotControlClient/manifest.mf → ...stuff/Java/RobotControlClient/manifest.mf
diff --git a/...botControlClient/nbproject/build-impl.xml → ...botControlClient/nbproject/build-impl.xml b/...botControlClient/nbproject/build-impl.xml → ...botControlClient/nbproject/build-impl.xml
diff --git a/...ntrolClient/nbproject/genfiles.properties → ...ntrolClient/nbproject/genfiles.properties b/...ntrolClient/nbproject/genfiles.properties → ...ntrolClient/nbproject/genfiles.properties
diff --git a/...lient/nbproject/private/config.properties → ...lient/nbproject/private/config.properties b/...lient/nbproject/private/config.properties → ...lient/nbproject/private/config.properties
diff --git a/...ient/nbproject/private/private.properties → ...ient/nbproject/private/private.properties b/...ient/nbproject/private/private.properties → ...ient/nbproject/private/private.properties
diff --git a/...ntrolClient/nbproject/private/private.xml → ...ntrolClient/nbproject/private/private.xml b/...ntrolClient/nbproject/private/private.xml → ...ntrolClient/nbproject/private/private.xml
diff --git a/...ontrolClient/nbproject/project.properties → ...ontrolClient/nbproject/project.properties b/...ontrolClient/nbproject/project.properties → ...ontrolClient/nbproject/project.properties
diff --git a/.../RobotControlClient/nbproject/project.xml → .../RobotControlClient/nbproject/project.xml b/.../RobotControlClient/nbproject/project.xml → .../RobotControlClient/nbproject/project.xml
diff --git a/...tControlClient/src/robotcontrol/Main.java → ...tControlClient/src/robotcontrol/Main.java b/...tControlClient/src/robotcontrol/Main.java → ...tControlClient/src/robotcontrol/Main.java
diff --git a/...va/RobotControlServer/robotcontrolv02.pde → ...va/RobotControlServer/robotcontrolv02.pde b/...va/RobotControlServer/robotcontrolv02.pde → ...va/RobotControlServer/robotcontrolv02.pde
diff --git a/NetduinoRobotControl/NetduinoRobot.zip → ...ff/NetduinoRobotControl/NetduinoRobot.zip b/NetduinoRobotControl/NetduinoRobot.zip → ...ff/NetduinoRobotControl/NetduinoRobot.zip
diff --git a/Old/Perl/perl-arduino.txt → old_stuff/Perl/perl-arduino.txt b/Old/Perl/perl-arduino.txt → old_stuff/Perl/perl-arduino.txt
diff --git a/Old/Perl/sc.pl → old_stuff/Perl/sc.pl b/Old/Perl/sc.pl → old_stuff/Perl/sc.pl
diff --git a/Old/Python/oldRev/robotcontrolv02.pde → old_stuff/Python/oldRev/robotcontrolv02.pde b/Old/Python/oldRev/robotcontrolv02.pde → old_stuff/Python/oldRev/robotcontrolv02.pde
diff --git a/Old/Python/robot_control.py → old_stuff/Python/robot_control.py b/Old/Python/robot_control.py → old_stuff/Python/robot_control.py
diff --git a/RobotControlSystem.pdf → old_stuff/RobotControlSystem.pdf b/RobotControlSystem.pdf → old_stuff/RobotControlSystem.pdf