Added handler for the V2 Protocol SPI_MULTI command to the AVRISP Programmer project.

Added documentation of the makefile CDEFS values to the MagStripe project.

Projects/Magstripe/Lib/CircularBitBuffer.h

@@ -53,7 +53,7 @@
 		#endif
 		
 	/* Type Defines: */
-		/* Type define for a pointer to a bit in a bit buffer. */
+		/** Type define for a pointer to a bit in a bit buffer. */
 		typedef struct
 		{
 			uint8_t* CurrentByte; /**< Pointer to the current byte in the buffer */

Projects/Magstripe/Magstripe.txt

@@ -110,5 +110,55 @@
  *    <td>CircularBitBuffer.h</td>
  *    <td>Gives the maximum number of bits per track which can be buffered by the device for later transmission to a host.</td>
  *   </tr>
+ *   <tr>
+ *    <td>MAG_T1_CLOCK</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's CLOCK line for the reader's track 1 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_T1_DATA</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's DATA line for the reader's track 1 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_T2_CLOCK</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's CLOCK line for the reader's track 2 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_T2_DATA</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's DATA line for the reader's track 2 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_T3_CLOCK</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's CLOCK line for the reader's track 3 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_T3_DATA</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's DATA line for the reader's track 3 output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_CARDPRESENT</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the magnetic card reader's card detection output.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_PIN</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>PIN register that the magnetic card reader device is attached to.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_PORT</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>PORT register that the magnetic card reader device is attached to.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>MAG_DDR</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>DDR register that the magnetic card reader device is attached to.</td>
+ *   </tr>
  *  </table>
  */

Projects/Unfinished/AVRISP/AVRISP.c

@@ -43,6 +43,8 @@ int main(void)
 {
 	SetupHardware();
 	
+	V2Protocol_ConfigureHardware();
+
 	printf("AVRISP-MKII Clone\r\n");
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
@@ -67,6 +69,7 @@ void SetupHardware(void)
 
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);
+	SPI_Init(0, true);
 	LEDs_Init();
 	USB_Init();
 }

Projects/Unfinished/AVRISP/AVRISP.h

@@ -47,6 +47,7 @@
 		#include <LUFA/Version.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
 		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Peripheral/SPI.h>
 		#include <LUFA/Drivers/USB/USB.h>
 
 		#include "Lib/V2Protocol.h"

Projects/Unfinished/AVRISP/AVRISP.txt

@@ -55,15 +55,38 @@
  *  This device spoofs Atmel's official AVRISP-MKII device PID so that it remains compatible with Atmel's AVRISP-MKII
  *  drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio.
  *
+ *  This demo contains both FLASH and EEPROM data, as compiled .HEX and .EEP files respectively. <b>Both</b> files must
+ *  be loaded into the device for it to perform correctly.
+ *
  *  \section SSec_Options Project Options
  *
  *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
  *
  *  <table>
  *   <tr>
- *    <td>
+ *    <td><b>Define Name:</b></td>
- *     None
+ *    <td><b>Location:</b></td>
- *    </td>
+ *    <td><b>Description:</b></td>
+ *   </tr>
+ *   <tr>
+ *    <td>RESET_LINE_PORT</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>PORT register for the programmer's target RESET line.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>RESET_LINE_PIN</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>PIN register for the programmer's target RESET line.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>RESET_LINE_DDR</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>DDR register for the programmer's target RESET line.</td>
+ *   </tr>
+ *   <tr>
+ *    <td>RESET_LINE_MASK</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>Mask for the programmer's target RESET line on the chosen port.</td>
  *   </tr>
  *  </table>
  */

Projects/Unfinished/AVRISP/Lib/V2Protocol.c

@@ -60,6 +60,24 @@ ParameterItem_t ParameterTable[] EEMEM =
 		  .ParameterValue = 0x00                    },
 	};
 	
+void V2Protocol_ConfigureHardware(void)
+{
+#if F_CPU == 8000000
+	uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,
+	                                    SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};
+#else
+	uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,
+	                                    SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};
+#endif
+
+	uint8_t SCKDuration = eeprom_read_byte(&V2Protocol_GetParameterItem(PARAM_SCK_DURATION)->ParameterValue);
+
+	if (SCKDuration > sizeof(SPIMaskFromSCKDuration))
+	  SCKDuration = SPIMaskFromSCKDuration;
+	  
+	SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);	
+}
+
 void V2Protocol_ProcessCommand(void)
 {
 	uint8_t V2Command = Endpoint_Read_Byte();
@@ -73,6 +91,9 @@ void V2Protocol_ProcessCommand(void)
 		case CMD_GET_PARAMETER:
 			V2Protocol_ProcessCmdGetSetParam(V2Command);
 			break;
+		case CMD_SPI_MULTI:
+			V2Protocol_ProcessCmdSPIMulti();
+			break;		
 		default:
 			while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)
 			{
@@ -83,6 +104,7 @@ void V2Protocol_ProcessCommand(void)
 			Endpoint_ClearOUT();
 			Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
+			Endpoint_Write_Byte(V2Command);
 			Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);
 			Endpoint_ClearIN();
 			break;
@@ -91,8 +113,6 @@ void V2Protocol_ProcessCommand(void)
 	printf("COMMAND 0x%02x\r\n", V2Command);
 
 	Endpoint_WaitUntilReady();	
-	
-	/* Reset Endpoint direction to OUT ready for next command */
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);	
 }
 
@@ -113,6 +133,8 @@ static void V2Protocol_ProcessCmdSignOn(void)
 	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 	Endpoint_WaitUntilReady();
 
+	V2Protocol_ConfigureHardware();
+
 	Endpoint_Write_Byte(CMD_SIGN_ON);
 	Endpoint_Write_Byte(STATUS_CMD_OK);
 	Endpoint_Write_Byte(PROGRAMMER_ID_LEN);
@@ -131,9 +153,10 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)
 	
 	ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);
 	
+	Endpoint_Write_Byte(V2Command);
+
 	if (ParameterItem != NULL)
 	{
-		Endpoint_Write_Byte(V2Command);
 		Endpoint_Write_Byte(STATUS_CMD_OK);
 
 		if (V2Command == CMD_SET_PARAMETER)
@@ -148,3 +171,51 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)
 
 	Endpoint_ClearIN();
 }
+
+static void V2Protocol_ProcessCmdSPIMulti(void)
+{
+	uint8_t TxBytes = Endpoint_Read_Byte();
+	uint8_t RxBytes = Endpoint_Read_Byte();
+	uint8_t RxStartAddr = Endpoint_Read_Byte();
+	uint8_t TxData[255];
+	
+	Endpoint_Read_Stream_LE(TxData, TxBytes);
+	
+	Endpoint_ClearOUT();
+	Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
+	Endpoint_WaitUntilReady();
+	
+	Endpoint_Write_Byte(CMD_SPI_MULTI);
+	Endpoint_Write_Byte(STATUS_CMD_OK);
+
+	uint8_t CurrTxPos = 0;
+	uint8_t CurrRxPos = 0;
+
+	while (CurrTxPos < RxStartAddr)
+	{
+		if (CurrTxPos < TxBytes)
+		  SPI_SendByte(TxData[CurrTxPos]);
+		else
+		  SPI_SendByte(0);
+		
+		CurrTxPos++;
+	}
+
+	while (CurrRxPos < RxBytes)
+	{
+		if (CurrTxPos < TxBytes)
+		{
+			Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos]));
+			CurrTxPos++;
+		}
+		else
+		{
+			Endpoint_Write_Byte(SPI_ReceiveByte());
+		}
+		
+		CurrRxPos++;
+	}	
+	
+	Endpoint_Write_Byte(STATUS_CMD_OK);
+	Endpoint_ClearIN();	
+}

Projects/Unfinished/AVRISP/Lib/V2Protocol.h

@@ -40,6 +40,7 @@
 		#include <avr/io.h>
 
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Peripheral/SPI.h>
 		
 		#include "../Descriptors.h"
 		#include "V2ProtocolConstants.h"
@@ -56,12 +57,14 @@
 		} ParameterItem_t;
 
 	/* Function Prototypes: */	
+		void V2Protocol_ConfigureHardware(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_ProcessCmdGetSetParam(uint8_t V2Command);
+			static void V2Protocol_ProcessCmdSPIMulti(void);
 		#endif
 
 #endif

Projects/Unfinished/AVRISP/makefile

@@ -193,6 +193,11 @@ CSTANDARD = -std=gnu99
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
+CDEFS += -DRESET_LINE_PORT=PORTA
+CDEFS += -DRESET_LINE_PIN=PINA
+CDEFS += -DRESET_LINE_DDR=DDRA
+CDEFS += -DRESET_LINE_MASK="(1 << 0)"
+
 
 # Place -D or -U options here for ASM sources
 ADEFS = -DF_CPU=$(F_CPU)