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

TIM8 replaced with TIM3. TIM3,chan4 works on PC9. TIM8,chan4 should work but doesn't. How should one know?

Browse Source
This commit is contained in:
Hakan Bastedt
2024-01-18 17:21:12 +01:00
parent 9ab4afabe4
commit 9e311038c1
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/src/StepGen.cpp
View File

@@ -46,7 +46,7 @@ void StepGen::enable(uint8_t yes)
void StepGen::handleStepper(void) void StepGen::handleStepper(void)
{ {
if (!enabled) if (!enabled)
return; return;
actPos(timerStepPosition / double(stepsPerMM)); actPos(timerStepPosition / double(stepsPerMM));
double diffPosition = reqPos() - actPos(); double diffPosition = reqPos() - actPos();

15
Firmware/src/main.cpp
View File

@@ -9,6 +9,7 @@ _Objects Obj;
HardwareSerial Serial1(PA10, PA9); HardwareSerial Serial1(PA10, PA9);
#define DEBUG_TIM8 1
#include "MyEncoder.h" #include "MyEncoder.h"
void indexPulseEncoderCB1(void); void indexPulseEncoderCB1(void);
MyEncoder Encoder1(TIM2, PA2, indexPulseEncoderCB1); MyEncoder Encoder1(TIM2, PA2, indexPulseEncoderCB1);
@@ -16,14 +17,6 @@ void indexPulseEncoderCB1(void)
{ {
Encoder1.indexPulse(); Encoder1.indexPulse();
} }
#if 0
void indexPulseEncoderCB2(void);
MyEncoder Encoder2(TIM3, PB6, indexPulseEncoderCB2);
void indexPulseEncoderCB2(void)
{
Encoder2.indexPulse();
}
#endif
#include "StepGen.h" #include "StepGen.h"
void timerCallbackStep1(void); void timerCallbackStep1(void);
@@ -33,10 +26,10 @@ void timerCallbackStep1(void)
Step1.timerCB(); Step1.timerCB();
} }
void timerCallbackStep2(void); void timerCallbackStep2(void);
StepGen Step2(TIM8, 4, PC_9, PC10, timerCallbackStep2); StepGen Step2(TIM3, 4, PC_9, PC10, timerCallbackStep2);
void timerCallbackStep2(void) void timerCallbackStep2(void)
{ {
Step2.timerCB(); //Step2.timerCB();
} }
void cb_set_outputs(void) // Master outputs gets here, slave inputs, first operation void cb_set_outputs(void) // Master outputs gets here, slave inputs, first operation
@@ -50,6 +43,7 @@ void cb_set_outputs(void) // Master outputs gets here, slave inputs, first opera
Step2.reqPos(Obj.StepGenIn2.CommandedPosition); Step2.reqPos(Obj.StepGenIn2.CommandedPosition);
Step2.setScale(Obj.StepGenIn2.StepsPerMM); Step2.setScale(Obj.StepGenIn2.StepsPerMM);
Step2.enable(Obj.Enable1); Step2.enable(Obj.Enable1);
#
} }
void handleStepper(void) void handleStepper(void)
@@ -101,7 +95,6 @@ void setup(void)
{ {
Serial1.begin(115200); Serial1.begin(115200);
rcc_config(); // probably breaks some timers. rcc_config(); // probably breaks some timers.
ecat_slv_init(&config); ecat_slv_init(&config);
} }