MotorController works

This commit is contained in:
Marcel Peterkau 2024-12-13 15:15:27 +01:00
parent 1ecf83fcc7
commit c62427a3a1
3 changed files with 322 additions and 205 deletions

View File

@ -4,56 +4,119 @@
const MotorConfig defaultConfig = { const MotorConfig defaultConfig = {
.minPWM = 0, .minPWM = 0,
.maxPWM = 255, .maxPWM = 255,
.inverted = false, .inverted = true,
.responseSpeed = 10, .responseSpeed = 50,
.lookupTable = {0, 28, 57, 85, 114, 142, 171, 199, 228, 255} .lookupTable = {0, 10, 20, 30, 40, 50, 60, 70, 80, 100} // Percent values for 0% to 100%
}; };
MotorController::MotorController(int motorPin) MotorController::MotorController(int motorPin)
: motorPWMPin(motorPin), currentSpeed(0) { : motorPWMPin(motorPin), currentSpeed(0), targetSpeed(0)
{
loadDefaults(); loadDefaults();
pinMode(motorPWMPin, OUTPUT); pinMode(motorPWMPin, OUTPUT);
stopMotor(); stopMotor();
} }
void MotorController::loadDefaults() { void MotorController::loadDefaults()
{
config = defaultConfig; config = defaultConfig;
} }
void MotorController::setTargetSpeed(int targetSpeedPercent) { void MotorController::setTargetSpeed(int targetSpeedPercent)
targetSpeedPercent = constrain(targetSpeedPercent, 0, 100); {
int tableIndex = map(targetSpeedPercent, 0, 100, 0, MotorConfig::lookupTableSize - 1); if (targetSpeed != targetSpeedPercent)
uint8_t targetPWM = config.lookupTable[tableIndex]; {
uint8_t adjustedPWM = applyDynamicResponse(targetPWM); Serial.print("MC: set targetSpeed to: ");
setPWM(adjustedPWM); Serial.println(targetSpeed);
currentSpeed = targetSpeedPercent; }
targetSpeed = constrain(targetSpeedPercent, 0, 100);
} }
int MotorController::getSpeed() const { void MotorController::maintain()
{
targetSpeed = constrain(targetSpeed, 0, 100); // Ensure targetSpeed is valid
int adjustedSpeed = applyDynamicResponse(targetSpeed); // Dynamic adjustment in percentage
// Interpolate between lookup table values
int lowerIndex = map(adjustedSpeed, 0, 100, 0, MotorConfig::lookupTableSize - 1);
int upperIndex = min(lowerIndex + 1, MotorConfig::lookupTableSize - 1);
int lowerPercent = config.lookupTable[lowerIndex];
int upperPercent = config.lookupTable[upperIndex];
float interpolationFactor = (adjustedSpeed - lowerIndex * (100 / (MotorConfig::lookupTableSize - 1))) / (100.0 / (MotorConfig::lookupTableSize - 1));
int interpolatedPWM = map(lowerPercent + interpolationFactor * (upperPercent - lowerPercent), 0, 100, config.minPWM, config.maxPWM);
setPWM(interpolatedPWM); // Apply final interpolated PWM value
currentSpeed = adjustedSpeed; // Update currentSpeed in percentage
}
int MotorController::getSpeed() const
{
return currentSpeed; return currentSpeed;
} }
void MotorController::stopMotor() { void MotorController::stopMotor()
{
setTargetSpeed(0); setTargetSpeed(0);
maintain();
} }
MotorConfig MotorController::getConfig() const { MotorConfig MotorController::getConfig() const
{
return config; return config;
} }
void MotorController::setConfig(const MotorConfig &newConfig) { void MotorController::setConfig(const MotorConfig &newConfig)
{
config = newConfig; config = newConfig;
} }
void MotorController::setPWM(uint8_t pwmValue) { void MotorController::setPWM(uint8_t pwmValue)
uint8_t constrainedPWM = constrain(pwmValue, config.minPWM, config.maxPWM); {
int constrainedPWM = constrain(pwmValue, config.minPWM, config.maxPWM);
analogWrite(motorPWMPin, config.inverted ? 255 - constrainedPWM : constrainedPWM); analogWrite(motorPWMPin, config.inverted ? 255 - constrainedPWM : constrainedPWM);
} }
int MotorController::applyDynamicResponse(int targetValue) { int MotorController::applyDynamicResponse(int targetPercent)
static int smoothedValue = 0; {
int delta = targetValue - smoothedValue; // Intern in Promille arbeiten für höhere Genauigkeit
int step = delta / config.responseSpeed; static int smoothedPromille = 0;
smoothedValue += step; static unsigned long lastUpdateTime = millis();
return smoothedValue;
unsigned long currentTime = millis();
unsigned long elapsedTime = currentTime - lastUpdateTime;
if (elapsedTime == 0)
return smoothedPromille / 10; // Rückgabe in Prozent
// Zielwert in Promille berechnen
int targetPromille = targetPercent * 10;
// Dynamische Reaktionsgeschwindigkeit in Promille pro Sekunde
int maxChangePerMs = config.responseSpeed * 10; // Konfigurierbarer Faktor
// Berechne maximale Änderung basierend auf vergangener Zeit
int maxDelta = (maxChangePerMs * elapsedTime) / 1000;
// Tatsächliche Änderung begrenzen
int delta = targetPromille - smoothedPromille;
if (delta > maxDelta)
delta = maxDelta;
else if (delta < -maxDelta)
delta = -maxDelta;
// Smoothed Promille aktualisieren
smoothedPromille += delta;
lastUpdateTime = currentTime;
// Debug-Ausgabe
Serial.print("TargetPromille: ");
Serial.print(targetPromille);
Serial.print(", Delta: ");
Serial.print(delta);
Serial.print(", SmoothedPromille: ");
Serial.println(smoothedPromille);
// Rückgabe in Prozent (gerundet)
return (smoothedPromille + 5) / 10; // Rundung durch Addition von 5 vor Division
} }

View File

@ -5,7 +5,8 @@
#include <Arduino.h> #include <Arduino.h>
// Motor configuration structure // Motor configuration structure
struct MotorConfig { struct MotorConfig
{
uint8_t minPWM; uint8_t minPWM;
uint8_t maxPWM; uint8_t maxPWM;
bool inverted; bool inverted;
@ -14,10 +15,12 @@ struct MotorConfig {
uint8_t lookupTable[lookupTableSize]; uint8_t lookupTable[lookupTableSize];
}; };
class MotorController { class MotorController
{
private: private:
int motorPWMPin; int motorPWMPin;
int currentSpeed; int currentSpeed;
int targetSpeed;
MotorConfig config; MotorConfig config;
int applyDynamicResponse(int targetValue); int applyDynamicResponse(int targetValue);
@ -26,6 +29,7 @@ private:
public: public:
MotorController(int motorPin); MotorController(int motorPin);
void maintain();
void stopMotor(); void stopMotor();
void setTargetSpeed(int targetSpeedPercent); void setTargetSpeed(int targetSpeedPercent);
int getSpeed() const; int getSpeed() const;
@ -33,7 +37,6 @@ public:
MotorConfig getConfig() const; MotorConfig getConfig() const;
void setConfig(const MotorConfig &newConfig); void setConfig(const MotorConfig &newConfig);
void loadDefaults(); void loadDefaults();
}; };
#endif // MOTORCONTROLLER_H #endif // MOTORCONTROLLER_H

View File

@ -24,7 +24,8 @@ MotorController motor(motorPin); // Motor control object
PedalController pedal(pedalPin); // Pedal input object PedalController pedal(pedalPin); // Pedal input object
// Combined settings structure // Combined settings structure
struct Settings { struct Settings
{
MotorConfig motorConfig; MotorConfig motorConfig;
PedalConfig pedalConfig; PedalConfig pedalConfig;
uint8_t checksum; uint8_t checksum;
@ -47,13 +48,16 @@ void configurePWMFrequency();
void stopMotorAtNeedleUp(); void stopMotorAtNeedleUp();
void printHelp(); void printHelp();
void setup() { void setup()
{
// Initialize pins // Initialize pins
pinMode(hallSensor, INPUT); pinMode(hallSensor, INPUT);
pinMode(encoderPinA, INPUT_PULLUP); pinMode(encoderPinA, INPUT_PULLUP);
pinMode(encoderPinB, INPUT_PULLUP); pinMode(encoderPinB, INPUT_PULLUP);
pinMode(encoderButton, INPUT_PULLUP); pinMode(encoderButton, INPUT_PULLUP);
pinMode(LED_BUILTIN, OUTPUT);
// Configure PWM frequency // Configure PWM frequency
configurePWMFrequency(); configurePWMFrequency();
@ -76,15 +80,20 @@ void setup() {
printHelp(); printHelp();
} }
void loop() { void loop()
{
// Handle serial input for debugging and manual control // Handle serial input for debugging and manual control
handleSerialInput(); handleSerialInput();
motor.maintain();
if (autoCalibrating) { if (autoCalibrating)
{
CalibrationState currentState = pedal.autoCalibrate(false); CalibrationState currentState = pedal.autoCalibrate(false);
if (currentState != lastCalibrationState) { if (currentState != lastCalibrationState)
{
lastCalibrationState = currentState; lastCalibrationState = currentState;
switch (currentState) { switch (currentState)
{
case RUNNING: case RUNNING:
Serial.println("Calibration running..."); Serial.println("Calibration running...");
break; break;
@ -99,8 +108,14 @@ void loop() {
} }
} }
motor.setTargetSpeed(0); // Ensure motor stays off during calibration motor.setTargetSpeed(0); // Ensure motor stays off during calibration
} else { }
int pedalValue = serialControlEnabled ? 0 : pedal.getPedal(); else if (serialControlEnabled)
{
// Serial control active, do nothing here; speed controlled via serial commands
}
else
{
int pedalValue = pedal.getPedal();
motor.setTargetSpeed(pedalValue); motor.setTargetSpeed(pedalValue);
} }
@ -110,16 +125,19 @@ void loop() {
delay(10); // Short delay for stability delay(10); // Short delay for stability
} }
void stopMotorAtNeedleUp() { void stopMotorAtNeedleUp()
{
motor.stopMotor(); motor.stopMotor();
delay(100); // Stabilize delay(100); // Stabilize
} }
void loadSettings() { void loadSettings()
{
EEPROM.get(0, settings); EEPROM.get(0, settings);
// Validate checksum // Validate checksum
if (calculateChecksum(settings) != settings.checksum) { if (calculateChecksum(settings) != settings.checksum)
{
Serial.println("Invalid settings checksum, loading defaults."); Serial.println("Invalid settings checksum, loading defaults.");
motor.loadDefaults(); motor.loadDefaults();
pedal.autoCalibrate(true); pedal.autoCalibrate(true);
@ -129,14 +147,17 @@ void loadSettings() {
settings.checksum = calculateChecksum(settings); settings.checksum = calculateChecksum(settings);
saveSettings(); saveSettings();
} else { }
else
{
motor.setConfig(settings.motorConfig); motor.setConfig(settings.motorConfig);
pedal.setConfig(settings.pedalConfig); pedal.setConfig(settings.pedalConfig);
Serial.println("Settings loaded from EEPROM."); Serial.println("Settings loaded from EEPROM.");
} }
} }
void saveSettings() { void saveSettings()
{
settings.motorConfig = motor.getConfig(); settings.motorConfig = motor.getConfig();
settings.pedalConfig = pedal.getConfig(); settings.pedalConfig = pedal.getConfig();
settings.checksum = calculateChecksum(settings); settings.checksum = calculateChecksum(settings);
@ -145,37 +166,45 @@ void saveSettings() {
Serial.println("Settings saved to EEPROM."); Serial.println("Settings saved to EEPROM.");
} }
uint8_t calculateChecksum(const Settings &s) { uint8_t calculateChecksum(const Settings &s)
{
uint8_t sum = 0; uint8_t sum = 0;
const uint8_t *data = reinterpret_cast<const uint8_t *>(&s); const uint8_t *data = reinterpret_cast<const uint8_t *>(&s);
for (size_t i = 0; i < sizeof(Settings) - 1; i++) { for (size_t i = 0; i < sizeof(Settings) - 1; i++)
{
sum ^= data[i]; sum ^= data[i];
} }
return sum; return sum;
} }
void handleEncoder() { void handleEncoder()
{
static uint8_t lastState = 0; static uint8_t lastState = 0;
uint8_t currentState = (digitalRead(encoderPinA) << 1) | digitalRead(encoderPinB); uint8_t currentState = (digitalRead(encoderPinA) << 1) | digitalRead(encoderPinB);
if ((lastState == 0b00 && currentState == 0b01) || if ((lastState == 0b00 && currentState == 0b01) ||
(lastState == 0b01 && currentState == 0b11) || (lastState == 0b01 && currentState == 0b11) ||
(lastState == 0b11 && currentState == 0b10) || (lastState == 0b11 && currentState == 0b10) ||
(lastState == 0b10 && currentState == 0b00)) { (lastState == 0b10 && currentState == 0b00))
{
// Increment // Increment
} else if ((lastState == 0b00 && currentState == 0b10) || }
else if ((lastState == 0b00 && currentState == 0b10) ||
(lastState == 0b10 && currentState == 0b11) || (lastState == 0b10 && currentState == 0b11) ||
(lastState == 0b11 && currentState == 0b01) || (lastState == 0b11 && currentState == 0b01) ||
(lastState == 0b01 && currentState == 0b00)) { (lastState == 0b01 && currentState == 0b00))
{
// Decrement // Decrement
} }
lastState = currentState; lastState = currentState;
} }
void handleEncoderButton() { void handleEncoderButton()
{
// Handle encoder button press // Handle encoder button press
} }
void updateDisplay() { void updateDisplay()
{
display.clearDisplay(); display.clearDisplay();
display.setTextSize(1); display.setTextSize(1);
display.setTextColor(SSD1306_WHITE); display.setTextColor(SSD1306_WHITE);
@ -187,10 +216,13 @@ void updateDisplay() {
display.display(); display.display();
} }
void handleSerialInput() { void handleSerialInput()
if (Serial.available()) { {
if (Serial.available())
{
char input = Serial.read(); char input = Serial.read();
switch (input) { switch (input)
{
case 'c': case 'c':
Serial.println("Starting auto-calibration..."); Serial.println("Starting auto-calibration...");
pedal.autoCalibrate(true); pedal.autoCalibrate(true);
@ -231,12 +263,30 @@ void handleSerialInput() {
Serial.print("Decreased Speed to: "); Serial.print("Decreased Speed to: ");
Serial.println(motor.getSpeed()); Serial.println(motor.getSpeed());
break; break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
if (serialControlEnabled)
{
motor.setTargetSpeed((input - 0x30) * 10);
Serial.print("Set Speed to: ");
Serial.println(motor.getSpeed());
}
break;
} }
Serial.println(input); Serial.println(input);
} }
} }
void printHelp() { void printHelp()
{
Serial.println("Available commands:"); Serial.println("Available commands:");
Serial.println("c - Start auto-calibration"); Serial.println("c - Start auto-calibration");
Serial.println("x - Stop auto-calibration or serial control"); Serial.println("x - Stop auto-calibration or serial control");
@ -248,7 +298,8 @@ void printHelp() {
Serial.println("- - Decrement PWM"); Serial.println("- - Decrement PWM");
} }
void configurePWMFrequency() { void configurePWMFrequency()
{
// Configure Timer1 for higher PWM frequency (e.g., ~8 kHz) // Configure Timer1 for higher PWM frequency (e.g., ~8 kHz)
TCCR1B = (TCCR1B & 0b11111000) | 0x01; // Set prescaler to 1 TCCR1B = (TCCR1B & 0b11111000) | 0x01; // Set prescaler to 1
} }