kemonine/arduino_universal_serial_adapter
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Re-implemented PSP joystick as dedicated class

Browse source
This commit is contained in:
Mike C 2013-04-06 17:01:46 -04:00
parent 59eeabc785
commit c83891d765
3 changed files with 86 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Universal_Serial_Adapter/UIJoystickPSP.cpp
View file

@ -8,3 +8,58 @@
attribute.
*/
#include "Arduino.h"
#include "Project.h"
#include "UIJoystickPSP.h"
UIJoystickPSP::UIJoystickPSP(int xAxisPin, int yAxisPin) {
this->xAxisPin = xAxisPin;
this->yAxisPin = yAxisPin;
upCount = 0;
downCount = 0;
leftCount = 0;
rightCount = 0;
previousDirection = joyNone;
}
joyDirection UIJoystickPSP::direction() {
// Read the x/y values from the joystick
xAxisValue = map(analogRead(xAxisPin), 0, 1023, 0, 10);
yAxisValue = map(analogRead(yAxisPin), 0, 1023, 0, 10);
if (yAxisValue > 6 ) {
upCount++;
if (upCount > 768) {
upCount = 0;
return joyUp;
}
}
if (yAxisValue < 4 ) {
downCount++;
if (downCount > 768) {
downCount = 0;
return joyDown;
}
}
if (xAxisValue > 6) {
leftCount++;
if (leftCount > 768) {
leftCount = 0;
return joyLeft;
}
}
if (xAxisValue < 4) {
rightCount++;
if (rightCount > 768) {
rightCount = 0;
return joyRight;
}
}
return joyNone;
}

62
Universal_Serial_Adapter/UIJoystickPSP.h
View file

@ -8,46 +8,28 @@
attribute.
*/
// PSP joystick tracking
int pspUpCount = 0; // Used to slow down how fast we repeat up movement
int pspDownCount = 0; // Used to slow down how fast we repeat down movement
int pspXAxisValue;
int pspYAxisValue;
#include "Project.h"
// void readPSPValues() {
// // Read the x/y values from the joystick
// pspXAxisValue=map(analogRead(pspXPin), 0, 1023, 0, 10);
// pspYAxisValue=map(analogRead(pspYPin), 0, 1023, 0, 10);
enum joyDirection {
joyUp,
joyDown,
joyLeft,
joyRight,
joyNone=-1
};
// // Move cursor Up
// if (pspYAxisValue > 6 ) {
// pspUpCount++;
// if (pspUpCount > 768) {
// pspUpCount = 0;
// serialmode newMode = (serialmode)(selectedMode - 1);
// if (newMode >= 0) {
// //FIXME: Re-enable once new LCD is online
// //setSelection(newMode);
// }
// }
// }
// else {
// pspUpCount = 0;
// }
class UIJoystickPSP {
private:
int xAxisPin, yAxisPin; // Pins in use
int xAxisValue, yAxisValue; // Values read from pins
int upCount, downCount, leftCount, rightCount; // Counts to slow down repeat
// // Move cursor Down
// if (pspYAxisValue < 4 ) {
// pspDownCount++;
// if (pspDownCount > 768) {
// serialmode newMode = (serialmode)(selectedMode + 1);
// if (newMode <= modelinespeed) {
// //FIXME: Re-enable once new LCD is online
// //setSelection(newMode);
// }
// pspDownCount = 0;
// }
// }
// else {
// pspDownCount = 0;
// }
// }
joyDirection previousDirection;
// int readXAxisValue();
// int readYAxisValue();
public:
UIJoystickPSP(int xAxisPin, int yAxisPin);
joyDirection direction();
};

14
Universal_Serial_Adapter/Universal_Serial_Adapter.ino
View file

@ -9,9 +9,12 @@
*/
#include "Project.h"
#include "UIButton.h"
#include "UIJoystickPSP.h"
UIButton* okButton;
UIButton* cancelButton;
UIJoystickPSP* pspJoystick;
// Defaults
void setDefaults() {
@ -30,14 +33,13 @@ void setup() {
okButton = new UIButton(okButtonPin, okButtonLed);
cancelButton = new UIButton(cancelButtonPin, cancelButtonLed);
pspJoystick = new UIJoystickPSP(pspXPin, pspYPin);
}
void loop() {
if (okButton->isPressed()) {
Serial.println("OK Button Pressed");
}
if (cancelButton->isPressed()) {
Serial.println("Cancel button pressed");
int direction = pspJoystick->direction();
if (direction != joyNone) {
Serial.print("Joystick Direction: ");
Serial.println(direction);
}
}