Browse Source

rearanged Project to add JoystickSteuerung and outcomment the fahrsteuerung due to missing methodes in libaries

master
Lukas Reichwein 5 years ago
parent
commit
9e9bd27360
  1. 42
      Code/Joystick/Joystick.ino
  2. 45
      Code/Joystick/JoystickSteuerung.ino
  3. 59
      Code/miniRobotRC/JoystickSteuerung.ino
  4. 14
      Code/miniRobotRC/_main.ino
  5. 4
      Code/miniRobotRC/fahrsteuerung_old.ino

42
Code/Joystick/Joystick.ino

@ -1,42 +0,0 @@
#include <Steuerung.h>
//Informationen Joystick
Joystick *joystick;
const uint16_t xAxisPin = 5;
const uint16_t yAxisPin = 4;
const int16_t lowestJoystickValue = 0;
const int16_t highestJoystickValue = 511;
const int16_t spaceing = 50;
//Informationen linker Motor
Motor *left;
const int16_t lowestPWMValueLeftMotor = -255;
const int16_t highestPWMValueLeftMotor = 255;
//Informationen rechter Motor
Motor *right;
const int16_t lowestPWMValueRightMotor = -255;
const int16_t highestPWMValueRightMotor = 255;
Steuerung *steuerung;
void setup() {
joystick = new Joystick(xAxisPin, yAxisPin, lowestJoystickValue, highestJoystickValue, spaceing);
left = new Motor(lowestPWMValueLeftMotor, highestPWMValueLeftMotor);
right = new Motor(lowestPWMValueRightMotor, highestPWMValueRightMotor);
steuerung = new Steuerung(joystick, left, right);
Serial.begin(9600);
}
void loop() {
steuerung -> updateValues();
//DEBUG
Serial.print("Left motor PWMValue: ");
Serial.println(left -> PWMValue);
Serial.print("Right motor PWMValue: ");
Serial.println(right -> PWMValue);
//SendValues
delay(500);
}

45
Code/Joystick/JoystickSteuerung.ino

@ -0,0 +1,45 @@
#include <Steuerung.h>
//Informationen Joystick
Joystick *joystick;
const uint16_t xAxisPin = 5;
const uint16_t yAxisPin = 4;
const int16_t lowestJoystickValue = 0;
const int16_t highestJoystickValue = 511;
const int16_t spaceing = 50;
//Informationen linker Motor
Motor *left;
const int16_t lowestPWMValueLeftMotor = -255;
const int16_t highestPWMValueLeftMotor = 255;
//Informationen rechter Motor
Motor *right;
const int16_t lowestPWMValueRightMotor = -255;
const int16_t highestPWMValueRightMotor = 255;
Steuerung *steuerung;
void joystickInit() {
joystick = new Joystick(xAxisPin, yAxisPin, lowestJoystickValue, highestJoystickValue, spaceing);
left = new Motor(lowestPWMValueLeftMotor, highestPWMValueLeftMotor);
right = new Motor(lowestPWMValueRightMotor, highestPWMValueRightMotor);
steuerung = new Steuerung(joystick, left, right);
//Serial.begin(9600);
}
void joystickSteuerung() {
//Only updates if joystick is moved
steuerung -> updateValues();
//DEBUG
Serial.print("Left motor PWMValue: ");
Serial.println(left -> PWMValue);
Serial.print("Right motor PWMValue: ");
Serial.println(right -> PWMValue);
//SendValues
send();
}

59
Code/miniRobotRC/JoystickSteuerung.ino

@ -0,0 +1,59 @@
#include <Steuerung.h>
//Informationen Joystick
Joystick *joystick;
const uint16_t xAxisPin = 5;
const uint16_t yAxisPin = 4;
const int16_t lowestJoystickValue = 0;
const int16_t highestJoystickValue = 511;
const int16_t spaceing = 50;
//Informationen linker Motor
Motor *left;
const int16_t lowestPWMValueLeftMotor = -255;
const int16_t highestPWMValueLeftMotor = 255;
//Informationen rechter Motor
Motor *right;
const int16_t lowestPWMValueRightMotor = -255;
const int16_t highestPWMValueRightMotor = 255;
Steuerung *steuerung;
void joystickInit() {
joystick = new Joystick(xAxisPin, yAxisPin, lowestJoystickValue, highestJoystickValue, spaceing);
left = new Motor(lowestPWMValueLeftMotor, highestPWMValueLeftMotor);
right = new Motor(lowestPWMValueRightMotor, highestPWMValueRightMotor);
steuerung = new Steuerung(joystick, left, right);
//Serial.begin(9600);
}
void joystickSteuerung() {
//Only updates if joystick is moved
steuerung -> updateValues();
//DEBUG
Serial.print("Left motor PWMValue: ");
Serial.println(left -> PWMValue);
Serial.print("Right motor PWMValue: ");
Serial.println(right -> PWMValue);
//SendValues
send();
}
void send(){
commands[0] = speedA;
commands[1] = highByte(left -> PWMValue);
commands[2] = lowByte(left -> PWMValue);
commands[3] = speedB;
commands[4] = highByte(right -> PWMValue);
commands[5] = lowByte(right -> PWMValue);
commands[6] = timeToDrive;
commands[7] = highByte(driveTimeout);
commands[8] = lowByte(driveTimeout);
commands[9] = goDrive;
radio.write(&commands, sizeof(commands));
}

14
Code/miniRobotRC/_main.ino

@ -13,17 +13,23 @@ void setup() {
funkInit();
Serial.begin(115200);
driveTimeout = 10;
joystickInit(); //TODO
clearCommands();
}
void loop() {
//lcdMenu();
while(!tasten.getButtonCycle(buttonStart)) {
/*while(!tasten.getButtonCycle(buttonStart)) {
manualDigitalDrive();
}
} */
tasten.clearButton(buttonStart);
while(!tasten.getButtonCycle(buttonStart)){
motorMapping();
}
tasten.clearButton(buttonStart);
while(!tasten.getButtonCycle(buttonStart)) motorMapping();
while(!tasten.getButtonCycle(buttonStart)){
joystickSteuerung(); //TODO ()
}
tasten.clearButton(buttonStart);
}

4
Code/miniRobotRC/fahrsteuerung.ino → Code/miniRobotRC/fahrsteuerung_old.ino

@ -1,4 +1,4 @@
void manualDigitalDrive() {
/*void manualDigitalDrive() {
bool goOn = false;
// while(!tasten.getButtonCycle(buttonL1)) {
clearCommands();
@ -50,4 +50,4 @@ void manualDigitalDrive() {
}
// }
// tasten.clearAllButtons();
}
}*/
Loading…
Cancel
Save