jeka/MyOwnEtherCATDevice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New pwmCycleTime different from sync0CycleTime

Browse Source
This commit is contained in:
Hakan Bastedt
2024-01-20 12:37:42 +01:00
parent e6bfe4f880
commit 1f97534133
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/include/StepGen.h
View File

@@ -26,6 +26,7 @@ private:
public: public:
static uint32_t sync0CycleTime; static uint32_t sync0CycleTime;
static uint32_t pwmCycleTime;
StepGen(TIM_TypeDef *Timer, uint32_t timerChannel, PinName stepPin, uint8_t dirPin, void irq(void)); StepGen(TIM_TypeDef *Timer, uint32_t timerChannel, PinName stepPin, uint8_t dirPin, void irq(void));
void reqPos(double_t pos); void reqPos(double_t pos);

9
Firmware/src/StepGen.cpp
View File

@@ -51,10 +51,10 @@ void StepGen::handleStepper(void)
actPos(timerStepPosition / double(stepsPerMM)); actPos(timerStepPosition / double(stepsPerMM));
double diffPosition = reqPos() - actPos(); double diffPosition = reqPos() - actPos();
uint64_t fre = abs(diffPosition) * stepsPerMM * 1000000 / double(sync0CycleTime); // Frequency needed uint64_t fre = abs(diffPosition) * stepsPerMM * 1000000 / double(pwmCycleTime); // Frequency needed
if (fre > maxFreq) // Only do maxFre if (fre > maxFreq) // Only do maxFre
{ {
double maxDist = maxFreq / stepsPerMM * sync0CycleTime / 1000000.0 * (diffPosition > 0 ? 1 : -1); double maxDist = maxFreq / stepsPerMM * pwmCycleTime / 1000000.0 * (diffPosition > 0 ? 1 : -1);
reqPos(actualPosition + maxDist); reqPos(actualPosition + maxDist);
} }
int32_t pulsesAtEndOfCycle = stepsPerMM * reqPos(); // From Turner.hal X:5000 Z:2000 ps/mm int32_t pulsesAtEndOfCycle = stepsPerMM * reqPos(); // From Turner.hal X:5000 Z:2000 ps/mm
@@ -72,7 +72,7 @@ void StepGen::handleStepper(void)
digitalWrite(dirPin, sgn); digitalWrite(dirPin, sgn);
timerStepDirection = steps > 0 ? 1 : -1; timerStepDirection = steps > 0 ? 1 : -1;
timerStepPositionAtEnd = pulsesAtEndOfCycle; // Current Position timerStepPositionAtEnd = pulsesAtEndOfCycle; // Current Position
double_t freqf = abs(steps) * (1e6 / double(sync0CycleTime)); double_t freqf = abs(steps) * (1e6 / double(pwmCycleTime));
uint32_t freq = uint32_t(freqf); uint32_t freq = uint32_t(freqf);
MyTim->setMode(timerChan, TIMER_OUTPUT_COMPARE_PWM2, stepPin); MyTim->setMode(timerChan, TIMER_OUTPUT_COMPARE_PWM2, stepPin);
MyTim->setOverflow(freq, HERTZ_FORMAT); MyTim->setOverflow(freq, HERTZ_FORMAT);
@@ -96,7 +96,7 @@ void StepGen::timerCB()
{ {
uint8_t sgn = steps > 0 ? HIGH : LOW; uint8_t sgn = steps > 0 ? HIGH : LOW;
digitalWrite(dirPin, sgn); digitalWrite(dirPin, sgn);
double_t freqf = abs(steps) * (1e6 / double(sync0CycleTime)); double_t freqf = abs(steps) * (1e6 / double(pwmCycleTime));
uint32_t freq = uint32_t(freqf); uint32_t freq = uint32_t(freqf);
timerStepDirection = steps > 0 ? 1 : -1; timerStepDirection = steps > 0 ? 1 : -1;
timerStepPositionAtEnd = timerNewEndStepPosition; timerStepPositionAtEnd = timerNewEndStepPosition;
@@ -121,3 +121,4 @@ void StepGen::setScale(int16_t spm)
} }
uint32_t StepGen::sync0CycleTime = 0; uint32_t StepGen::sync0CycleTime = 0;
uint32_t StepGen::pwmCycleTime = 0;

3
Firmware/src/main.cpp
View File

@@ -176,6 +176,7 @@ uint16_t dc_checker(void)
{ {
// Indicate we run DC // Indicate we run DC
ESCvar.dcsync = 1; ESCvar.dcsync = 1;
StepGen::sync0CycleTime = 10*ESC_SYNC0cycletime() / 1000; StepGen::sync0CycleTime = ESC_SYNC0cycletime() / 1000; // usecs
StepGen::pwmCycleTime = 10 * StepGen::sync0CycleTime;
return 0; return 0;
} }