forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Second patch to fix incorrect PDI/TPI programming speed.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent d41cd9a41a
commit f2324fc2b4
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -101,7 +101,7 @@
* - Fixed USBtoSerial and XPLAINBridge demos discarding data from the PC if the send buffer becomes full * - Fixed USBtoSerial and XPLAINBridge demos discarding data from the PC if the send buffer becomes full
* - Fixed broken input in the MagStripe reader project due to an incorrect HID report descriptor * - Fixed broken input in the MagStripe reader project due to an incorrect HID report descriptor
* - Fixed incorrect PollingIntervalMS values in the demo/project/bootloader endpoint descriptors (thanks to MCS Electronics) * - Fixed incorrect PollingIntervalMS values in the demo/project/bootloader endpoint descriptors (thanks to MCS Electronics)
* - Fixed PDI/TPI programming speed of ~250KHz in the AVRISP-MKII Clone project, instead of the desired 500KHz * - Fixed PDI/TPI programming speed of ~250KHz in the AVRISP-MKII Clone project, instead of the desired 500KHz (thanks to Tom Light)
* *
* \section Sec_ChangeLog100807 Version 100807 * \section Sec_ChangeLog100807 Version 100807
* <b>New:</b> * <b>New:</b>

4
Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
Unescape View File

@ -66,7 +66,7 @@ void ISPProtocol_EnterISPMode(void)
/* Perform execution delay, initialize SPI bus */ /* Perform execution delay, initialize SPI bus */
ISPProtocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS); ISPProtocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);
ISPTarget_Init(); ISPTarget_EnableTargetISP();
/* Continuously attempt to synchronize with the target until either the number of attempts specified /* Continuously attempt to synchronize with the target until either the number of attempts specified
* by the host has exceeded, or the the device sends back the expected response values */ * by the host has exceeded, or the the device sends back the expected response values */
@ -118,7 +118,7 @@ void ISPProtocol_LeaveISPMode(void)
/* Perform pre-exit delay, release the target /RESET, disable the SPI bus and perform the post-exit delay */ /* Perform pre-exit delay, release the target /RESET, disable the SPI bus and perform the post-exit delay */
ISPProtocol_DelayMS(Leave_ISP_Params.PreDelayMS); ISPProtocol_DelayMS(Leave_ISP_Params.PreDelayMS);
ISPTarget_ChangeTargetResetLine(false); ISPTarget_ChangeTargetResetLine(false);
ISPTarget_ShutDown(); ISPTarget_DisableTargetISP();
ISPProtocol_DelayMS(Leave_ISP_Params.PostDelayMS); ISPProtocol_DelayMS(Leave_ISP_Params.PostDelayMS);
Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP); Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP);

4
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
Unescape View File

@ -142,7 +142,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
/** Initialises the appropriate SPI driver (hardware or software, depending on the selected ISP speed) ready for /** Initialises the appropriate SPI driver (hardware or software, depending on the selected ISP speed) ready for
* communication with the attached target. * communication with the attached target.
*/ */
void ISPTarget_Init(void) void ISPTarget_EnableTargetISP(void)
{ {
uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION); uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);
@ -167,7 +167,7 @@ void ISPTarget_Init(void)
/** Shuts down the current selected SPI driver (hardware or software, depending on the selected ISP speed) so that no /** Shuts down the current selected SPI driver (hardware or software, depending on the selected ISP speed) so that no
* further communications can occur until the driver is re-initialized. * further communications can occur until the driver is re-initialized.
*/ */
void ISPTarget_ShutDown(void) void ISPTarget_DisableTargetISP(void)
{ {
if (HardwareSPIMode) if (HardwareSPIMode)
{ {

4
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
Unescape View File

@ -69,8 +69,8 @@
extern bool HardwareSPIMode; extern bool HardwareSPIMode;
/* Function Prototypes: */ /* Function Prototypes: */
void ISPTarget_Init(void); void ISPTarget_EnableTargetISP(void);
void ISPTarget_ShutDown(void); void ISPTarget_DisableTargetISP(void);
void ISPTarget_ConfigureRescueClock(void); void ISPTarget_ConfigureRescueClock(void);
void ISPTarget_ConfigureSoftwareISP(const uint8_t SCKDuration); void ISPTarget_ConfigureSoftwareISP(const uint8_t SCKDuration);
uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte); uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte);

1
Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
Unescape View File

@ -113,7 +113,6 @@
extern uint16_t XPROG_Param_EEPageSize; extern uint16_t XPROG_Param_EEPageSize;
extern uint8_t XPROG_Param_NVMCSRRegAddr; extern uint8_t XPROG_Param_NVMCSRRegAddr;
extern uint8_t XPROG_Param_NVMCMDRegAddr; extern uint8_t XPROG_Param_NVMCMDRegAddr;
extern uint8_t XPROG_SelectedProtocol;
/* Function Prototypes: */ /* Function Prototypes: */
void XPROGProtocol_SetMode(void); void XPROGProtocol_SetMode(void);

2
Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
Unescape View File

@ -55,7 +55,7 @@ void XPROGTarget_EnableTargetPDI(void)
_delay_us(1); _delay_us(1);
/* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */ /* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */
UBRR1 = (F_CPU / XPROG_HARDWARE_SPEED); UBRR1 = ((F_CPU / 2 / XPROG_HARDWARE_SPEED) - 1);
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1); UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);

Write Preview
Loading…
Cancel
Save