diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-04-05 08:09:12 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-04-05 08:09:12 +0000 |
| commit | fa1a092901319b3b41bf09e0c4cb9cbbec470d6b (patch) | |
| tree | aa75acf5f00faa999f4622ce8754fe713d312b23 /Projects/AVRISP-MKII | |
| parent | fd96b288824caaa3ee4e5e03887f016de9df80cf (diff) | |
| download | lufa-fa1a092901319b3b41bf09e0c4cb9cbbec470d6b.tar.gz lufa-fa1a092901319b3b41bf09e0c4cb9cbbec470d6b.tar.bz2 lufa-fa1a092901319b3b41bf09e0c4cb9cbbec470d6b.zip | |
Add user callback function to the Bluetooth host demo to filter out connections from remote devices. Add in ability to reject connections based on their bluetooth device address.
Clean up RelayBoard project code.
Make AVRISP project clear the XMEGA target's reset register twice; this does not appear to take affect properly the first time under some circumstances.
Diffstat (limited to 'Projects/AVRISP-MKII')
| -rw-r--r-- | Projects/AVRISP-MKII/Descriptors.h | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h index 9f6a41208..3a4828364 100644 --- a/Projects/AVRISP-MKII/Descriptors.h +++ b/Projects/AVRISP-MKII/Descriptors.h @@ -42,7 +42,7 @@ #include <LUFA/Drivers/USB/USB.h>
/* Macros: */
- #if !defined(WIN_LIBUSB_COMPAT)
+ #if !defined(LIBUSB_FILTERDRV_COMPAT)
/** Endpoint number of the AVRISP data OUT endpoint. */
#define AVRISP_DATA_OUT_EPNUM 2
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c index ef86e30f2..cc521ce87 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c @@ -179,6 +179,10 @@ static void XPROGProtocol_LeaveXPROGMode(void) XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
XPROGTarget_SendByte(0x00);
+ /* Do it twice to make sure it takes affect (silicon bug?) */
+ XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
+ XPROGTarget_SendByte(0x00);
+
XPROGTarget_DisableTargetPDI();
}
else
|