Enhancements to the AVRISP Programmer project to attempt to get AVRStudio to communicate with the device.

5 files changed, 221 insertions, 64 deletions

diff --git a/Projects/AVRISP/AVRISP.c b/Projects/AVRISP/AVRISP.c
index 9c21af2cb..0491102b4 100644
--- a/Projects/AVRISP/AVRISP.c
+++ b/Projects/AVRISP/AVRISP.c
@@ -43,7 +43,7 @@ int main(void)
 {

 	SetupHardware();

 	

-	printf("AVRISP-MKII\r\n");

+	printf("AVRISP-MKII Clone\r\n");

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -113,14 +113,9 @@ void Process_AVRISP_Commands(void)
 	
 	/* Check to see if a V2 Protocol command has been received - if not, abort */
 	if (!(Endpoint_IsOUTReceived()))
-	  return;

-	  

-	printf("COMMAND\r\n");
+	  return;
 
 	/* Pass off processing of the V2 Protocol command to the V2 Protocol handler */
-	V2Protocol_ProcessCommand();
-

-	/* Reset Endpoint direction to OUT ready for next command */

-	Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);

+	V2Protocol_ProcessCommand();

 }
 
diff --git a/Projects/AVRISP/Descriptors.c b/Projects/AVRISP/Descriptors.c
index 6ccf5ee13..a6fefeaa5 100644
--- a/Projects/AVRISP/Descriptors.c
+++ b/Projects/AVRISP/Descriptors.c
@@ -160,7 +160,7 @@ USB_Descriptor_String_t PROGMEM SerialString =
 {

 	.Header                 = {.Size = USB_STRING_LEN(12), .Type = DTYPE_String},

 		

-	.UnicodeString          = L"00A000001B5B"

+	.UnicodeString          = L"0000A0011794"

 };

 

 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 3532c5ec6..304eef471 100644
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -33,26 +33,129 @@
  *  V2Protocol handler, to process V2 Protocol commands used in Atmel programmer devices.

  */

 

-char ProgrammerID[] = "AVRISP_MK2";

-

+#define  INCLUDE_FROM_V2PROTOCOL_C

 #include "V2Protocol.h"

+

+ParameterItem_t ParameterTable[] EEMEM = 

+	{

+		{ .ParameterID    = PARAM_BUILD_NUMBER_LOW,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_BUILD_NUMBER_HIGH,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_HW_VER,

+		  .ParameterValue = 0x01                    },

+		{ .ParameterID    = PARAM_SW_MAJOR,

+		  .ParameterValue = 0x01                    },

+		{ .ParameterID    = PARAM_SW_MINOR,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_VTARGET,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_SCK_DURATION,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_RESET_POLARITY,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_STATUS_TGT_CONN,

+		  .ParameterValue = 0x00                    },

+		{ .ParameterID    = PARAM_DISCHARGEDELAY,

+		  .ParameterValue = 0x00                    },

+	};

 
 void V2Protocol_ProcessCommand(void)
 {
 	uint8_t V2Command = Endpoint_Read_Byte();

-	

+		  

+	printf("COMMAND %d\r\n", V2Command);

+

 	switch (V2Command)

 	{

 		case CMD_SIGN_ON:

+			V2Protocol_ProcessCmdSignOn();

+			break;

+		case CMD_SET_PARAMETER:

+			V2Protocol_ProcessCmdSetParam();

+			break;

+		case CMD_GET_PARAMETER:

+			V2Protocol_ProcessCmdGetParam();

+			break;

+		default:

 			Endpoint_ClearOUT();

 			Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

-			

-			Endpoint_Write_Byte(CMD_SIGN_ON);

-			Endpoint_Write_Byte(STATUS_CMD_OK);

-			Endpoint_Write_Byte((sizeof(ProgrammerID) - 1));

-			Endpoint_Write_Stream_LE(ProgrammerID, (sizeof(ProgrammerID) - 1));			

+			Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);

 			Endpoint_ClearIN();

 			break;

-	}
+	}

+	

+	/* Reset Endpoint direction to OUT ready for next command */

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);	
+}

+

+static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID)

+{

+	for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)

+	{

+		if (ParamID == eeprom_read_byte(&ParameterTable[TableIndex].ParameterID))

+		  return &ParameterTable[TableIndex];

+	}

+	

+	return NULL;

 }
 
+static void V2Protocol_ProcessCmdSignOn(void)

+{

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+	

+	Endpoint_Write_Byte(CMD_SIGN_ON);

+	Endpoint_Write_Byte(STATUS_CMD_OK);

+	Endpoint_Write_Byte(PROGRAMMER_ID_LEN);

+	Endpoint_Write_Stream_LE(PROGRAMMER_ID, PROGRAMMER_ID_LEN);

+	Endpoint_ClearIN();

+}

+

+static void V2Protocol_ProcessCmdSetParam(void)

+{

+	uint8_t ParamID    = Endpoint_Read_Byte();

+	uint8_t ParamValue = Endpoint_Read_Byte();

+

+	ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	if (ParameterItem != NULL)

+	{

+		eeprom_write_byte(&ParameterItem->ParameterValue, ParamValue);

+

+		Endpoint_Write_Byte(CMD_SET_PARAMETER);

+		Endpoint_Write_Byte(STATUS_CMD_OK);	

+	}

+	else

+	{

+		Endpoint_Write_Byte(STATUS_CMD_FAILED);

+	}

+

+	Endpoint_ClearIN();

+}

+

+static void V2Protocol_ProcessCmdGetParam(void)

+{

+	uint8_t ParamID    = Endpoint_Read_Byte();

+

+	ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);

+	

+	Endpoint_ClearOUT();

+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

+

+	if (ParameterItem != NULL)

+	{

+		Endpoint_Write_Byte(CMD_GET_PARAMETER);

+		Endpoint_Write_Byte(STATUS_CMD_OK);

+		Endpoint_Write_Byte(eeprom_read_byte(&ParameterItem->ParameterValue));	

+	}

+	else

+	{

+		Endpoint_Write_Byte(STATUS_CMD_FAILED);

+	}

+

+	Endpoint_ClearIN();	

+}

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index 2cc7fc432..c9d39cb71 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -40,56 +40,29 @@
 		#include <avr/io.h>
 
 		#include <LUFA/Drivers/USB/USB.h>
+		
+		#include "V2ProtocolConstants.h"
 
 	/* Macros: */
-		#define CMD_SIGN_ON                 0x01
-		#define CMD_SET_PARAMETER           0x02
-		#define CMD_GET_PARAMETER           0x03
-		#define CMD_OSCCAL                  0x05
-		#define CMD_LOAD_ADDRESS            0x06
-		#define CMD_FIRMWARE_UPGRADE        0x07
-		#define CMD_RESET_PROTECTION        0x0A
-		#define CMD_ENTER_PROGMODE_ISP      0x10
-		#define CMD_LEAVE_PROGMODE_ISP      0x11
-		#define CMD_CHIP_ERASE_ISP          0x12
-		#define CMD_PROGRAM_FLASH_ISP       0x13
-		#define CMD_READ_FLASH_ISP          0x14
-		#define CMD_PROGRAM_EEPROM_ISP      0x15
-		#define CMD_READ_EEPROM_ISP         0x16
-		#define CMD_PROGRAM_FUSE_ISP        0x17
-		#define CMD_READ_FUSE_ISP           0x18
-		#define CMD_PROGRAM_LOCK_ISP        0x19
-		#define CMD_READ_LOCK_ISP           0x1A
-		#define CMD_READ_SIGNATURE_ISP      0x1B
-		#define CMD_READ_OSCCAL_ISP         0x1C
-		#define CMD_SPI_MULTI               0x1D
-
-		#define STATUS_CMD_OK               0x00
-		#define STATUS_CMD_TOUT             0x80
-		#define STATUS_RDY_BSY_TOUT         0x81
-		#define STATUS_SET_PARAM_MISSING    0x82
-		#define STATUS_CMD_FAILED           0xC0
-		#define STATUS_CMD_UNKNOWN          0xC9
-		#define STATUS_ISP_READY            0x00
-		#define STATUS_CONN_FAIL_MOSI       0x01
-		#define STATUS_CONN_FAIL_RST        0x02
-		#define STATUS_CONN_FAIL_SCK        0x04
-		#define STATUS_TGT_NOT_DETECTED     0x10
-		#define STATUS_TGT_REVERSE_INSERTED 0x20
-
-		#define PARAM_BUILD_NUMBER_LOW      0x80
-		#define PARAM_BUILD_NUMBER_HIGH     0x81
-		#define PARAM_HW_VER                0x90
-		#define PARAM_SW_MAJOR              0x91
-		#define PARAM_SW_MINOR              0x92
-		#define PARAM_VTARGET               0x94
-		#define PARAM_SCK_DURATION          0x98
-		#define PARAM_RESET_POLARITY        0x9E
-		#define PARAM_STATUS_TGT_CONN       0xA1
-		#define PARAM_DISCHARGEDELAY        0xA4
+		#define PROGRAMMER_ID       "AVRISP_MK2"
+		#define PROGRAMMER_ID_LEN   (sizeof(PROGRAMMER_ID) - 1)

+		

+	/* Type Defines: */

+		typedef struct

+		{

+			uint8_t ParameterID;

+			uint8_t ParameterValue;

+		} ParameterItem_t;
 
 	/* Function Prototypes: */	
-		void V2Protocol_ProcessCommand(void);
+		void V2Protocol_ProcessCommand(void);

+		

+		#if defined(INCLUDE_FROM_V2PROTOCOL_C)

+			static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID);

+			static void V2Protocol_ProcessCmdSignOn(void);

+			static void V2Protocol_ProcessCmdSetParam(void);

+			static void V2Protocol_ProcessCmdGetParam(void);

+		#endif
 
 #endif
 
diff --git a/Projects/AVRISP/Lib/V2ProtocolConstants.h b/Projects/AVRISP/Lib/V2ProtocolConstants.h
new file mode 100644
index 000000000..dce660a73
--- /dev/null
+++ b/Projects/AVRISP/Lib/V2ProtocolConstants.h
@@ -0,0 +1,86 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2009.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, and distribute this software

+  and its documentation for any purpose and without fee is hereby

+  granted, provided that the above copyright notice appear in all

+  copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Macros for the V2 Protocol Packet Commands and Responses.

+ */

+

+#ifndef _V2_PROTOCOL_CONSTANTS_

+#define _V2_PROTOCOL_CONSTANTS_

+

+	/* Macros: */

+		#define CMD_SIGN_ON                 0x01

+		#define CMD_SET_PARAMETER           0x02

+		#define CMD_GET_PARAMETER           0x03

+		#define CMD_OSCCAL                  0x05

+		#define CMD_LOAD_ADDRESS            0x06

+		#define CMD_FIRMWARE_UPGRADE        0x07

+		#define CMD_RESET_PROTECTION        0x0A

+		#define CMD_ENTER_PROGMODE_ISP      0x10

+		#define CMD_LEAVE_PROGMODE_ISP      0x11

+		#define CMD_CHIP_ERASE_ISP          0x12

+		#define CMD_PROGRAM_FLASH_ISP       0x13

+		#define CMD_READ_FLASH_ISP          0x14

+		#define CMD_PROGRAM_EEPROM_ISP      0x15

+		#define CMD_READ_EEPROM_ISP         0x16

+		#define CMD_PROGRAM_FUSE_ISP        0x17

+		#define CMD_READ_FUSE_ISP           0x18

+		#define CMD_PROGRAM_LOCK_ISP        0x19

+		#define CMD_READ_LOCK_ISP           0x1A

+		#define CMD_READ_SIGNATURE_ISP      0x1B

+		#define CMD_READ_OSCCAL_ISP         0x1C

+		#define CMD_SPI_MULTI               0x1D

+

+		#define STATUS_CMD_OK               0x00

+		#define STATUS_CMD_TOUT             0x80

+		#define STATUS_RDY_BSY_TOUT         0x81

+		#define STATUS_SET_PARAM_MISSING    0x82

+		#define STATUS_CMD_FAILED           0xC0

+		#define STATUS_CMD_UNKNOWN          0xC9

+		#define STATUS_ISP_READY            0x00

+		#define STATUS_CONN_FAIL_MOSI       0x01

+		#define STATUS_CONN_FAIL_RST        0x02

+		#define STATUS_CONN_FAIL_SCK        0x04

+		#define STATUS_TGT_NOT_DETECTED     0x10

+		#define STATUS_TGT_REVERSE_INSERTED 0x20

+

+		#define PARAM_BUILD_NUMBER_LOW      0x80

+		#define PARAM_BUILD_NUMBER_HIGH     0x81

+		#define PARAM_HW_VER                0x90

+		#define PARAM_SW_MAJOR              0x91

+		#define PARAM_SW_MINOR              0x92

+		#define PARAM_VTARGET               0x94

+		#define PARAM_SCK_DURATION          0x98

+		#define PARAM_RESET_POLARITY        0x9E

+		#define PARAM_STATUS_TGT_CONN       0xA1

+		#define PARAM_DISCHARGEDELAY        0xA4

+

+#endif