Lino/RoboterArm
1
0
Fork 0
mirror of https://github.com/LinoSchmidt/RoboterArm.git synced 2026-03-21 02:31:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added autoplayon because its not ready yet

Browse Source
This commit is contained in:
Lino Schmidt
2022-06-09 08:10:57 +02:00
parent 0928b7f728
commit 9b233d618d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware 2.0/src/config.h
View File

@@ -1,3 +1,5 @@
#define AutoplayOn true
//Servos //Servos
#define DrehungPin 9 #define DrehungPin 9
#define ArmPin 10 #define ArmPin 10
@@ -46,11 +48,10 @@
#define joystick_button_Pin 8 #define joystick_button_Pin 8
#define joystick_Empfindlichkeit 4 #define joystick_Empfindlichkeit 10
//Timing //Timing
#define LoopTime 50 #define LoopTime 50
#define TimeToCal 500
#define AutoplayEaseSpeed 50 #define AutoplayEaseSpeed 50
#define TimeToDetach 70 #define TimeToDetach 70
#define Calibration_TimeToMiddle 3000 #define Calibration_TimeToMiddle 3000

22
Firmware 2.0/src/main.cpp
View File

@@ -18,7 +18,7 @@ int autoplayLoop = 0;
bool autoplayStart = true; bool autoplayStart = true;
bool inAutoplay = false; bool inAutoplay = false;
int buzzTime = 0; int buzzTime = 0;
bool cal = true; bool wait = false;
int autoplayPosDrehung[] = {}; int autoplayPosDrehung[] = {};
int autoplayPosArm[] = {}; int autoplayPosArm[] = {};
@@ -269,16 +269,16 @@ void joystickButtonPress() {
if(Code[0] == 0 && Code[1] == 1 && Code[2] == 0 && Code[3] == 1 && CodeLenght == 4) { if(Code[0] == 0 && Code[1] == 1 && Code[2] == 0 && Code[3] == 1 && CodeLenght == 4) {
Serial.println("Calibrate..."); Serial.println("Calibrate...");
calibrateMaxMin(); calibrateMaxMin();
} else if(Code[0] == 0 && CodeLenght == 1) { } else if(Code[0] == 0 && CodeLenght == 1 && AutoplayOn == true) {
Serial.println("Save position..."); Serial.println("Save position...");
savePos(); savePos();
} else if(Code[0] == 1 && CodeLenght == 1) { } else if(Code[0] == 1 && CodeLenght == 1 && AutoplayOn == true) {
Serial.println("Start Autoplay..."); Serial.println("Start Autoplay...");
autoplayStart = true; autoplayStart = true;
autoplayLoop = 0; autoplayLoop = 0;
inAutoplay = true; inAutoplay = true;
attached(true); attached(true);
} else if(Code[0] == 0 && Code[1] == 0 && CodeLenght == 2) { } else if(Code[0] == 0 && Code[1] == 0 && CodeLenght == 2 && AutoplayOn == true) {
Serial.println("Clear positions..."); Serial.println("Clear positions...");
clearPos(); clearPos();
} }
@@ -346,20 +346,18 @@ void loop(){
if(inAutoplay == true) { if(inAutoplay == true) {
Autoplay(); Autoplay();
} else { } else {
if (TimeToCal > offtime) offtime++; if (TimeToDetach > offtime) offtime++;
else if(wait == false) {
if(offtime >= TimeToCal && cal == true) {
calibrateMiddle();
cal = false;
} else if(offtime == TimeToDetach){
attached(false); attached(false);
calibrateMiddle();
wait = true;
} }
} }
} }
else{ else{
offtime = 0; offtime = 0;
autoplayStop(); autoplayStop();
cal = true; wait = false;
if(joystick_LX != 0){ if(joystick_LX != 0){
if(InvertHand)HandPos -= joystick_LX; if(InvertHand)HandPos -= joystick_LX;
@@ -415,7 +413,7 @@ void loop(){
joystickButtonPress(); joystickButtonPress();
} }
Serial.println(String(offtime) + "," + String(DrehungPos) + "," + String(ArmPos) + "," + String(OberarmPos) + "," + String(HandPos)); Serial.println(String(offtime) + "," + String(DrehungPos) + "," + String(ArmPos) + "," + String(OberarmPos) + "," + String(HandPos) + ":" + String(joystick_RX) + "," + String(joystick_RY) + "," + String(joystick_LY) + "," + String(joystick_LX));
delay(LoopTime); delay(LoopTime);
} }