ulysse
/
PAMI_Super_Star_2025
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ulysse:0f647cec10b88656a2a81067c907cdbd52bec420
Branches Tags
ulysse:main
...
compare: ulysse:aae4cf7af7cd23f71a4218aefbee7697f4d01f89
Branches Tags
ulysse:main

3 Commits
0f647cec10 ... aae4cf7af7

Author SHA1 Message Date
Ulysse Cura aae4cf7af7 Clean IO file after merging 2025-01-30 22:04:05 +01:00
Ulysse Cura 1e2a6f4ba7 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#    IO.hpp
 2025-01-30 22:01:55 +01:00
Ulysse Cura f7fe86d877 Asservissement fonctionnel ! 2025-01-30 22:00:16 +01:00
1 changed files with 292 additions and 289 deletions
Show Stats Expand all files Collapse all files

39
IO.hpp
View File

@ -3,10 +3,9 @@
Thibaut Ferrand / Ulysse Cura Thibaut Ferrand / Ulysse Cura
*/ */
#include "esp32-hal.h" #include <Adafruit_SSD1306.h>
#include <CodeCell.h> #include <CodeCell.h>
#include <ESP32Servo.h> #include <ESP32Servo.h>
#include <Adafruit_SSD1306.h>
#include <cmath> #include <cmath>
#define PIN_TIRETTE 5 #define PIN_TIRETTE 5
@ -17,7 +16,7 @@
#define DANCING_ACTION_DELTA_ANGLE 2 #define DANCING_ACTION_DELTA_ANGLE 2
#define GAIN_KD 100 #define GAIN_KD 50
#define ANGULAR_SPEED 10 // °/s #define ANGULAR_SPEED 10 // °/s
using std::abs; using std::abs;
@ -30,23 +29,26 @@ enum class Axes {
class Motor { class Motor {
public: public:
int init(int pin) int init(int pin, int channel)
{ {
m_pin = pin; m_pin = pin;
m_channel = channel;
pinMode(m_pin, OUTPUT); pinMode(m_pin, OUTPUT);
analogWriteFrequency(m_pin, 5000); ledcAttachChannel(m_pin, 5000, 12, m_channel);
analogWriteResolution(m_pin, 12); ledcWriteChannel(m_channel, 0);
//ledcSetup(m_channel, 5000, 12); // Channel, Frequency, Resolution
analogWrite(m_pin, 0); //ledcAttachPin(m_pin, m_channel); // Attach pin to channel
return 0; return 0;
} }
void setSpeed(int speed) void setSpeed(int speed)
{ {
analogWrite(m_pin, speed); if(speed > 4095) speed = 4095;
ledcWriteChannel(m_channel, speed);
} }
private: private:
@ -125,8 +127,6 @@ class IO {
float err_dir = dir - m_dir; float err_dir = dir - m_dir;
float angular_displacement = angular_speed * static_cast<float>(millis() / 1000 - prev_time / 1000); float angular_displacement = angular_speed * static_cast<float>(millis() / 1000 - prev_time / 1000);
Serial.printf("Angular Speed : %d\nStatic Cast : %d\nprev_time : %d\n millis : %d\n", angular_speed, static_cast<float>(millis() / 1000 - prev_time / 1000), prev_time, millis());
if(abs(err_dir) < angular_displacement) if(abs(err_dir) < angular_displacement)
{ {
m_dir = dir; m_dir = dir;
@ -136,8 +136,6 @@ class IO {
m_dir += angular_displacement * (err_dir < 0) ? -1 : 1; m_dir += angular_displacement * (err_dir < 0) ? -1 : 1;
} }
Serial.printf("Angle : %d\nAngular Displacement : %d\n", m_dir, angular_displacement);
prev_time = millis(); prev_time = millis();
} }
@ -180,14 +178,17 @@ class IO {
return &m_screen; return &m_screen;
} }
Motor m_motors[2]; Motor *getMotor(int motor)
{
return &(m_motors[motor]);
}
private: private:
// Init Motors // Init Motors
void m_initMotors() void m_initMotors()
{ {
m_motors[0].init(PIN_MOTOR1); m_motors[0].init(PIN_MOTOR1, 0);
m_motors[1].init(PIN_MOTOR2); m_motors[1].init(PIN_MOTOR2, 1);
} }
// Init Servo // Init Servo
@ -199,6 +200,7 @@ class IO {
m_servo.write(87); m_servo.write(87);
} }
// Init Screen
int m_initScreen() int m_initScreen()
{ {
if(!m_screen.begin(SSD1306_SWITCHCAPVCC, 0x3C)) if(!m_screen.begin(SSD1306_SWITCHCAPVCC, 0x3C))
@ -255,12 +257,12 @@ class IO {
if(m1_speed < 0) if(m1_speed < 0)
{ {
m1_speed = 0; m1_speed = 0;
m2_speed = static_cast<int>(m_speed - 2 * correction); //m2_speed = static_cast<int>(m_speed - 2 * correction);
} }
else if(m2_speed < 0) else if(m2_speed < 0)
{ {
m2_speed = 0; m2_speed = 0;
m1_speed = static_cast<int>(m_speed + 2 * correction); //m1_speed = static_cast<int>(m_speed + 2 * correction);
} }
m_motors[0].setSpeed(m1_speed); m_motors[0].setSpeed(m1_speed);
@ -277,6 +279,7 @@ class IO {
bool m_is_color_blue {false}; bool m_is_color_blue {false};
bool m_is_dancing {false}; bool m_is_dancing {false};
Motor m_motors[2];
Servo m_servo; Servo m_servo;
Adafruit_SSD1306 m_screen {128, 64, &Wire, -1}; Adafruit_SSD1306 m_screen {128, 64, &Wire, -1};