From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 31 Dec 2017 05:47:06 +0000 (+1100)
Subject: Merge pull request #109 from NicoHood/hid_reserved_keycode
X-Git-Tag: LUFA-210130~76
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/2f00be53bc3c072946f4bf1ccffb32996f1fc4fa?hp=8b03486da02acf2f57f5d6219e04da93aea75122

Merge pull request #109 from NicoHood/hid_reserved_keycode

Added HID_KEYBOARD_SC_RESERVED (thanks to Nico Hood).
---

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 0455329c3..283d8f4ca 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -39,7 +39,7 @@
 #if defined(ENABLE_XPROG_PROTOCOL) || defined(__DOXYGEN__)
 
 /** Flag to indicate if the USART is currently in Tx or Rx mode. */
-bool IsSending;
+static bool IsSending;
 
 /** Enables the target's PDI interface, holding the target in reset until PDI mode is exited. */
 void XPROGTarget_EnableTargetPDI(void)
@@ -50,10 +50,15 @@ void XPROGTarget_EnableTargetPDI(void)
 	DDRD |=  (1 << 5) | (1 << 3);
 	DDRD &= ~(1 << 2);
 
-	/* Set DATA line high for at least 90ns to disable /RESET functionality */
-	PORTD |= (1 << 3);
+	/* Set Tx (PDI CLOCK) high, DATA line low for at least 90ns to disable /RESET functionality */
+	PORTD |=  (1 << 5);
+	PORTD &= ~(1 << 3);
 	_delay_us(100);
 
+	/* Set DATA line high (enables PDI interface after 16 PDI CLK cycles) */
+	PORTD |= (1 << 3);
+	_delay_us(20);
+
 	/* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */
 	UBRR1  = ((F_CPU / 2 / XPROG_HARDWARE_SPEED) - 1);
 	UCSR1B = (1 << TXEN1);