Added version to start header. Remote sends back wrong version. Need to implement version query

Author: andrewrapp

arduino/library/RemoteUploader/RemoteUploader.cpp

@@ -644,6 +644,11 @@ int RemoteUploader::process(uint8_t packet[]) {
             getDebugSerial()->println("Received start packet");
           #endif  
 
+          if (packet[] != VERSION) {
+            // TODO send the version number
+            return WRONG_VERSION_ERROR;
+          }
+
           if (inProgramming) {
             // ok. we'll reset
           }

arduino/library/RemoteUploader/RemoteUploader.h

@@ -41,6 +41,9 @@
 // Must also enable a DEBUG when using this. With atmega328/168 you would need to use SoftSerial
 #define VERBOSE false
 
+// indicates compatibility with host program
+#define VERSION 1
+
 // The remaining config should be fine for vast majority of cases
 
 // Default optiboot speed for 5V Arduinos
@@ -100,6 +103,7 @@
 #define NOBOOTLOADER_ERROR 8
 #define VERIFY_PAGE_ERROR 9
 #define ADDRESS_SKIP_ERROR 0xa
+#define WRONG_VERSION_ERROR 0xb
 
 // STK CONSTANTS
 #define STK_OK              0x10

java/src/main/java/com/rapplogic/aru/uploader/SketchUploader.java

@@ -49,8 +49,13 @@ public abstract class SketchUploader extends SketchCore {
 	public final int CONTROL_WRITE_EEPROM = 0x20;
 	// somewhat redundant
 	public final int CONTROL_START_FLASH = 0x40;
+	// tell what version of uploader is running
+	public final int CONTROL_VERSION_QUERY = 0x80;
+
+	// releases with non-backwards compatible change to protocol should rev the version number 
+	public final int VERSION = 1;
 
-	// repsonse/error codes must sync the arduino header file
+	// response/error codes must sync the arduino header file
 	public final int OK = 1;
 	public final int START_OVER = 2;
 	public final int TIMEOUT = 3;
@@ -175,19 +180,24 @@ protected void waitForAck(final int ackTimeoutMillis, int id) throws NoAckExcept
 		throw new NoAckException("No ACK from transport device after " + ackTimeoutMillis + "ms");		
 	}
 
-	public int[] getStartHeader(int sizeInBytes, int numPages, int bytesPerPage, int timeout) {
-		return new int[] { 
+	public int[] getStartHeader(int sizeInBytes, int numPages, int bytesPerPage, int timeout, int version) {
+		int[] header =  new int[] { 
 				MAGIC_BYTE1, 
 				MAGIC_BYTE2, 
 				CONTROL_PROG_REQUEST, 
-				10, //length of this header
+				-1, //length set below
 				(sizeInBytes >> 8) & 0xff, 
 				sizeInBytes & 0xff, 
 				(numPages >> 8) & 0xff, 
 				numPages & 0xff,
 				bytesPerPage,
-				timeout & 0xff				
+				timeout & 0xff,
+				version
 		};
+		
+		header[3] = header.length;
+		
+		return header;
 	}
 
 	// TODO consider adding retry bit to header
@@ -196,14 +206,18 @@ public int[] getStartHeader(int sizeInBytes, int numPages, int bytesPerPage, int
 	// NOTE if header size is ever changed must also change PROG_DATA_OFFSET in library
 	// xbee has error detection built-in but other protocols may need a checksum
 	private int[] getHeader(int controlByte, int addressOrSize, int dataLength) {
-		return new int[] {
+		int[] header = new int[] {
 				MAGIC_BYTE1, 
 				MAGIC_BYTE2, 
 				controlByte, 
-				dataLength + 6, //length + 6 bytes for header
+				-1, //set below
 				(addressOrSize >> 8) & 0xff, 
 				addressOrSize & 0xff
 		};
+		
+		header[3] = dataLength + header.length;
+		
+		return header;
 	}
 
 	protected int getPacketId(int[] reply) {
@@ -264,7 +278,7 @@ public void process(String file, int pageSize, final int ackTimeoutMillis, int a
 			open(context);
 
 			long start = System.currentTimeMillis();
-			final int[] startHeader = getStartHeader(sketch.getSize(), sketch.getPages().size(), sketch.getBytesPerPage(), arduinoTimeoutSec);
+			final int[] startHeader = getStartHeader(sketch.getSize(), sketch.getPages().size(), sketch.getBytesPerPage(), arduinoTimeoutSec, VERSION);
 
 			System.out.println("Sending sketch to " + getName() + " radio, size " + sketch.getSize() + " bytes, md5 " + getMd5(sketch.getProgram()) + ", number of packets " + sketch.getPages().size() + ", and " + sketch.getBytesPerPage() + " bytes per packet, header " + toHex(startHeader));
 

java/src/main/java/com/rapplogic/aru/uploader/wifi/WifiSketchUploader.java

@@ -250,7 +250,7 @@ private void runFromCmdLine(String[] args) throws org.apache.commons.cli.ParseEx
 
 	/**
 	 * ex
-ceylon:arduino-remote-uploader-1.0-SNAPSHOT andrew$ ./wifi-uploader.sh  -d --host 192.168.1.115  --port 1111 -s ../../../resources/BlinkSlow.cpp.hex 
+ceylon:arduino-remote-uploader-1.0-SNAPSHOT andrew$ ./wifi-uploader.sh --host 192.168.1.115  --port 1111 -s ../../../resources/BlinkSlow.cpp.hex 
 Sending sketch to wifi radio, size 1102 bytes, md5 8e7a58576bdc732d3f9708dab9aea5b9, number of packets 43, and 26 bytes per packet, header ef,ac,10,a,4,4e,0,2b,1a,3c
 Sending page 1 of 43, with address 0, length 32, packet ef,ac,20,20,0,0,c,94,61,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94
 Sending page 2 of 43, with address 26, length 32, packet ef,ac,20,20,0,1a,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0,c,94,7e,0