stepus53/EggbotWireless
1
0
Fork 0
mirror of https://github.com/usatiuk/EggbotWireless.git synced 2025-10-26 08:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix timer interrupt issues

Browse Source
This commit is contained in:
Stepan Usatiuk
2019-07-15 20:57:15 +03:00
parent a7f9f387b0
commit 133a4abc5e
2 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/EggbotWireless/src/main.cpp
View File

@@ -49,11 +49,20 @@ void execCommand(Command command) {
}
Serial.println("Status:");
Serial.println("X: " + String(resp[servoRot]));
Serial.println("Y: " + String(resp[eggRot]));
Serial.println("Xmm: " + String(resp[servoPos]));
Serial.println("Ymm: " + String(resp[eggPos]));
Serial.println("PEN: " + String(resp[penPos]));
Serial.print("X: ");
Serial.println(resp[servoRot]);
Serial.print("Y: ");
Serial.println(resp[eggRot]);
Serial.print("Xmm: ");
Serial.println(resp[servoPos]);
Serial.print("Ymm: ");
Serial.println(resp[eggPos]);
Serial.print("PEN: ");
Serial.println(resp[penPos]);
return;
}

49
Firmware/MotorControl/src/main.cpp
View File

@@ -1,6 +1,7 @@
#include <Arduino.h>
#include <Servo.h>
#include <Wire.h>
#include <util/atomic.h>
#include "Globals.h"
#include "common/Commands.h"
@@ -28,10 +29,11 @@ void adjustRPM() {
}
}
}
cli();
eggStepperDelay = calculateDelay(eggStepperRPM, STEPS_PER_REVOLUTION);
servoStepperDelay = calculateDelay(servoStepperRPM, STEPS_PER_REVOLUTION);
sei();
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
eggStepperDelay = calculateDelay(eggStepperRPM, STEPS_PER_REVOLUTION);
servoStepperDelay =
calculateDelay(servoStepperRPM, STEPS_PER_REVOLUTION);
}
}
Command command;
@@ -39,10 +41,10 @@ Command command;
bool newCommand = false;
bool executing = false;
int curByte = 0;
int curFloat = 0;
byte rxBuffer[7][sizeof(float)];
void receiveEvent(int howMany) {
static int curByte = 0;
static int curFloat = 0;
while (Wire.available() > 0) {
if (!newCommand) {
char c = Wire.read();
@@ -121,29 +123,36 @@ void setup() {
eggStepperRPM = servoStepperRPM = curRPM;
pinMode(A0, OUTPUT);
digitalWrite(A0, true);
OCR0A = 250;
TCCR0A |= (1 << WGM20) | (1 << CS22);
TIMSK0 |= (1 << OCIE0A);
OCR2A = 250;
TCCR2A |= (1 << WGM20) | (1 << CS22);
TIMSK2 |= (1 << OCIE2A);
servoStepper.setPos(X_LIMIT);
pen.init();
}
volatile unsigned int ms = 0;
volatile unsigned int tick = 0;
volatile bool armed = false;
ISR(TIMER0_COMPA_vect) {
ms++;
if (ms % adjustDelay == 0) {
adjustRPM();
}
if (ms % eggStepperDelay == 0) {
eggStepper.doStep();
}
if (ms % servoStepperDelay == 0) {
servoStepper.doStep();
ISR(TIMER2_COMPA_vect) {
if (armed) {
tick++;
armed = false;
}
}
void updateExecution() {
if (!armed) {
if (tick % adjustDelay == 0) {
adjustRPM();
}
if (tick % eggStepperDelay == 0) {
eggStepper.doStep();
}
if (tick % servoStepperDelay == 0) {
servoStepper.doStep();
}
armed = true;
}
if (eggStepper.getRemainingSteps() == 0 &&
servoStepper.getRemainingSteps() == 0) {
executing = false;