aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2025-07-29 12:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ESP32 Arduino Core to v3.0.3

Browse Source
This commit is contained in:
Oleg Kalachev 2024-07-25 02:45:59 +03:00
parent 627233f862
commit e993dde355
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ monitor:
dependencies .dependencies: dependencies .dependencies:
arduino-cli core update-index --config-file arduino-cli.yaml arduino-cli core update-index --config-file arduino-cli.yaml
arduino-cli core install esp32:esp32@2.0.11 --config-file arduino-cli.yaml arduino-cli core install esp32:esp32@3.0.3 --config-file arduino-cli.yaml
arduino-cli lib update-index arduino-cli lib update-index
arduino-cli lib install "FlixPeriph" arduino-cli lib install "FlixPeriph"
arduino-cli lib install "MAVLink"@2.0.1 arduino-cli lib install "MAVLink"@2.0.1

24
flix/motors.ino
View File

@ -20,17 +20,11 @@
void setupMotors() { void setupMotors() {
Serial.println("Setup Motors"); Serial.println("Setup Motors");
// configure PWM channels // configure pins
ledcSetup(0, PWM_FREQUENCY, PWM_RESOLUTION); ledcAttach(MOTOR_0_PIN, PWM_FREQUENCY, PWM_RESOLUTION);
ledcSetup(1, PWM_FREQUENCY, PWM_RESOLUTION); ledcAttach(MOTOR_1_PIN, PWM_FREQUENCY, PWM_RESOLUTION);
ledcSetup(2, PWM_FREQUENCY, PWM_RESOLUTION); ledcAttach(MOTOR_2_PIN, PWM_FREQUENCY, PWM_RESOLUTION);
ledcSetup(3, PWM_FREQUENCY, PWM_RESOLUTION); ledcAttach(MOTOR_3_PIN, PWM_FREQUENCY, PWM_RESOLUTION);
// attach channels to motor pins
ledcAttachPin(MOTOR_0_PIN, 0);
ledcAttachPin(MOTOR_1_PIN, 1);
ledcAttachPin(MOTOR_2_PIN, 2);
ledcAttachPin(MOTOR_3_PIN, 3);
sendMotors(); sendMotors();
Serial.println("Motors initialized"); Serial.println("Motors initialized");
@ -51,10 +45,10 @@ uint8_t pwmToDutyCycle(uint16_t pwm) {
} }
void sendMotors() { void sendMotors() {
ledcWrite(0, pwmToDutyCycle(getPWM(motors[0], 0))); ledcWrite(MOTOR_0_PIN, pwmToDutyCycle(getPWM(motors[0], 0)));
ledcWrite(1, pwmToDutyCycle(getPWM(motors[1], 1))); ledcWrite(MOTOR_1_PIN, pwmToDutyCycle(getPWM(motors[1], 1)));
ledcWrite(2, pwmToDutyCycle(getPWM(motors[2], 2))); ledcWrite(MOTOR_2_PIN, pwmToDutyCycle(getPWM(motors[2], 2)));
ledcWrite(3, pwmToDutyCycle(getPWM(motors[3], 3))); ledcWrite(MOTOR_3_PIN, pwmToDutyCycle(getPWM(motors[3], 3)));
} }
void fullMotorTest(int n, bool reverse) { void fullMotorTest(int n, bool reverse) {

2
flix/rc.ino
View File

@ -9,7 +9,7 @@
int channelNeutral[] = {995, 883, 200, 972, 512, 512}; int channelNeutral[] = {995, 883, 200, 972, 512, 512};
int channelMax[] = {1651, 1540, 1713, 1630, 1472, 1472}; int channelMax[] = {1651, 1540, 1713, 1630, 1472, 1472};
SBUS RC(Serial2); SBUS RC(Serial2, 16, 17); // NOTE: remove pin numbers (16, 17) if you use the new default pins for Serial2 (4, 25)
void setupRC() { void setupRC() {
Serial.println("Setup RC"); Serial.println("Setup RC");

1
gazebo/SBUS.h
View File

@ -12,6 +12,7 @@ struct SBUSData {
class SBUS { class SBUS {
public: public:
SBUS(HardwareSerial& bus, const bool inv = true) {}; SBUS(HardwareSerial& bus, const bool inv = true) {};
SBUS(HardwareSerial& bus, const int8_t rxpin, const int8_t txpin, const bool inv = true) {};
void begin() {}; void begin() {};
bool read() { return joystickGet(); }; bool read() { return joystickGet(); };
SBUSData data() { SBUSData data() {