Final working code

kajgrant · Nov 23, 2023 · c76d836 · c76d836
1 parent 451efc0
commit c76d836
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 21 deletions.
diff --git a/src/reciever/reciever.ino b/src/reciever/reciever.ino
@@ -44,7 +44,20 @@ void loop() {
  pwmOutputY = potVals[1];
 
  myservo.write(pwmOutputX);
- accel(currentSpeed, pwmOutputY);
+
+ if(abs(currentSpeed - pwmOutputY) > 30) {
+ ESC.write(90);
+ currentSpeed = 90;
+ delay(100);
+ //ESC.write(pwmOutputY);
+ accel(currentSpeed, pwmOutputY);
+ }
+ else {
+ //ESC.write(pwmOutputY);
+ accel(currentSpeed, pwmOutputY);
+ }
+ delay(50);
+ //accel(currentSpeed, pwmOutputY);
 
  } else {
  pwmOutputY = 90;
@@ -53,7 +66,8 @@ void loop() {
  myservo.write(pwmOutputX);
  }
  currentSpeed = pwmOutputY;
- Serial.print("x:");
+
+ Serial.print("x:");
  Serial.print(pwmOutputX);
  Serial.print(" y:");
  Serial.println(pwmOutputY);
@@ -66,6 +80,6 @@ void accel(int speed, int newSpeed) {
  speed -= 5;
  }
  ESC.write(speed);
- delay(100);
+ delay(10);
 
 }
diff --git a/src/sender/sender.ino b/src/sender/sender.ino
@@ -29,29 +29,14 @@ int buffer[2];
 
 void setup() {
  Serial.begin(19200);
+
  radio.begin();
  radio.openWritingPipe(address);
  radio.setPALevel(RF24_PA_MIN);
  radio.stopListening();
 
- //setup led pins 1 and 2
- pinMode(RED_PIN1, OUTPUT);
- pinMode(GREEN_PIN1, OUTPUT);
- pinMode(BLUE_PIN1, OUTPUT);
-
- pinMode(RED_PIN2, OUTPUT);
- pinMode(GREEN_PIN2, OUTPUT);
- pinMode(BLUE_PIN2, OUTPUT);
-
- //set leds to off
- digitalWrite(RED_PIN1, LOW);
- digitalWrite(GREEN_PIN1, LOW);
- digitalWrite(BLUE_PIN1, LOW);
-
- digitalWrite(RED_PIN2, LOW);
- digitalWrite(GREEN_PIN2, LOW);
- digitalWrite(BLUE_PIN2, LOW);
-
+ init_LED(RED_PIN1, BLUE_PIN1, GREEN_PIN1);
+ init_LED(RED_PIN2, BLUE_PIN2, GREEN_PIN2);
 }
 
 void loop() {
@@ -118,4 +103,15 @@ void loop() {
  // Serial.print(pwmOutputX);
  // Serial.print(" y:");
  // Serial.println(pwmOutputY); 
+}
+
+void init_LED(int red, int blue, int green) {
+ //setup led pins 1 and 2
+ pinMode(red, OUTPUT);
+ pinMode(green, OUTPUT);
+ pinMode(blue, OUTPUT);
+
+ digitalWrite(red, LOW);
+ digitalWrite(green, LOW);
+ digitalWrite(blue, LOW);
 }