DashyFox/PingPong
1
0
Fork 0
mirror of https://github.com/DashyFox/StackSport.git synced 2025-12-16 01:09:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

screw speed change protection

Browse Source
This commit is contained in:
DashyFox
2024-12-01 15:57:48 +03:00
parent 195d6ef021
commit ea5770e9f7
2 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Core/Src/RobotFunctions.c
View File

@ -47,6 +47,10 @@ uint8_t loadShotFromProgram(CurrentProgram *currentProg);
uint8_t loadNextProgramInMacro(CurrentMacro *currentMacro);
uint8_t loadProgramFromMacro(CurrentMacro *currentMacro);
uint8_t overridenSpeedScrew_Shot;
uint8_t overridenSpeedScrew_Program;
uint8_t overridenSpeedScrew_Macro;
void setPosOffDelay(uint16_t ms){
stop_timer = millis();
stop_timer_TIMEOUT = ms;
@ -374,10 +378,10 @@ uint8_t loadShotFromProgram(CurrentProgram *currentProg) {
return 0;
}
uint8_t overridenSpeedScrew =
overridenSpeedScrew_Program =
currentProg->program.shots[currentShotIndexLocal].speedScrew;
if (overridenSpeedScrew != 0) {
shot_.speedScrew = overridenSpeedScrew;
if (overridenSpeedScrew_Program != 0) {
shot_.speedScrew = overridenSpeedScrew_Program;
}
uint8_t repeatCountFromShot = currentProg->program.header.options & 2U;