Jannis/kugelmuehle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix Switch Case Klammern

Browse source
This commit is contained in:
Jannis 2026-10-12 15:17:08 +02:00
parent 0ba1fbaea8
commit df4b67dab3
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kugelmuehle.ino
View file

@ -551,7 +551,7 @@ void printStatus(FastAccelStepper *stepper, int speed, int clickPlus, int clickM
// ############################################################ // ############################################################
void applyMotor(MotorCmd cmd, int32_t speed) { void applyMotor(MotorCmd cmd, int32_t speed) {
switch(cmd){ switch(cmd){
case MOTOR_STOP: case MOTOR_STOP:{
if (stepper->isRunning()) { if (stepper->isRunning()) {
stepper->setAcceleration(10000); stepper->setAcceleration(10000);
stepper->applySpeedAcceleration(); stepper->applySpeedAcceleration();
@ -560,8 +560,8 @@ void applyMotor(MotorCmd cmd, int32_t speed) {
lastSpeed = 0; lastSpeed = 0;
lastAutoHz = 0; lastAutoHz = 0;
break; break;
}
case MOTOR_AUTO: case MOTOR_AUTO: {
uint32_t autoHz = ((uint32_t)settings.autoSpeed * MIKROSTEPS) / 60; uint32_t autoHz = ((uint32_t)settings.autoSpeed * MIKROSTEPS) / 60;
if (!stepper->isRunning()) { if (!stepper->isRunning()) {
stepper->setSpeedInHz(autoHz); stepper->setSpeedInHz(autoHz);
@ -575,8 +575,8 @@ void applyMotor(MotorCmd cmd, int32_t speed) {
lastAutoHz = autoHz; lastAutoHz = autoHz;
} }
break; break;
}
case MOTOR_MANUAL: case MOTOR_MANUAL: {
if (speed != lastSpeed) { if (speed != lastSpeed) {
stepper->setSpeedInHz(MAX_SPEED_HZ); stepper->setSpeedInHz(MAX_SPEED_HZ);
stepper->setAcceleration(settings.accelRate); stepper->setAcceleration(settings.accelRate);
@ -585,8 +585,10 @@ void applyMotor(MotorCmd cmd, int32_t speed) {
lastAutoHz = 0; lastAutoHz = 0;
} }
break; break;
}
case MOTOR_KEEP:{
case MOTOR_KEEP: }
default: default:
break; break;
} }
@ -725,7 +727,7 @@ void loop() {
int32_t currentSpeed = (currentSpeed_HZ * 60) / MIKROSTEPS; int32_t currentSpeed = (currentSpeed_HZ * 60) / MIKROSTEPS;
updateDisplay(bSettings, settings.settingIdx, timeEditStep, settings, currentSpeed, curH, curM, timeIsValid, curTemp); updateDisplay(bSettings, settings.settingIdx, timeEditStep, settings, currentSpeed, curH, curM, timeIsValid, curTemp);
printStatus(stepper, speed, clickPlus, clickMinus); //printStatus(stepper, speed, clickPlus, clickMinus);
// 8. Discord-Alarm (bewusst NACH der Motorsteuerung, da der HTTP-Call blockiert) // 8. Discord-Alarm (bewusst NACH der Motorsteuerung, da der HTTP-Call blockiert)
// Genau eine Nachricht pro Überhitzungs-Ereignis, Reset erst wenn wieder abgekühlt // Genau eine Nachricht pro Überhitzungs-Ereignis, Reset erst wenn wieder abgekühlt