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

a simple gcode visualiser

Browse Source
This commit is contained in:
Stepan Usatiuk
2019-08-05 11:35:14 +03:00
parent 348d6e80c8
commit 33bfe9d0d3
3 changed files with 103 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
App/src/GcodeParser.tsx
View File

@@ -51,6 +51,5 @@ export function parseCommand(cmd: string): Command {
(command as any)[arg] = parseFloat(val);
});
console.log(command);
return command;
}

114
App/src/GcodeVisualiser.tsx
View File

@@ -1,11 +1,16 @@
import * as React from "react";
import { Layer, Rect, Stage, Group } from "react-konva";
import { Layer, Rect, Stage, Group, Line } from "react-konva";
import { parseCommand, CommandType } from "~GcodeParser";
interface IGcodeVisualiserProps {
gcodeLinesSent: string[];
gcodeLinesQueue: string[];
}
const mult = 3;
const width = 500;
const height = 500;
export default class GcodeVisualiser extends React.PureComponent<
IGcodeVisualiserProps,
{}
@@ -14,18 +19,103 @@ export default class GcodeVisualiser extends React.PureComponent<
super(props);
}
render() {
return (
<Stage width={700} height={700}>
<Layer>
<Rect
x={10}
y={10}
width={50}
height={50}
fill={"black"}
shadowBlur={10}
let lastPos: { x: number; y: number; eng: boolean } = {
x: 60,
y: 0,
eng: false,
};
const { gcodeLinesQueue, gcodeLinesSent } = this.props;
const sentLines = gcodeLinesSent.map(sl => {
const command = parseCommand(sl);
if (
command.type === CommandType.G00 ||
command.type === CommandType.G01
) {
const line = (
<Line
points={[
lastPos.x * mult,
height - lastPos.y * mult,
(command.X ? command.X : lastPos.x) * mult,
height - (command.Y ? command.Y : lastPos.y) * mult,
]}
stroke={
(command.Z
? command.Z
: lastPos.eng)
? "green"
: "blue"
}
strokeWidth={
(command.Z ? command.Z : lastPos.eng) ? 2 : 1
}
/>
</Layer>
);
if (command.X) {
lastPos.x = command.X;
}
if (command.Y) {
lastPos.y = command.Y;
}
if (command.Z) {
if (command.Z >= 0) {
lastPos.eng = false;
} else {
lastPos.eng = true;
}
}
return line;
}
});
const pendLines = gcodeLinesQueue.map(sl => {
const command = parseCommand(sl);
if (
command.type === CommandType.G00 ||
command.type === CommandType.G01
) {
const line = (
<Line
points={[
lastPos.x * mult,
height - lastPos.y * mult,
(command.X ? command.X : lastPos.x) * mult,
height - (command.Y ? command.Y : lastPos.y) * mult,
]}
stroke={
(command.Z
? command.Z
: lastPos.eng)
? "black"
: "blue"
}
strokeWidth={
(command.Z ? command.Z : lastPos.eng) ? 2 : 1
}
/>
);
if (command.X) {
lastPos.x = command.X;
}
if (command.Y) {
lastPos.y = command.Y;
}
if (command.Z) {
if (command.Z >= 0) {
lastPos.eng = false;
} else {
lastPos.eng = true;
}
}
return line;
}
});
return (
<Stage width={width} height={height}>
<Layer>{[...sentLines, ...pendLines]}</Layer>
</Stage>
);
}

2
Firmware/MotorControl/src/Globals.cpp
View File

@@ -1,6 +1,6 @@
#include "Globals.h"
Stepper eggStepper(6, 5, STEPS_PER_REVOLUTION, 0, defYDegPerMM);
Stepper eggStepper(6, 5, -STEPS_PER_REVOLUTION, 0, defYDegPerMM);
Stepper servoStepper(4, 3, STEPS_PER_REVOLUTION, xLimit, defXDegPerMM);
unsigned int eggStepperDelay;