Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
ac0ece01
Commit
ac0ece01
authored
Jul 22, 2010
by
Dean Camera
Browse files
Added start of a low level device Test and Measurement class demo (thanks to Peter Lawrence).
parent
e6f37221
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Demos/Device/Incomplete/Sideshow/Sideshow.c
View file @
ac0ece01
...
...
@@ -115,7 +115,6 @@ void EVENT_USB_Device_ConfigurationChanged(void)
void
EVENT_USB_Device_UnhandledControlRequest
(
void
)
{
/* Process UFI specific control requests */
switch
(
USB_ControlRequest
.
bRequest
)
{
case
REQ_GetOSFeatureDescriptor
:
...
...
Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
0 → 100644
View file @
ac0ece01
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
/*
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Copyright 2010 Peter Lawrence (majbthrd [at] gmail [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
The author disclaim all warranties with regard to this
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
/** \file
*
* USB Device Descriptors, for library use when in USB device mode. Descriptors are special
* computer-readable structures which the host requests upon device enumeration, to determine
* the device's capabilities and functions.
*/
#include
"Descriptors.h"
/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
* the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
* This allows the host to track a device across insertions on different ports, allowing them to retain allocated
* resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices
* so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value
* from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and
* port location).
*/
#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)
#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.
#endif
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
* device characteristics, including the supported USB version, control endpoint size and the
* number of device configurations. The descriptor is read out by the USB host when the enumeration
* process begins.
*/
USB_Descriptor_Device_t
PROGMEM
DeviceDescriptor
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Device_t
),
.
Type
=
DTYPE_Device
},
.
USBSpecification
=
VERSION_BCD
(
02
.
00
),
.
Class
=
0x00
,
.
SubClass
=
0x00
,
.
Protocol
=
0x00
,
.
Endpoint0Size
=
FIXED_CONTROL_ENDPOINT_SIZE
,
.
VendorID
=
0x03EB
,
.
ProductID
=
0x2065
,
.
ReleaseNumber
=
0x0000
,
.
ManufacturerStrIndex
=
0x01
,
.
ProductStrIndex
=
0x02
,
.
SerialNumStrIndex
=
USE_INTERNAL_SERIAL
,
.
NumberOfConfigurations
=
FIXED_NUM_CONFIGURATIONS
};
/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
* of the device in one of its supported configurations, including information about any device interfaces
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
* a configuration so that the host may correctly communicate with the USB device.
*/
USB_Descriptor_Configuration_t
PROGMEM
ConfigurationDescriptor
=
{
.
Config
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Configuration_Header_t
),
.
Type
=
DTYPE_Configuration
},
.
TotalConfigurationSize
=
sizeof
(
USB_Descriptor_Configuration_t
),
.
TotalInterfaces
=
1
,
.
ConfigurationNumber
=
1
,
.
ConfigurationStrIndex
=
NO_DESCRIPTOR
,
.
ConfigAttributes
=
(
USB_CONFIG_ATTR_BUSPOWERED
|
USB_CONFIG_ATTR_SELFPOWERED
),
.
MaxPowerConsumption
=
USB_CONFIG_POWER_MA
(
100
)
},
.
Interface
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Interface_t
),
.
Type
=
DTYPE_Interface
},
.
InterfaceNumber
=
0x00
,
.
AlternateSetting
=
0x00
,
.
TotalEndpoints
=
2
,
.
Class
=
0xFE
,
.
SubClass
=
0x03
,
.
Protocol
=
0x01
,
.
InterfaceStrIndex
=
NO_DESCRIPTOR
},
.
DataOutEndpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Endpoint_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_OUT
|
TMC_OUT_EPNUM
),
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
.
EndpointSize
=
TMC_IO_EPSIZE
,
.
PollingIntervalMS
=
0x00
},
.
DataInEndpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Endpoint_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
(
ENDPOINT_DESCRIPTOR_DIR_IN
|
TMC_IN_EPNUM
),
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
.
EndpointSize
=
TMC_IO_EPSIZE
,
.
PollingIntervalMS
=
0x00
}
};
/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
*/
USB_Descriptor_String_t
PROGMEM
LanguageString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
1
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
{
LANGUAGE_ID_ENG
}
};
/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
USB_Descriptor_String_t
PROGMEM
ManufacturerString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
11
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
L"Dean Camera"
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
USB_Descriptor_String_t
PROGMEM
ProductString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
13
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
L"LUFA TMC Demo"
};
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
* to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
uint16_t
CALLBACK_USB_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
void
**
const
DescriptorAddress
)
{
const
uint8_t
DescriptorType
=
(
wValue
>>
8
);
const
uint8_t
DescriptorNumber
=
(
wValue
&
0xFF
);
void
*
Address
=
NULL
;
uint16_t
Size
=
NO_DESCRIPTOR
;
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
break
;
}
*
DescriptorAddress
=
Address
;
return
Size
;
}
Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
0 → 100644
View file @
ac0ece01
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
/*
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Copyright 2010 Peter Lawrence (majbthrd [at] gmail [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
The author disclaim all warranties with regard to this
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
/** \file
*
* Header file for Descriptors.c.
*/
#ifndef _DESCRIPTORS_H_
#define _DESCRIPTORS_H_
/* Includes: */
#include
<avr/pgmspace.h>
#include
<LUFA/Drivers/USB/USB.h>
/* Macros: */
/** Endpoint number of the TMC device-to-host data IN endpoint. */
#define TMC_IN_EPNUM 3
/** Endpoint number of the TMC host-to-device data OUT endpoint. */
#define TMC_OUT_EPNUM 4
/** Size in bytes of the TMC data endpoints. */
#define TMC_IO_EPSIZE 64
/* Type Defines: */
/** Type define for the device configuration descriptor structure. This must be defined in the
* application code, as the configuration descriptor contains several sub-descriptors which
* vary between devices, and which describe the device's usage to the host.
*/
typedef
struct
{
USB_Descriptor_Configuration_Header_t
Config
;
USB_Descriptor_Interface_t
Interface
;
USB_Descriptor_Endpoint_t
DataOutEndpoint
;
USB_Descriptor_Endpoint_t
DataInEndpoint
;
}
USB_Descriptor_Configuration_t
;
/* Function Prototypes: */
uint16_t
CALLBACK_USB_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
void
**
const
DescriptorAddress
)
ATTR_WARN_UNUSED_RESULT
ATTR_NON_NULL_PTR_ARG
(
3
);
#endif
Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
0 → 100644
View file @
ac0ece01
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
/*
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
The author disclaim all warranties with regard to this
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
#include
"TestAndMeasurement.h"
/** Main program entry point. This routine contains the overall program flow, including initial
* setup of all components and the main program loop.
*/
int
main
(
void
)
{
SetupHardware
();
LEDs_SetAllLEDs
(
LEDMASK_USB_NOTREADY
);
sei
();
for
(;;)
{
TMC_Task
();
USB_USBTask
();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void
SetupHardware
(
void
)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR
&=
~
(
1
<<
WDRF
);
wdt_disable
();
/* Disable clock division */
clock_prescale_set
(
clock_div_1
);
/* Hardware Initialization */
LEDs_Init
();
USB_Init
();
}
void
EVENT_USB_Device_Connect
(
void
)
{
LEDs_SetAllLEDs
(
LEDMASK_USB_ENUMERATING
);
}
void
EVENT_USB_Device_Disconnect
(
void
)
{
LEDs_SetAllLEDs
(
LEDMASK_USB_NOTREADY
);
}
void
EVENT_USB_Device_ConfigurationChanged
(
void
)
{
LEDs_SetAllLEDs
(
LEDMASK_USB_READY
);
/* Setup TMC In and Out Endpoints */
if
(
!
(
Endpoint_ConfigureEndpoint
(
TMC_IN_EPNUM
,
EP_TYPE_BULK
,
ENDPOINT_DIR_IN
,
TMC_IO_EPSIZE
,
ENDPOINT_BANK_SINGLE
)))
{
LEDs_SetAllLEDs
(
LEDMASK_USB_ERROR
);
}
if
(
!
(
Endpoint_ConfigureEndpoint
(
TMC_OUT_EPNUM
,
EP_TYPE_BULK
,
ENDPOINT_DIR_OUT
,
TMC_IO_EPSIZE
,
ENDPOINT_BANK_SINGLE
)))
{
LEDs_SetAllLEDs
(
LEDMASK_USB_ERROR
);
}
}
void
EVENT_USB_Device_UnhandledControlRequest
(
void
)
{
switch
(
USB_ControlRequest
.
bRequest
)
{
case
Req_InitiateAbortBulkOut
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_ENDPOINT
))
{
}
break
;
case
Req_CheckAbortBulkOutStatus
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_ENDPOINT
))
{
}
break
;
case
Req_InitiateAbortBulkIn
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_ENDPOINT
))
{
}
break
;
case
Req_CheckAbortBulkInStatus
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_ENDPOINT
))
{
}
break
;
case
Req_InitiateClear
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_INTERFACE
))
{
}
break
;
case
Req_CheckClearStatus
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_INTERFACE
))
{
}
break
;
case
Req_GetCapabilities
:
if
(
USB_ControlRequest
.
bmRequestType
==
(
REQDIR_DEVICETOHOST
|
REQTYPE_CLASS
|
REQREC_INTERFACE
))
{
}
break
;
}
}
void
TMC_Task
(
void
)
{
/* Device must be connected and configured for the task to run */
if
(
USB_DeviceState
!=
DEVICE_STATE_Configured
)
return
;
}
Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
0 → 100644
View file @
ac0ece01
/*
LUFA Library
Copyright (C) Dean Camera, 2010.
dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com
*/
/*
Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
The author disclaim all warranties with regard to this
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
#ifndef _TESTANDMEASUREMENT_H_
#define _TESTANDMEASUREMENT_H_
/* Includes: */
#include
<avr/io.h>
#include
<avr/wdt.h>
#include
<avr/power.h>
#include
<avr/interrupt.h>
#include
"Descriptors.h"
#include
<LUFA/Version.h>
#include
<LUFA/Drivers/USB/USB.h>
#include
<LUFA/Drivers/Board/LEDs.h>
/* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
#define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
#define Req_InitiateAbortBulkOut 0x01
#define Req_CheckAbortBulkOutStatus 0x02
#define Req_InitiateAbortBulkIn 0x03
#define Req_CheckAbortBulkInStatus 0x04
#define Req_InitiateClear 0x05
#define Req_CheckClearStatus 0x06
#define Req_GetCapabilities 0x07
#define Req_IndicatorPulse 0x40
/* Function Prototypes: */
void
SetupHardware
(
void
);
void
TMC_Task
(
void
);
void
EVENT_USB_Device_Connect
(
void
);
void
EVENT_USB_Device_Disconnect
(
void
);
void
EVENT_USB_Device_ConfigurationChanged
(
void
);
void
EVENT_USB_Device_UnhandledControlRequest
(
void
);
#endif
Demos/Device/Incomplete/TestAndMeasurement/makefile
0 → 100644
View file @
ac0ece01
This diff is collapsed.
Click to expand it.
LUFA.pnproj
View file @
ac0ece01
This diff is collapsed.
Click to expand it.
LUFA/ManPages/ChangeLog.txt
View file @
ac0ece01
...
...
@@ -17,6 +17,7 @@
* - Added new AVRStudio 4 project files for all library demos, projects and bootloaders
* - Added ability to set the serial baud rate via the user's terminal in the XPLAINBridge project
* - Added new LUFA module variables for the different source modules in the core library makefile to simplify project makefiles
* - Added start of a new Test and Measurement class demo (thanks to Peter Lawrence)
*
* <b>Changed:</b>
* - The RingBuff library code has been replaced in the XPLAINBridge, Benito and USBtoSerial projects with an ultra lightweight
...
...
LUFA/ManPages/VIDAndPIDValues.txt
View file @
ac0ece01
...
...
@@ -289,7 +289,7 @@
* 0x2065
* </td>
* <td>
*
<i>Currently Unallocated</i>
*
Test and Measurement Demo
* </td>
* </tr>
*
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment