diff options
author | Dean Camera <[email protected]> | 2010-05-27 10:36:21 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-05-27 10:36:21 +0000 |
commit | 3b95b8dedced6c118cfb2cd7fc72c696c076119e (patch) | |
tree | 7e1f25f5fa95b9e295d490a61ab6e040588b7649 /Projects/XPLAINBridge/XPLAINBridge.c | |
parent | 8d993afc5388c5f3d0ff568c607f7fed6bb7390e (diff) | |
download | qmk_firmware-3b95b8dedced6c118cfb2cd7fc72c696c076119e.tar.gz qmk_firmware-3b95b8dedced6c118cfb2cd7fc72c696c076119e.zip |
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.
Diffstat (limited to 'Projects/XPLAINBridge/XPLAINBridge.c')
-rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 79e1ddb32e..4f3583e689 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. */ |