diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Back Suspension.stl b/RC Transmitter&Receiver/3D Models/RC Car/Back Suspension.stl new file mode 100644 index 0000000..076fcd1 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Back Suspension.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Back Top Cover.stl b/RC Transmitter&Receiver/3D Models/RC Car/Back Top Cover.stl new file mode 100644 index 0000000..3320bfd Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Back Top Cover.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Axel x2.stl b/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Axel x2.stl new file mode 100644 index 0000000..020abf9 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Axel x2.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Hub x2.stl b/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Hub x2.stl new file mode 100644 index 0000000..9ea90b5 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Back Whel Hub x2.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Front Suspension x2.stl b/RC Transmitter&Receiver/3D Models/RC Car/Front Suspension x2.stl new file mode 100644 index 0000000..83a5418 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Front Suspension x2.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Front Top Cover.stl b/RC Transmitter&Receiver/3D Models/RC Car/Front Top Cover.stl new file mode 100644 index 0000000..38df88e Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Front Top Cover.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Axel.stl b/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Axel.stl new file mode 100644 index 0000000..0c2fd48 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Axel.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Hub x2.stl b/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Hub x2.stl new file mode 100644 index 0000000..d642326 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Front Whel Hub x2.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Main Body.stl b/RC Transmitter&Receiver/3D Models/RC Car/Main Body.stl new file mode 100644 index 0000000..f8830ee Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Main Body.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Middle Cover.stl b/RC Transmitter&Receiver/3D Models/RC Car/Middle Cover.stl new file mode 100644 index 0000000..38d32b1 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Middle Cover.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Motor Top Cover x2.stl b/RC Transmitter&Receiver/3D Models/RC Car/Motor Top Cover x2.stl new file mode 100644 index 0000000..2f524cb Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Motor Top Cover x2.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Steering Arms.stl b/RC Transmitter&Receiver/3D Models/RC Car/Steering Arms.stl new file mode 100644 index 0000000..faf9ef4 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Steering Arms.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Steering Hubs.stl b/RC Transmitter&Receiver/3D Models/RC Car/Steering Hubs.stl new file mode 100644 index 0000000..f5547a2 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Steering Hubs.stl differ diff --git a/RC Transmitter&Receiver/3D Models/RC Car/Suspension Arm x8.stl b/RC Transmitter&Receiver/3D Models/RC Car/Suspension Arm x8.stl new file mode 100644 index 0000000..56d46b9 Binary files /dev/null and b/RC Transmitter&Receiver/3D Models/RC Car/Suspension Arm x8.stl differ diff --git a/RC Transmitter&Receiver/3D Models For Transmitter/Bottom Cover 2.stl b/RC Transmitter&Receiver/3D Models/RC Transmitter/Bottom Cover 2.stl similarity index 100% rename from RC Transmitter&Receiver/3D Models For Transmitter/Bottom Cover 2.stl rename to RC Transmitter&Receiver/3D Models/RC Transmitter/Bottom Cover 2.stl diff --git a/RC Transmitter&Receiver/3D Models For Transmitter/Bottom Cover.stl b/RC Transmitter&Receiver/3D Models/RC Transmitter/Bottom Cover.stl similarity index 100% rename from RC Transmitter&Receiver/3D Models For Transmitter/Bottom Cover.stl rename to RC Transmitter&Receiver/3D Models/RC Transmitter/Bottom Cover.stl diff --git a/RC Transmitter&Receiver/3D Models For Transmitter/Handles.stl b/RC Transmitter&Receiver/3D Models/RC Transmitter/Handles.stl similarity index 100% rename from RC Transmitter&Receiver/3D Models For Transmitter/Handles.stl rename to RC Transmitter&Receiver/3D Models/RC Transmitter/Handles.stl diff --git a/RC Transmitter&Receiver/3D Models For Transmitter/Joystick.stl b/RC Transmitter&Receiver/3D Models/RC Transmitter/Joystick.stl similarity index 100% rename from RC Transmitter&Receiver/3D Models For Transmitter/Joystick.stl rename to RC Transmitter&Receiver/3D Models/RC Transmitter/Joystick.stl diff --git a/RC Transmitter&Receiver/3D Models For Transmitter/Main Body.stl b/RC Transmitter&Receiver/3D Models/RC Transmitter/Main Body.stl similarity index 100% rename from RC Transmitter&Receiver/3D Models For Transmitter/Main Body.stl rename to RC Transmitter&Receiver/3D Models/RC Transmitter/Main Body.stl diff --git a/RC Transmitter&Receiver/RC Receiver Schematic.png b/RC Transmitter&Receiver/Circuit Diagram/RC Receiver Schematic.png similarity index 100% rename from RC Transmitter&Receiver/RC Receiver Schematic.png rename to RC Transmitter&Receiver/Circuit Diagram/RC Receiver Schematic.png diff --git a/RC Transmitter&Receiver/RC Transmiter Circuit.png b/RC Transmitter&Receiver/Circuit Diagram/RC Transmiter Circuit.png similarity index 100% rename from RC Transmitter&Receiver/RC Transmiter Circuit.png rename to RC Transmitter&Receiver/Circuit Diagram/RC Transmiter Circuit.png diff --git a/RC Transmitter&Receiver/RC Transmiter Schematic.png b/RC Transmitter&Receiver/Circuit Diagram/RC Transmiter Schematic.png similarity index 100% rename from RC Transmitter&Receiver/RC Transmiter Schematic.png rename to RC Transmitter&Receiver/Circuit Diagram/RC Transmiter Schematic.png diff --git a/RC Transmitter&Receiver/RC Receiver Arduino Car/RC Receiver Arduino Car.ino b/RC Transmitter&Receiver/Code/RC Receiver Arduino Car/RC Receiver Arduino Car.ino similarity index 64% rename from RC Transmitter&Receiver/RC Receiver Arduino Car/RC Receiver Arduino Car.ino rename to RC Transmitter&Receiver/Code/RC Receiver Arduino Car/RC Receiver Arduino Car.ino index 875454a..d97c1a4 100644 --- a/RC Transmitter&Receiver/RC Receiver Arduino Car/RC Receiver Arduino Car.ino +++ b/RC Transmitter&Receiver/Code/RC Receiver Arduino Car/RC Receiver Arduino Car.ino @@ -20,7 +20,7 @@ struct MyData { MyData data; unsigned long lastRecvTime = 0; -RF24 radio(8, 7); +RF24 radio(7, 8); const uint64_t pipeIn = 0xE8E8F0F0E1LL; #define servo_pin 3 @@ -28,6 +28,10 @@ const uint64_t pipeIn = 0xE8E8F0F0E1LL; #define motor_forward_pin 5 #define motor_backward_pin 6 +#define horn 2 +#define front_led 10 +#define back_led 9 + Servo servo; void setup() { @@ -35,6 +39,10 @@ void setup() { servo.attach(servo_pin); + pinMode(horn, OUTPUT); + pinMode(front_led, OUTPUT); + pinMode(back_led, OUTPUT); + pinMode(motor_forward_pin, OUTPUT); pinMode(motor_backward_pin, OUTPUT); @@ -53,32 +61,48 @@ void loop() { while (radio.available()) { radio.read(&data, sizeof(MyData)); + /*Serial.print(data.j1PotX); + Serial.print(", "); + Serial.print(data.j1PotY); + Serial.print(", "); + Serial.print(data.j2PotX); + Serial.print(", "); + Serial.print(data.j2PotY); + Serial.print(", "); + Serial.print(data.pot1); + Serial.print(", "); + Serial.print(data.pot2); + Serial.print(", "); + Serial.print(data.tSwitch1); + Serial.print(", "); + Serial.print(data.tSwitch2); + Serial.print(", "); + Serial.print(data.button1); + Serial.print(", "); + Serial.println(data.button2);*/ + //int angle = min(130, max(45, data.j2PotX - 35)); - int angle = min(130, max(45, (87 + (data.j2PotX - 127)/2))); + int angle = min(130, max(45, (87 + (data.j2PotX - 127) / 2))); servo.write(angle); - - /*Serial.print("throttle : "); - Serial.print(data.throttle); - Serial.print(", pot1 : "); - Serial.println(data.pot1); - Serial.print(", angle : "); - Serial.println(angle);*/ if (data.j1PotY < 100) { digitalWrite(motor_forward_pin, LOW); //digitalWrite(motor_backward_pin, HIGH); - //analogWrite(motor_forward_pin, 0); analogWrite(motor_backward_pin, map(data.j1PotY, 100, 0, 180, 255)); } else if (data.j1PotY > 150) { //digitalWrite(motor_forward_pin, HIGH); digitalWrite(motor_backward_pin, LOW); analogWrite(motor_forward_pin, map(data.j1PotY, 150, 255, 180, 255)); - //analogWrite(motor_backward_pin, 0); } else { digitalWrite(motor_forward_pin, LOW); digitalWrite(motor_backward_pin, LOW); } + digitalWrite(horn, data.button2 == 0 ? HIGH : LOW); + + digitalWrite(front_led, data.tSwitch1 == 1 ? HIGH : LOW); + digitalWrite(back_led, data.tSwitch1 == 1 ? HIGH : LOW); + lastRecvTime = millis(); } @@ -89,6 +113,9 @@ void loop() { digitalWrite(motor_forward_pin, LOW); digitalWrite(motor_backward_pin, LOW); + digitalWrite(horn, LOW); + digitalWrite(front_led, LOW); + digitalWrite(back_led, LOW); } } diff --git a/RC Transmitter&Receiver/RC Receiver Robot Arm/RC Receiver Robot Arm.ino b/RC Transmitter&Receiver/Code/RC Receiver Robot Arm/RC Receiver Robot Arm.ino similarity index 100% rename from RC Transmitter&Receiver/RC Receiver Robot Arm/RC Receiver Robot Arm.ino rename to RC Transmitter&Receiver/Code/RC Receiver Robot Arm/RC Receiver Robot Arm.ino diff --git a/RC Transmitter&Receiver/RC Receiver Test/RC Receiver Test.ino b/RC Transmitter&Receiver/Code/RC Receiver Test/RC Receiver Test.ino similarity index 100% rename from RC Transmitter&Receiver/RC Receiver Test/RC Receiver Test.ino rename to RC Transmitter&Receiver/Code/RC Receiver Test/RC Receiver Test.ino diff --git a/RC Transmitter&Receiver/RC Transmitter/RC Transmitter.ino b/RC Transmitter&Receiver/Code/RC Transmitter/RC Transmitter.ino similarity index 100% rename from RC Transmitter&Receiver/RC Transmitter/RC Transmitter.ino rename to RC Transmitter&Receiver/Code/RC Transmitter/RC Transmitter.ino