From c94a365d2bad25ddcfc01da1009f3b92b805016d Mon Sep 17 00:00:00 2001 From: euphy Date: Thu, 2 Apr 2015 23:42:33 +0100 Subject: [PATCH] Made checksumming turn-onable and offable. --- polargraphcontroller.pde | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/polargraphcontroller.pde b/polargraphcontroller.pde index 7688662..0200314 100644 --- a/polargraphcontroller.pde +++ b/polargraphcontroller.pde @@ -2096,12 +2096,12 @@ void drawStatusText(int x, int y) if (drawbotReady) { fill(0, 200, 0); - if (currentHardware >= HARDWARE_VER_MEGA_POLARSHIELD) + if (currentHardware >= HARDWARE_VER_POLARPRO) + drawbotStatus = "Polargraph READY! (PRO)"; + else if (currentHardware >= HARDWARE_VER_MEGA_POLARSHIELD) drawbotStatus = "Polargraph READY! (PolargraphSD)"; else if (currentHardware >= HARDWARE_VER_MEGA) drawbotStatus = "Polargraph READY! (Mega)"; - else if (currentHardware >= HARDWARE_VER_POLARPRO) - drawbotStatus = "Polargraph READY! (PRO)"; else drawbotStatus = "Polargraph READY! (Uno)"; } @@ -2424,7 +2424,8 @@ void setHardwareVersionFromIncoming(String readyString) } if (HARDWARE_VER_MEGA == verInt - || HARDWARE_VER_MEGA_POLARSHIELD == verInt) + || HARDWARE_VER_MEGA_POLARSHIELD == verInt + || HARDWARE_VER_POLARPRO == verInt) newHardwareVersion = verInt; else newHardwareVersion = HARDWARE_VER_UNO; @@ -2678,9 +2679,11 @@ void dispatchCommandQueue() commandQueue.remove(0); println("Dispatching command: " + command); } -// Checksum crc = new CRC32(); -// crc.update(lastCommand.getBytes(), 0, lastCommand.length()); -// lastCommand = lastCommand+":"+crc.getValue(); + if (useChecksum()) { + Checksum crc = new CRC32(); + crc.update(lastCommand.getBytes(), 0, lastCommand.length()); + lastCommand = lastCommand+":"+crc.getValue(); + } println("Last command:" + lastCommand); myPort.write(lastCommand); myPort.write(10); // OH *$%! of COURSE you should terminate it. @@ -2692,6 +2695,10 @@ void dispatchCommandQueue() } } +boolean useChecksum() { + return currentHardware == 200; +} + void addToCommandQueue(String command) { synchronized (commandQueue)