diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-05-27 10:36:21 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-05-27 10:36:21 +0000 |
| commit | b5b1f19816e875a5f77de2963ecffab9dd11792e (patch) | |
| tree | 7e1f25f5fa95b9e295d490a61ab6e040588b7649 /Projects/XPLAINBridge | |
| parent | 2600cb0e7844d83f0c27c36b928ba57ba1a5156f (diff) | |
Added new VTARGET_REF_VOLTS and VTARGET_SCALE_FACTOR compile time defines to the AVRISP-MKII programmer project to set the VTARGET reference voltage and scale factor.
Fixed XPLAINBridge project not correctly reading the XMEGA's supply voltage when reporting back to the host.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1287 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/XPLAINBridge')
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 13 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.txt | 6 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/makefile | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 79e1ddb3..4f3583e6 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -86,9 +86,14 @@ int main(void) for (;;) { if (CurrentFirmwareMode == MODE_USART_BRIDGE) - USARTBridge_Task(); + { + USARTBridge_Task(); + } else - AVRISP_Task(); + { + AVRISP_Task(); + V2Params_UpdateParamValues(); + } USB_USBTask(); } @@ -147,7 +152,6 @@ void SetupHardware(void) USB_Init(); V2Protocol_Init(); - #if 0 /* Disable JTAG debugging */ MCUCR |= (1 << JTD); MCUCR |= (1 << JTD); @@ -162,9 +166,6 @@ void SetupHardware(void) /* Re-enable JTAG debugging */ MCUCR &= ~(1 << JTD); MCUCR &= ~(1 << JTD); - #endif - - CurrentFirmwareMode = MODE_USART_BRIDGE; } /** Event handler for the library USB Configuration Changed event. */ diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt index 3f9ab8ed..f22feca8 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@ -74,9 +74,9 @@ * <td><b>Description:</b></td> * </tr> * <tr> - * <td>BUFF_STATICSIZE</td> - * <td>RingBuff.h</td> - * <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td> + * <td>BUFFER_SIZE</td> + * <td>LightweightRingBuff.h</td> + * <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer when in serial bridge mode.</td> * </tr> * <tr> * <td>LIBUSB_DRIVER_COMPAT</td> diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile index c68c91da..1aefdcad 100644 --- a/Projects/XPLAINBridge/makefile +++ b/Projects/XPLAINBridge/makefile @@ -201,6 +201,8 @@ CDEFS += -DAUX_LINE_PIN=PINB CDEFS += -DAUX_LINE_DDR=DDRB CDEFS += -DAUX_LINE_MASK="(1 << 4)" CDEFS += -DVTARGET_ADC_CHANNEL=2 +CDEFS += -DVTARGET_REF_VOLTS=3.3 +CDEFS += -DVTARGET_SCALE_FACTOR=2 #CDEFS += -DLIBUSB_DRIVER_COMPAT |