Christina Quast b595e7cb53 Merge branch 'new_iso_init' (sniffer not working) ...

Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h

2015-04-12 13:31:01 +02:00

..

atmel_softpack_libraries

Remove redundant ccid files in atmel lib

2015-04-09 17:06:16 +02:00

cmsis

Removed sym links, replaced them with actual folders

2015-04-07 20:04:19 +02:00

include_board

Merge branch 'new_iso_init' (sniffer not working)

2015-04-12 13:31:01 +02:00

include_sam3s

ISO7816_Init: Initialized with USART

2015-04-10 17:44:49 +02:00

openocd

Renamed main folder to firmware

2015-04-07 18:24:06 +02:00

src_board

cciddriver.c: Remove ccid write printout

2015-04-11 08:43:31 +02:00

src_sam3s

Removed sym links, replaced them with actual folders

2015-04-07 20:04:19 +02:00

src_simtrace

Merge branch 'new_iso_init' (sniffer not working)

2015-04-12 13:31:01 +02:00

flash.ld

Renamed main folder to firmware

2015-04-07 18:24:06 +02:00

Makefile

Sniffer with ringbuf, works SOMETIMES

2015-04-12 09:31:36 +02:00