mirror of
https://github.com/euphy/polargraphcontroller
synced 2025-01-09 03:34:25 +01:00
Merge branch 'master' of https://github.com/euphy/polargraphcontroller
This commit is contained in:
commit
8e263852ee
@ -2,7 +2,7 @@ polargraphcontroller
|
|||||||
====================
|
====================
|
||||||
|
|
||||||
Polargraph controller
|
Polargraph controller
|
||||||
Copyright Sandy Noble 2015.
|
Copyright Sandy Noble 2018.
|
||||||
|
|
||||||
- Requires the excellent ControlP5 GUI library available from https://github.com/sojamo/controlp5.
|
- Requires the excellent ControlP5 GUI library available from https://github.com/sojamo/controlp5.
|
||||||
- Requires the excellent Geomerative library available from http://www.ricardmarxer.com/geomerative/.
|
- Requires the excellent Geomerative library available from http://www.ricardmarxer.com/geomerative/.
|
||||||
|
@ -2413,6 +2413,16 @@ void readMachinePosition(String sync)
|
|||||||
currentMachinePos.y = b;
|
currentMachinePos.y = b;
|
||||||
currentMachinePos = getDisplayMachine().inMM(getDisplayMachine().asCartesianCoords(currentMachinePos));
|
currentMachinePos = getDisplayMachine().inMM(getDisplayMachine().asCartesianCoords(currentMachinePos));
|
||||||
}
|
}
|
||||||
|
else if (splitted.length == 5)
|
||||||
|
{
|
||||||
|
String currentAPos = splitted[2];
|
||||||
|
String currentBPos = splitted[3];
|
||||||
|
Float a = Float.valueOf(currentAPos).floatValue();
|
||||||
|
Float b = Float.valueOf(currentBPos).floatValue();
|
||||||
|
currentMachinePos.x = a;
|
||||||
|
currentMachinePos.y = b;
|
||||||
|
currentMachinePos = getDisplayMachine().inMM(getDisplayMachine().asCartesianCoords(currentMachinePos));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void readCartesianMachinePosition(String sync)
|
void readCartesianMachinePosition(String sync)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user