mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-09-10 17:15:43 +00:00
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.
This commit is contained in:
@@ -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. */
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user