don't use channel 1 as it messes with the camera

rjwats · rjwats · commit 188274d5d220 · 2020-12-22T23:57:09.000Z
diff --git a/platformio.ini b/platformio.ini
@@ -36,7 +36,7 @@ lib_deps =
   ArduinoJson@>=6.0.0,<7.0.0
   ESP Async WebServer@>=1.2.0,<2.0.0
   AsyncMqttClient@>=0.8.2,<1.0.0
-  ESP32Servo@>=0.9.0,<1.0.0
+  ServoESP32@>=1.0.3,<2.0.0
 
 [env:esp12e]
 platform = espressif8266
diff --git a/src/RobotStateService.cpp b/src/RobotStateService.cpp
@@ -19,9 +19,9 @@ RobotStateService::RobotStateService(AsyncWebServer* server, SecurityManager* se
 }
 
 void RobotStateService::begin() {
-  camXServo.attach(CAM_X_SERVO_PIN);
-  camYServo.attach(CAM_Y_SERVO_PIN);
-  clawServo.attach(CLAW_SERVO_PIN);
+  camXServo.attach(CAM_X_SERVO_PIN, 2);
+  camYServo.attach(CAM_Y_SERVO_PIN, 3);
+  clawServo.attach(CLAW_SERVO_PIN, 4);
 
   // configure the default state
   _state.camX = DEFAULT_CAM_X;
diff --git a/src/RobotStateService.h b/src/RobotStateService.h
@@ -4,16 +4,16 @@
 #include <HttpEndpoint.h>
 #include <WebSocketTxRx.h>
 #include <Arduino.h>
-#include <ESP32Servo.h>
+#include <Servo.h>
 
 #define LED_PIN 2
 
 #define DEFAULT_CAM_Y 90
-#define DEFAULT_CAM_X 90
+#define DEFAULT_CAM_X 135
 #define DEFAULT_CLAW 90
 
-#define CAM_X_SERVO_PIN 16
-#define CAM_Y_SERVO_PIN 2
+#define CAM_X_SERVO_PIN 2
+#define CAM_Y_SERVO_PIN 16
 #define CLAW_SERVO_PIN 4
 
 #define ROBOT_SETTINGS_ENDPOINT_PATH "/rest/robotState"
