Merge branch 'main' of https://github.com/AlanWang611/SET2023

AlanWang611 · Apr 23, 2024 · 8706476 · 8706476
2 parents 287aa22 + 824087e
commit 8706476
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 49 deletions.
diff --git a/electrical_code/drive/movement_2motors/movement_2motors.ino b/electrical_code/drive/movement_2motors/movement_2motors.ino
@@ -1,6 +1,6 @@
 // Motor 1 - Left
 int leftMotor1 = 8;
-int leftMotor2 = 7;
+int leftMotor2 = 9;
 
 // Motor 2 - Right
 int rightMotor1 = 6;

diff --git a/electrical_code/lidar/lidar_data/lidar_data.ino b/electrical_code/lidar/lidar_data/lidar_data.ino
@@ -6,8 +6,8 @@ int servo1_pin = 12;
 int servo2_pin = 13;
 // int motor_pin1 = 6;
 // int motor_pin2 = 7;
-int motor_pin3 = 8;
-int motor_pin4 = 9;
+int motor_pin3 = 6;
+int motor_pin4 = 7;
 int pin_input = 2;
 
 const int stepPin = 4;
@@ -25,6 +25,7 @@ const int HEADER = 0x59;
 int TF01_pix;
 int dist, strength;
 int a, b, c, d, e, f, check, i;
+bool moveArmGo = false;
 
 const byte rxPin = 10;
 const byte txPin = 11;
@@ -53,33 +54,39 @@ void setup() {
 }
 
 void loop() {
-  // myservo.write(servoAngle);
-  // digitalWrite(motor_pin1, LOW);
-  // digitalWrite(motor_pin2, HIGH);
-  digitalWrite(motor_pin3, HIGH);
-  digitalWrite(motor_pin4, LOW);
-  delay(5000);
-  // digitalWrite(motor_pin1, LOW);
-  // digitalWrite(motor_pin2, LOW);
-  digitalWrite(motor_pin3, LOW);
-  digitalWrite(motor_pin4, HIGH);
-  delay(5000);
-
-  digitalWrite(motor_pin3, LOW);
-  digitalWrite(motor_pin4, LOW);
-  delay(5000);
-  // // rotate a step
-  // rotate(1);
-
-  // // get distance 
-  // Serial.println("dist : " + String(getDist()));
-
-  // // serial print angle
-  // if (currentAngle >= 360.0) {
-  //   currentAngle = currentAngle - 360.0;
-  // }
-
-  // Serial.println("angle : " + String(currentAngle));
+  myservo.write(servoAngle);
+  if (moveArmGo){
+    Serial.println("Running motor driver");
+    // digitalWrite(motor_pin1, HIGH);
+    // digitalWrite(motor_pin2, LOW);
+    digitalWrite(motor_pin3, LOW);
+    digitalWrite(motor_pin4, HIGH);
+    delay(8000);
+
+    // Use servo for 120 degrees
+    myservo.write(120);
+    delay(1500);
+
+    digitalWrite(motor_pin3, HIGH);
+    digitalWrite(motor_pin4, LOW);
+    delay(8000);
+
+    myservo.write(0);
+
+    moveArmGo = false;
+  }
+  // rotate a step
+  rotate(1);
+
+  // get distance 
+  Serial.println("dist : " + String(getDist()));
+
+  // serial print angle
+  if (currentAngle >= 360.0) {
+    currentAngle = currentAngle - 360.0;
+  }
+
+  Serial.println("angle : " + String(currentAngle));
 }
 
 int getDist(){
@@ -154,23 +161,6 @@ void rotate(float moveSteps) {
 }
 
 void moveArm() {
-    // Run motor driver for 2 seconds
-    // Serial.println("Running motor driver");
-    // digitalWrite(motor_pin1, HIGH);
-    // digitalWrite(motor_pin2, LOW);
-    // digitalWrite(motor_pin3, HIGH);
-    // digitalWrite(motor_pin4, LOW);
-    // delay(3000);
-
-
-    // // Use servo for 120 degrees
-    // Serial.println("Servo angle increased");
-    // servoAngle = servoAngle + 2;
-    // servoAngle = servoAngle % 180;
-
-    // digitalWrite(motor_pin1, LOW);
-    // digitalWrite(motor_pin2, LOW);
-    // digitalWrite(motor_pin3, LOW);
-    // digitalWrite(motor_pin4, LOW);
-
+    if (digitalRead(pin_input) == HIGH)    
+    moveArmGo = true;
 }