@ -116,7 +116,7 @@ BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);
# define AVRDEVCODE02 0x56 /* ATtiny15 */ # define AVRDEVCODE02 0x56 /* ATtiny15 */
# define AVRDEVCODE03 0x5E /* ATtiny261 */ # define AVRDEVCODE03 0x5E /* ATtiny261 */
# define AVRDEVCODE04 0x76 /* ATmega8 */ # define AVRDEVCODE04 0x76 /* ATmega8 */
# define AVRDEVCODE05 0x74 /* ATmega16 */# define AVRDEVCODE05 0x74 /* ATmega16 */
# define AVRDEVCODE06 0x72 /* ATmega32 */ # define AVRDEVCODE06 0x72 /* ATmega32 */
# define AVRDEVCODE07 0x45 /* ATmega64 */ # define AVRDEVCODE07 0x45 /* ATmega64 */
# define AVRDEVCODE08 0x74 /* ATmega644 */ # define AVRDEVCODE08 0x74 /* ATmega644 */
@ -155,20 +155,8 @@ RingBuff_t Tx_Buffer;
/** Flag to indicate if the USART is currently transmitting data from the Rx_Buffer circular buffer. */ /** Flag to indicate if the USART is currently transmitting data from the Rx_Buffer circular buffer. */
volatile bool Transmitting = false ; volatile bool Transmitting = false ;
/* some global variables used throughout */ /* some global variables used throughout */
uint8_t tempIOreg = 0 ;
uint8_t tempIOreg2 = 0 ;
uint8_t tempIOreg3 = 0 ;
uint8_t tempIOreg4 = 0 ;
uint8_t dataWidth = 0 ;
uint8_t firstRun = 1 ;
uint8_t deviceCode = 0 ;
uint8_t tempByte = 0 ;
uint16_t currAddress = 0 ; uint16_t currAddress = 0 ;
uint16_t timerval = 0 ;
/** Main program entry point. This routine configures the hardware required by the application, then
/** Main program entry point. This routine configures the hardware required by the application, then
starts the scheduler to run the application tasks .
starts the scheduler to run the application tasks .
@ -185,9 +173,7 @@ int main(void)
/* Hardware Initialization */
/* Hardware Initialization */
LEDs_Init ( ) ;
LEDs_Init ( ) ;
ReconfigureSPI ( ) ;
ReconfigureSPI ( ) ;
// prepare PortB
DDRB = 0 ;
PORTB = 0 ;
DDRC | = ( ( 1 < < PC2 ) | ( 1 < < PC4 ) | ( 1 < < PC5 ) | ( 1 < < PC6 ) | ( 1 < < PC7 ) ) ; //AT90USBxx2
DDRC | = ( ( 1 < < PC2 ) | ( 1 < < PC4 ) | ( 1 < < PC5 ) | ( 1 < < PC6 ) | ( 1 < < PC7 ) ) ; //AT90USBxx2
// PC2 is also used for RESET, so set it HIGH initially - note 'P' command sets it to LOW (Active)
// PC2 is also used for RESET, so set it HIGH initially - note 'P' command sets it to LOW (Active)
PORTC | = ( ( 1 < < PC2 ) | ( 1 < < PC4 ) | ( 1 < < PC5 ) | ( 1 < < PC6 ) | ( 1 < < PC7 ) ) ; //AT90USBxx2
PORTC | = ( ( 1 < < PC2 ) | ( 1 < < PC4 ) | ( 1 < < PC5 ) | ( 1 < < PC6 ) | ( 1 < < PC7 ) ) ; //AT90USBxx2
@ -198,15 +184,7 @@ int main(void)
PORTB | = ( 1 < < PB0 ) ;
PORTB | = ( 1 < < PB0 ) ;
// make sure DataFlash devices to not interfere - deselect them by setting PE0 and PE1 HIGH:
// make sure DataFlash devices to not interfere - deselect them by setting PE0 and PE1 HIGH:
PORTE = 0xFF ;
PORTE = 0xFF ;
DDRE = 0xFF ;
DDRE = 0xFF ;
// initialize Timer1 for use in delay function
TCCR1A = 0 ;
//TCCR1B = (1 << CS10); // no prescaling, use CLK
TCCR1B = ( ( 1 < < CS12 ) | ( 1 < < CS10 ) ) ; // prescale by CLK/1024
// 8MHz/1024 = 7813 ticks per second --> ~8 ticks per millisecond (ms)
timerval = TCNT1 ; // start timer1
/* Ringbuffer Initialization */
/* Ringbuffer Initialization */
Buffer_Initialize ( & Rx_Buffer ) ;
Buffer_Initialize ( & Rx_Buffer ) ;
@ -320,17 +298,6 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
case REQ_SetControlLineState :
case REQ_SetControlLineState :
if ( bmRequestType = = ( REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE ) )
if ( bmRequestType = = ( REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE ) )
{
{
#if 0
/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake
lines . The mask is read in from the wValue parameter , and can be masked against the CONTROL_LINE_OUT_ * masks
to determine the RTS and DTR line states using the following code :
*/
uint16_t wIndex = Endpoint_Read_Word_LE ( ) ;
// Do something with the given line states in wIndex
# endif
/* Acknowedge the SETUP packet, ready for data transfer */
/* Acknowedge the SETUP packet, ready for data transfer */
Endpoint_ClearSetupReceived ( ) ;
Endpoint_ClearSetupReceived ( ) ;
@ -347,30 +314,6 @@ TASK(CDC_Task)
{ {
if ( USB_IsConnected )
if ( USB_IsConnected )
{
{
#if 0
/* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232
handshake signal lines ( and some error states ) , via the CONTROL_LINE_IN_ * masks and the following code :
*/
USB_Notification_Header_t Notification = ( USB_Notification_Header_t )
{
NotificationType : ( REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE ) ,
Notification : NOTIF_SerialState ,
wValue : 0 ,
wIndex : 0 ,
wLength : sizeof ( uint16_t ) ,
} ;
uint16_t LineStateMask ;
// Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host
Endpoint_SelectEndpoint ( CDC_NOTIFICATION_EPNUM ) ;
Endpoint_Write_Stream_LE ( & Notification , sizeof ( Notification ) ) ;
Endpoint_Write_Stream_LE ( & LineStateMask , sizeof ( LineStateMask ) ) ;
Endpoint_ClearCurrentBank ( ) ;
# endif
/* Select the Serial Rx Endpoint */
/* Select the Serial Rx Endpoint */
Endpoint_SelectEndpoint ( CDC_RX_EPNUM ) ;
Endpoint_SelectEndpoint ( CDC_RX_EPNUM ) ;
@ -385,72 +328,41 @@ TASK(CDC_Task)
/* Store each character from the endpoint */
/* Store each character from the endpoint */
Buffer_StoreElement ( & Rx_Buffer , Endpoint_Read_Byte ( ) ) ;
Buffer_StoreElement ( & Rx_Buffer , Endpoint_Read_Byte ( ) ) ;
/* Run the given command once enough data is available. */
if ( Rx_Buffer . Elements )
{
/* Each time there is an element, check which comand should be
const uint8_t ZeroDataByteCommands [ ] = { ' P ' , ' a ' , ' m ' , ' R ' , ' d ' , ' e ' , ' L ' , ' s ' , ' t ' , ' S ' , ' V ' , ' v ' , ' p ' , ' F ' } ;
run and if enough data is available to run that command .
const uint8_t OneDataByteCommands [ ] = { ' T ' , ' c ' , ' C ' , ' D ' , ' l ' , ' f ' , ' x ' , ' y ' } ;
There are 1 - byte , 2 - byte , 3 - byte , 4 - byte commands , and 5 - byte commands
const uint8_t TwoDataByteCommands [ ] = { ' A ' , ' Z ' } ;
Remember that the " which command " byte counts as 1 */
const uint8_t ThreeDataByteCommands [ ] = { ' : ' } ;
if ( Rx_Buffer . Elements = = 0 ) {
const uint8_t FourDataByteCommands [ ] = { ' . ' } ;
// do nothing, wait for data
} else {
const struct
tempByte = Buffer_PeekElement ( & Rx_Buffer ) ; // peek at first element
{
const uint8_t TotalCommands ;
/* make sure the issued command and associated data are all ready */
const uint8_t * CommandBytes ;
if ( Rx_Buffer . Elements = = 1 ) { // zero data byte command
} AVR910Commands [ ] = { { sizeof ( ZeroDataByteCommands ) , ZeroDataByteCommands } ,
if ( ( tempByte = = ' P ' ) | ( tempByte = = ' a ' ) | ( tempByte = = ' m ' ) |
{ sizeof ( OneDataByteCommands ) , OneDataByteCommands } ,
( tempByte = = ' R ' ) | ( tempByte = = ' d ' ) | ( tempByte = = ' e ' ) |
{ sizeof ( TwoDataByteCommands ) , TwoDataByteCommands } ,
( tempByte = = ' L ' ) | ( tempByte = = ' s ' ) | ( tempByte = = ' t ' ) |
{ sizeof ( ThreeDataByteCommands ) , ThreeDataByteCommands } ,
( tempByte = = ' S ' ) | ( tempByte = = ' V ' ) | ( tempByte = = ' v ' ) |
{ sizeof ( FourDataByteCommands ) , FourDataByteCommands } } ;
( tempByte = = ' p ' ) | ( tempByte = = ' F ' ) ) {
processHostSPIRequest ( ) ; // command has enough data, process it
/* Determine the data length of the issued command */
}
uint8_t CommandDataLength = ( Rx_Buffer . Elements - 1 ) ;
} else if ( Rx_Buffer . Elements = = 2 ) { // one data byte command
if ( ( tempByte = = ' T ' ) | ( tempByte = = ' c ' ) | ( tempByte = = ' C ' ) |
/* Loop through each of the possible command bytes allowable from the given command data length */
( tempByte = = ' D ' ) | ( tempByte = = ' l ' ) | ( tempByte = = ' f ' ) |
for ( uint8_t CurrentCommand = 0 ; CurrentCommand < AVR910Commands [ CommandDataLength ] . TotalCommands ; CurrentCommand + + )
( tempByte = = ' x ' ) | ( tempByte = = ' y ' ) ) {
{
processHostSPIRequest ( ) ; // command has enough data, process it
/* If issues command matches an allowable command, process it */
}
if ( Buffer_PeekElement ( & Rx_Buffer ) = = AVR910Commands [ CommandDataLength ] . CommandBytes [ CurrentCommand ] )
} else if ( Rx_Buffer . Elements = = 3 ) { // two data byte command
processHostSPIRequest ( ) ;
if ( ( tempByte = = ' A ' ) | ( tempByte = = ' Z ' ) ) {
}
processHostSPIRequest ( ) ; // command has enough data, process it
}
} else if ( Rx_Buffer . Elements = = 4 ) { // three data byte command
if ( ( tempByte = = ' : ' ) ) {
processHostSPIRequest ( ) ; // command has enough data, process it
}
} else if ( Rx_Buffer . Elements = = 5 ) { // four data byte command
if ( ( tempByte = = ' . ' ) ) {
processHostSPIRequest ( ) ; // command has enough data, process it
}
} else {
// do nothing
}
}
}
}
}
/* Clear the endpoint buffer */
/* Clear the endpoint buffer */
Endpoint_ClearCurrentBank ( ) ;
Endpoint_ClearCurrentBank ( ) ;
}
}
/* Check if Rx buffer contains data */
if ( Rx_Buffer . Elements )
{
/* Initiate the transmission of the buffer contents if USART idle */
if ( ! ( Transmitting ) )
{
Transmitting = true ;
/* The following flushes the receive buffer to prepare for new data and commands */
/* Need to flush the buffer as the command byte which is peeked above needs to be */
/* dealt with, otherwise the command bytes will overflow the buffer eventually */
//Buffer_GetElement(&Rx_Buffer); // works also
Buffer_Initialize ( & Rx_Buffer ) ;
}
}
/* Select the Serial Tx Endpoint */
/* Select the Serial Tx Endpoint */
Endpoint_SelectEndpoint ( CDC_TX_EPNUM ) ;
Endpoint_SelectEndpoint ( CDC_TX_EPNUM ) ;
@ -484,12 +396,10 @@ TASK(CDC_Task)
}
}
} }
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
log to a serial port , or anything else that is suitable for status updates .
* log to a serial port , or anything else that is suitable for status updates .
*
*
\ param CurrentStatus Current status of the system , from the USBtoSerial_StatusCodes_t enum
* \ param CurrentStatus Current status of the system , from the USBtoSerial_StatusCodes_t enum
*/
*/
void UpdateStatus ( uint8_t CurrentStatus ) void UpdateStatus ( uint8_t CurrentStatus )
{ {
@ -513,22 +423,12 @@ void UpdateStatus(uint8_t CurrentStatus)
LEDs_SetAllLEDs ( LEDMask ) ;
LEDs_SetAllLEDs ( LEDMask ) ;
} }
/** Reconfigures SPI to match the current serial port settings issued by the host. */ /** Reconfigures SPI to match the current serial port settings issued by the host. */
void ReconfigureSPI ( void ) void ReconfigureSPI ( void )
{ {
uint8_t SPCRmask = ( 1 < < SPE ) | ( 1 < < MSTR ) ; // always enable SPI as Master
uint8_t SPCRmask = ( 1 < < SPE ) | ( 1 < < MSTR ) ; // always enable SPI as Master
uint8_t SPSRmask = 0 ;
uint8_t SPSRmask = 0 ;
/* Determine data width */
if ( LineCoding . ParityType = = Parity_Odd ) {
dataWidth = 16 ;
} else if ( LineCoding . ParityType = = Parity_Even ) {
dataWidth = 32 ;
} else if ( LineCoding . ParityType = = Parity_None ) {
dataWidth = 8 ;
}
/* Determine stop bits - 1.5 stop bits is set as 1 stop bit due to hardware limitations */
/* Determine stop bits - 1.5 stop bits is set as 1 stop bit due to hardware limitations */
/* For SPI, determine whether format is LSB or MSB */
/* For SPI, determine whether format is LSB or MSB */
if ( LineCoding . CharFormat = = TwoStopBits ) {
if ( LineCoding . CharFormat = = TwoStopBits ) {
@ -579,14 +479,6 @@ void ReconfigureSPI(void)
SPCR = SPCRmask ;
SPCR = SPCRmask ;
SPSR = SPSRmask ;
SPSR = SPSRmask ;
// only read if first run
if ( firstRun ) {
tempIOreg = SPSR ; //need to read to initiliaze
tempIOreg = SPDR ; //need to read to initiliaze
firstRun = 0 ;
}
} }
@ -642,20 +534,20 @@ void processHostSPIRequest(void) {
//PORTB = 0; // set clock to zero
//PORTB = 0; // set clock to zero
RESETPORT = ( 1 < < RESETPIN ) ; // set RESET pin on target to 1
RESETPORT = ( 1 < < RESETPIN ) ; // set RESET pin on target to 1
RESETPORT2 = ( 1 < < RESETPIN2 ) ;
RESETPORT2 = ( 1 < < RESETPIN2 ) ;
( DELAY_SHORT ) ;
_ delay_ms( DELAY_SHORT ) ;
//RESETPORT = (RESETPORT & ~(1 << RESETPIN)); // set RESET pin on target to 0 - Active
//RESETPORT = (RESETPORT & ~(1 << RESETPIN)); // set RESET pin on target to 0 - Active
RESETPORT = 0x00 ;
RESETPORT = 0x00 ;
RESETPORT2 = 0 ;
RESETPORT2 = 0 ;
( DELAY_SHORT ) ;
_ delay_ms( DELAY_SHORT ) ;
SPI_SendByte ( 0xAC ) ;
SPI_SendByte ( 0xAC ) ;
SPI_SendByte ( 0x53 ) ;
SPI_SendByte ( 0x53 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
( DELAY_VERYSHORT ) ;
_ delay_ms( DELAY_VERYSHORT ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' T ' ) { // Select device type
} else if ( firstByte = = ' T ' ) { // Select device type
deviceCode = Buffer_GetElement ( & Rx_Buffer ) ; // set device type
Buffer_GetElement ( & Rx_Buffer ) ; // set device type
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' a ' ) { // Report autoincrement address
} else if ( firstByte = = ' a ' ) { // Report autoincrement address
@ -675,7 +567,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( readByte1 ) ; // data
SPI_SendByte ( readByte1 ) ; // data
( DELAY_MEDIUM ) ; // certain MCUs require a delay of about 24585 cycles
_ delay_ms( DELAY_MEDIUM ) ; // certain MCUs require a delay of about 24585 cycles
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' C ' ) { // Write program memory, high byte
} else if ( firstByte = = ' C ' ) { // Write program memory, high byte
@ -694,7 +586,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
( DELAY_LONG ) ;
_ delay_ms( DELAY_LONG ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' R ' ) { // Read Program Memory
} else if ( firstByte = = ' R ' ) { // Read Program Memory
@ -719,7 +611,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress > > 8 ) ) ; // high byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( ( currAddress ) ) ; // low byte
SPI_SendByte ( readByte1 ) ; // data
SPI_SendByte ( readByte1 ) ; // data
( DELAY_MEDIUM ) ;
_ delay_ms( DELAY_MEDIUM ) ;
currAddress + + ; // increment currAddress
currAddress + + ; // increment currAddress
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
@ -738,7 +630,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( 0x80 ) ;
SPI_SendByte ( 0x80 ) ;
SPI_SendByte ( 0x04 ) ;
SPI_SendByte ( 0x04 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
( DELAY_LONG ) ;
_ delay_ms( DELAY_LONG ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' l ' ) { // write lock bits
} else if ( firstByte = = ' l ' ) { // write lock bits
@ -748,7 +640,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( ( ( 0x06 & readByte1 ) | 0xE0 ) ) ; // TODO - is this correct???
SPI_SendByte ( ( ( 0x06 & readByte1 ) | 0xE0 ) ) ; // TODO - is this correct???
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
SPI_SendByte ( 0x00 ) ;
( DELAY_MEDIUM ) ;
_ delay_ms( DELAY_MEDIUM ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' f ' ) { // write fuse bits
} else if ( firstByte = = ' f ' ) { // write fuse bits
@ -840,7 +732,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( readByte3 ) ;
SPI_SendByte ( readByte3 ) ;
readByte1 = SPI_TransferByte ( 0x00 ) ;
readByte1 = SPI_TransferByte ( 0x00 ) ;
Buffer_StoreElement ( & Tx_Buffer , readByte1 ) ;
Buffer_StoreElement ( & Tx_Buffer , readByte1 ) ;
( DELAY_MEDIUM ) ;
_ delay_ms( DELAY_MEDIUM ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' . ' ) { // New Universal Command
} else if ( firstByte = = ' . ' ) { // New Universal Command
@ -854,7 +746,7 @@ void processHostSPIRequest(void) {
SPI_SendByte ( readByte3 ) ;
SPI_SendByte ( readByte3 ) ;
readByte1 = SPI_TransferByte ( readByte4 ) ;
readByte1 = SPI_TransferByte ( readByte4 ) ;
Buffer_StoreElement ( & Tx_Buffer , readByte1 ) ;
Buffer_StoreElement ( & Tx_Buffer , readByte1 ) ;
( DELAY_MEDIUM ) ;
_ delay_ms( DELAY_MEDIUM ) ;
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
Buffer_StoreElement ( & Tx_Buffer , CR_HEX ) ; // return carriage return (CR_HEX) if successful
} else if ( firstByte = = ' Z ' ) { // Special test command
} else if ( firstByte = = ' Z ' ) { // Special test command
@ -868,19 +760,3 @@ void processHostSPIRequest(void) {
}
}
} }
void delay_ms ( uint8_t dly ) {
uint16_t endtime = 0 ;
endtime = TCNT1 ;
if ( endtime > 63486 ) {
endtime = ( dly * DELAY_MULTIPLE ) ;
} else {
endtime + = ( dly * DELAY_MULTIPLE ) ;
}
timerval = TCNT1 ;
while ( timerval < endtime ) {
timerval = TCNT1 ;
}
}
Dean Camera
16 years ago