diff options
| author | Othmar Gsenger <otti@wirdorange.org> | 2013-01-28 00:44:41 +0000 |
|---|---|---|
| committer | Othmar Gsenger <otti@wirdorange.org> | 2013-01-28 00:44:41 +0000 |
| commit | a2f7f19e12da5401b35c5369854fea20e44b77ac (patch) | |
| tree | e260ac7151738f2429997bb63cf210f810813bad /usb-i2c-sl018 | |
| parent | bugfixed (diff) | |
added serial support
git-svn-id: https://svn.spreadspace.org/avr/trunk@87 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'usb-i2c-sl018')
| -rw-r--r-- | usb-i2c-sl018/Makefile | 4 | ||||
| -rw-r--r-- | usb-i2c-sl018/tuer-rfid.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index bd66f1f..fe5103c 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -39,9 +39,9 @@ LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\""
-LUFA_COMPONENTS := USB USBCLASS TWI
+LUFA_COMPONENTS := USB USBCLASS TWI SERIAL
include ../include.mk
update-keys: update-keys.c
- gcc -o $@ $<
\ No newline at end of file + gcc -o $@ $<
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index bc58484..ae21e9d 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -38,6 +38,7 @@ #include "led.h"
#include "LUFA/Drivers/Peripheral/TWI.h"
+#include "LUFA/Drivers/Peripheral/Serial.h"
#include "LUFA/Drivers/Misc/RingBuffer.h"
#include <avr/eeprom.h>
@@ -126,6 +127,10 @@ 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);
}
void EVENT_USB_Device_ControlRequest(void)
@@ -291,7 +296,7 @@ void handle_cmd(uint8_t cmd) case 's': //get eeprom size
fprintf(usb,"%d\n\r",EEPROM_SIZE);
break;
- default: fprintf(usb, "error, unknown command %2X\n\r",cmd); return;
+ default: fprintf(usb, "error, unknown command %02X\n\r",cmd); return;
}
}
@@ -332,7 +337,8 @@ int main(void) USB_Init();
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000));
sei();
- CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,usb);
+ Serial_Init(115200,false);
+ Serial_CreateStream(usb);
for(;;) {
int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
if(BytesReceived > 0) {
|