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

Works really nice now. 20 usecs base period => 50 kHz, 25 kHz pulse freq.

Browse Source
This commit is contained in:
Hakan Bastedt
2024-04-07 21:45:53 +02:00
parent 544dd5ed85
commit ab1a306d86
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/include/StepGen3.h
View File

@@ -146,7 +146,7 @@ private:
}; };
// For the example // For the example
#define BASE_PERIOD 40000 #define BASE_PERIOD 20000
#define SERVO_PERIOD 2000000 #define SERVO_PERIOD 2000000
#define JOINT_X_STEPGEN_MAXACCEL 0.0 #define JOINT_X_STEPGEN_MAXACCEL 0.0
#define JOINT_Z_STEPGEN_MAXACCEL 0.0 #define JOINT_Z_STEPGEN_MAXACCEL 0.0

12
Firmware/src/main.cpp
View File

@@ -62,11 +62,11 @@ void syncWithLCNC()
deltaSyncTime = syncTime - prevSyncTime; deltaSyncTime = syncTime - prevSyncTime;
deltaMakePulsesCnt = makePulsesCnt - prevMakePulsesCnt; deltaMakePulsesCnt = makePulsesCnt - prevMakePulsesCnt;
prevMakePulsesCnt = makePulsesCnt; prevMakePulsesCnt = makePulsesCnt;
Step->updateStepGen(pos_cmd1, pos_cmd2); // Update positions Step->updateStepGen(pos_cmd1, pos_cmd2); // Update positions
Step->makeAllPulses(); // Make first step right here Step->makeAllPulses(); // Make first step right here
basePeriodCnt = SERVO_PERIOD / BASE_PERIOD; // basePeriodCnt = SERVO_PERIOD / BASE_PERIOD; //
baseTimer->refresh(); // baseTimer->refresh(); //
baseTimer->resume(); // Make the other steps in ISR baseTimer->resume(); // Make the other steps in ISR
// baseTimer->isRunning(); // baseTimer->isRunning();
} }
@@ -220,7 +220,7 @@ void setup(void)
baseTimer = new HardwareTimer(TIM11); // The base period timer baseTimer = new HardwareTimer(TIM11); // The base period timer
uint32_t usecs = BASE_PERIOD / sync0CycleTime; uint32_t usecs = BASE_PERIOD / sync0CycleTime;
// setFrequencyAdjustedMicrosSeconds(baseTimer, usecs); // setFrequencyAdjustedMicrosSeconds(baseTimer, usecs);
baseTimer->setOverflow(35, MICROSEC_FORMAT); baseTimer->setOverflow(BASE_PERIOD / 1000, MICROSEC_FORMAT);
baseTimer->attachInterrupt(basePeriodCB); baseTimer->attachInterrupt(basePeriodCB);
syncTimer = new HardwareTimer(TIM3); // The Linuxcnc servo period sync timer syncTimer = new HardwareTimer(TIM3); // The Linuxcnc servo period sync timer