souko/BLDC_SewingMachineController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some progress

Browse Source
This commit is contained in:
Marcel Peterkau 2024-12-13 23:42:33 +01:00
parent c62427a3a1
commit a339ceb163
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/MotorController.cpp
View File

@ -24,11 +24,7 @@ void MotorController::loadDefaults()
void MotorController::setTargetSpeed(int targetSpeedPercent) void MotorController::setTargetSpeed(int targetSpeedPercent)
{ {
if (targetSpeed != targetSpeedPercent)
{
Serial.print("MC: set targetSpeed to: ");
Serial.println(targetSpeed);
}
targetSpeed = constrain(targetSpeedPercent, 0, 100); targetSpeed = constrain(targetSpeedPercent, 0, 100);
} }
@ -109,14 +105,6 @@ int MotorController::applyDynamicResponse(int targetPercent)
smoothedPromille += delta; smoothedPromille += delta;
lastUpdateTime = currentTime; 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) // Rückgabe in Prozent (gerundet)
return (smoothedPromille + 5) / 10; // Rundung durch Addition von 5 vor Division return (smoothedPromille + 5) / 10; // Rundung durch Addition von 5 vor Division
} }

24
src/main.cpp
View File

@ -111,7 +111,21 @@ void loop()
} }
else if (serialControlEnabled) else if (serialControlEnabled)
{ {
// Serial control active, do nothing here; speed controlled via serial commands static int lastSpeed = 0;
int currSpeed = motor.getSpeed();
if (lastSpeed > currSpeed)
{
Serial.print("Decreased Speed to: ");
Serial.println(currSpeed);
lastSpeed = currSpeed;
}
else if (lastSpeed < currSpeed)
{
Serial.print("Increased Speed to: ");
Serial.println(currSpeed);
lastSpeed = currSpeed;
}
} }
else else
{ {
@ -254,14 +268,10 @@ void handleSerialInput()
case '+': case '+':
serialControlEnabled = true; serialControlEnabled = true;
motor.setTargetSpeed(motor.getSpeed() + 1); motor.setTargetSpeed(motor.getSpeed() + 1);
Serial.print("Increased Speed to: ");
Serial.println(motor.getSpeed());
break; break;
case '-': case '-':
serialControlEnabled = true; serialControlEnabled = true;
motor.setTargetSpeed(motor.getSpeed() - 1); motor.setTargetSpeed(motor.getSpeed() - 1);
Serial.print("Decreased Speed to: ");
Serial.println(motor.getSpeed());
break; break;
case '0': case '0':
case '1': case '1':
@ -300,6 +310,6 @@ void printHelp()
void configurePWMFrequency() void configurePWMFrequency()
{ {
// Configure Timer1 for higher PWM frequency (e.g., ~8 kHz) // Configure Timer1 for higher PWM frequency (~4 kHz)
TCCR1B = (TCCR1B & 0b11111000) | 0x01; // Set prescaler to 1 TCCR1B = (1<<CS11); // Set prescaler to 8
} }