From 995db8a8a516a9c494d3b415fc0e2ce2238e38f5 Mon Sep 17 00:00:00 2001 From: Sandy Noble Date: Sun, 28 Oct 2018 15:18:33 +0000 Subject: [PATCH 1/3] Addition to support gcode without Z codes --- FileLoading.pde | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FileLoading.pde b/FileLoading.pde index b8217a2..73a7bfb 100644 --- a/FileLoading.pde +++ b/FileLoading.pde @@ -322,6 +322,9 @@ RShape loadShapeFromGCodeFile(String filename) { drawLine = false; } } + else { // if there is no Z axis, assume it's always on +// drawLine = true; // this isn't always safe! + } Float x = ins.get("X"); Float y = ins.get("Y"); From 417c18fec73fed9b756a4b6005881a868a1cd22e Mon Sep 17 00:00:00 2001 From: Sandy Noble Date: Mon, 5 Nov 2018 21:36:13 +0000 Subject: [PATCH 2/3] Add try/catch around the previewQueue(). Fixes #19 --- polargraphcontroller.pde | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/polargraphcontroller.pde b/polargraphcontroller.pde index c6a8a54..9508df1 100644 --- a/polargraphcontroller.pde +++ b/polargraphcontroller.pde @@ -843,8 +843,17 @@ void drawImagePage() showGroupBox(); showCurrentMachinePosition(); - if (displayingQueuePreview) - previewQueue(); + + try { + if (displayingQueuePreview) + previewQueue(); + } + catch (ConcurrentModificationException cme) + { + // not sure why this prompts an exception. Will revisit this another day. + println("Caught CME coming from previewQueue(): " + cme.getMessage()); + } + if (displayingInfoTextOnInputPage) showText(250,45); drawStatusText((int)statusTextPosition.x, (int)statusTextPosition.y); From dba2788d1ffa6537de29499e80edfe858f545a53 Mon Sep 17 00:00:00 2001 From: Sandy Noble Date: Tue, 12 Mar 2019 20:50:46 +0000 Subject: [PATCH 3/3] Added link to the instructions for building from source. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6c68d9e..e51a596 100644 --- a/README.md +++ b/README.md @@ -13,5 +13,7 @@ This is a desktop application for controlling a polargraph machine, communicatin The [latest releases bundle] (https://github.com/euphy/polargraphcontroller/releases/latest) contains copies of all the libraries that I use, as well as all the source, and compiled versions of the code where sensible. +How to [run it from source](https://github.com/euphy/polargraph/wiki/Running-the-controller-from-source-code). + sandy.noble@gmail.com http://www.polargraph.co.uk/