pdi reads successfull

Lars · Lars · commit 2666376af129 · 2021-12-05T01:50:16.000+01:00
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
@@ -452,7 +452,7 @@
 			static inline void Endpoint_SetEndpointDirection(const uint8_t DirectionMask)
 			{
 // 				UECFG0X = ((UECFG0X & ~(1 << EPDIR)) | (DirectionMask ? (1 << EPDIR) : 0));
-				USB_Endpoint_SelectedEndpoint = (USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN) | DirectionMask;
+				//USB_Endpoint_SelectedEndpoint = (USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN) | DirectionMask;
 			}
 
 			/** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.c b/Projects/AVRISP-MKII/AVRISP-MKII.c
@@ -96,7 +96,7 @@ void SetupHardware(void)
 	#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
 	UpdateCurrentCompatibilityMode();
 	#endif
-
+	
 	/* USB Stack Initialization */
 	USB_Init();
 }
@@ -122,7 +122,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 	ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1);
 
 	/* Setup AVRISP Data IN endpoint if it is using a physically different endpoint */
-	if ((AVRISP_DATA_IN_EPADDR & ENDPOINT_EPNUM_MASK) != (AVRISP_DATA_OUT_EPADDR & ENDPOINT_EPNUM_MASK))
+	//if ((AVRISP_DATA_IN_EPADDR & ENDPOINT_EPNUM_MASK) != (AVRISP_DATA_OUT_EPADDR & ENDPOINT_EPNUM_MASK))
 	  ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1);
 
 	/* Indicate endpoint configuration success or failure */
diff --git a/Projects/AVRISP-MKII/Config/AppConfig.h b/Projects/AVRISP-MKII/Config/AppConfig.h
@@ -80,7 +80,7 @@
 		#define PDI_USART               USARTC0
 		#define PDI_PORT                PORTC
 		#define PDI_RX_MASK            (1 << 2)
-		#define PDI_RX_CTRL             PIN1CTRL
+		#define PDI_RX_CTRL             PIN2CTRL
 		
 		#define PDI_TX_MASK            (1 << 3)
 		#define PDI_TX_CTRL             PIN3CTRL
diff --git a/Projects/AVRISP-MKII/Config/LUFAConfig.h b/Projects/AVRISP-MKII/Config/LUFAConfig.h
@@ -115,8 +115,8 @@
 		#define FIXED_NUM_CONFIGURATIONS         1
 //		#define CONTROL_ONLY_DEVICE
 		#define MAX_ENDPOINT_INDEX               4
-//		#define NO_DEVICE_REMOTE_WAKEUP
-//		#define NO_DEVICE_SELF_POWER
+		#define NO_DEVICE_REMOTE_WAKEUP
+		#define NO_DEVICE_SELF_POWER
 
 	#else
 
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -102,7 +102,7 @@ void V2Protocol_ProcessCommand(void)
 #if ARCH == ARCH_AVR8
 	TCCR0B = ((1 << CS02) | (1 << CS00));
 #elif ARCH == ARCH_XMEGA
-	TCD0.CTRLA = TC_CLKSEL_DIV1024_gc; 
+	DELAY_TIMER.CTRLA = TC_CLKSEL_DIV1024_gc; 
 #endif
 	switch (V2Command)
 	{
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -255,8 +255,11 @@ bool XMEGANVM_ReadMemory(const uint32_t ReadAddress,
 	{
 		/* Send a LDS command with the read address to read out the requested byte */
 		XPROGTarget_SendByte(PDI_CMD_LDS(PDI_DATASIZE_4BYTES, PDI_DATASIZE_1BYTE));
+
 		XMEGANVM_SendAddress(ReadAddress);
+
 		*(ReadBuffer++) = XPROGTarget_ReceiveByte();
+
 	}
 
 	return (TimeoutTicksRemaining > 0);
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -216,6 +216,7 @@ void XPROGTarget_SendByte(const uint8_t Byte)
 #elif (ARCH == ARCH_XMEGA)
 	while(!(PDI_USART.STATUS & USART_DREIF_bm))
 		;
+	PDI_USART.STATUS |= USART_TXCIF_bm;
 	PDI_USART.DATA = Byte;
 #endif
 }
@@ -236,7 +237,7 @@ uint8_t XPROGTarget_ReceiveByte(void)
 		;
 	return UDR1;
 #elif (ARCH == ARCH_XMEGA)
-	while(!(PDI_USART.STATUS & USART_RXCIF_bm))
+	while(!(PDI_USART.STATUS & USART_RXCIF_bm) && TimeoutTicksRemaining)
 		;
 	return PDI_USART.DATA;
 #endif
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
@@ -11,7 +11,7 @@
 
 # Run "make help" for target help.
 
-MCU          = atxmega128a4u
+MCU          = atxmega256a3u
 ARCH         = XMEGA
 BOARD        = NONE
 F_CPU        = 32000000

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@`
`452`	`452`	`static inline void Endpoint_SetEndpointDirection(const uint8_t DirectionMask)`
`453`	`453`	`{`
`454`	`454`	`// UECFG0X = ((UECFG0X & ~(1 << EPDIR)) \| (DirectionMask ? (1 << EPDIR) : 0));`
`455`		`- USB_Endpoint_SelectedEndpoint = (USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN) \| DirectionMask;`
	`455`	`+ //USB_Endpoint_SelectedEndpoint = (USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN) \| DirectionMask;`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`/** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void V2Protocol_ProcessCommand(void)`
`102`	`102`	`#if ARCH == ARCH_AVR8`
`103`	`103`	`TCCR0B = ((1 << CS02) \| (1 << CS00));`
`104`	`104`	`#elif ARCH == ARCH_XMEGA`
`105`		`- TCD0.CTRLA = TC_CLKSEL_DIV1024_gc;`
	`105`	`+ DELAY_TIMER.CTRLA = TC_CLKSEL_DIV1024_gc;`
`106`	`106`	`#endif`
`107`	`107`	`switch (V2Command)`
`108`	`108`	`{`
Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,11 @@ bool XMEGANVM_ReadMemory(const uint32_t ReadAddress,`
`255`	`255`	`{`
`256`	`256`	`/* Send a LDS command with the read address to read out the requested byte */`
`257`	`257`	`XPROGTarget_SendByte(PDI_CMD_LDS(PDI_DATASIZE_4BYTES, PDI_DATASIZE_1BYTE));`
	`258`	`+`
`258`	`259`	`XMEGANVM_SendAddress(ReadAddress);`
	`260`	`+`
`259`	`261`	`*(ReadBuffer++) = XPROGTarget_ReceiveByte();`
	`262`	`+`
`260`	`263`	`}`
`261`	`264`
`262`	`265`	`return (TimeoutTicksRemaining > 0);`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ void XPROGTarget_SendByte(const uint8_t Byte)`
`216`	`216`	`#elif (ARCH == ARCH_XMEGA)`
`217`	`217`	`while(!(PDI_USART.STATUS & USART_DREIF_bm))`
`218`	`218`	`;`
	`219`	`+ PDI_USART.STATUS \|= USART_TXCIF_bm;`
`219`	`220`	`PDI_USART.DATA = Byte;`
`220`	`221`	`#endif`
`221`	`222`	`}`
`@@ -236,7 +237,7 @@ uint8_t XPROGTarget_ReceiveByte(void)`
`236`	`237`	`;`
`237`	`238`	`return UDR1;`
`238`	`239`	`#elif (ARCH == ARCH_XMEGA)`
`239`		`- while(!(PDI_USART.STATUS & USART_RXCIF_bm))`
	`240`	`+ while(!(PDI_USART.STATUS & USART_RXCIF_bm) && TimeoutTicksRemaining)`
`240`	`241`	`;`
`241`	`242`	`return PDI_USART.DATA;`
`242`	`243`	`#endif`