diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2013-01-28 01:17:58 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2013-01-28 01:17:58 +0000 |
| commit | 47fe1beb8996f15bb1ffe25f6646d20fc29c364a (patch) | |
| tree | 9493fead4654110c564f6efcf3a4757d0e67cb6e /usb-i2c-sl018 | |
| parent | added serial support (diff) | |
switching between serial and usb works now
git-svn-id: https://svn.spreadspace.org/avr/trunk@88 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'usb-i2c-sl018')
| -rw-r--r-- | usb-i2c-sl018/tuer-rfid.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index ae21e9d..ec36d6e 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -21,7 +21,7 @@ */
#define TAG_STA_PIN PINB
-#define TAG_STA_BIT 4
+#define TAG_STA_BIT 7
// #define PIN_B_INTERRUPT 1<<TAG_STA_BIT
//#define PIN_C_INTERRUPT 0
//#define PIN_D_INTERRUPT 0
@@ -127,18 +127,21 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface = void EVENT_USB_Device_ConfigurationChanged(void)
{
CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
- if (USB_Device_ConfigurationNumber)
- CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,usb);
- else
- Serial_CreateStream(usb);
+ CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,usb);
}
void EVENT_USB_Device_ControlRequest(void)
{
CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
}
+
+void EVENT_USB_Device_Disconnect(void)
+{
+ Serial_CreateStream(usb);
+}
/* end LUFA CDC-ACM specific definitions*/
+
unsigned char sl018_send_buffer(const unsigned char * buffer)
{
uint8_t len = 0;
|