Commit 17de96ac authored 10 years ago by daid

Merge branch 'Marlin_v1' into revert-1154-sd_sorting

Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h

parents ab355a90 7458bfe2

Branches

Tags

Show whitespace changes

Inline Side-by-side

Showing

ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/boards.txt 23 additions, 0 deletions

ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/boards.txt
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/OMC/bootloader-644-20MHz.hex 75 additions, 0 deletions

...hardware/OMC_tkj/bootloaders/OMC/bootloader-644-20MHz.hex
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT.c 713 additions, 0 deletions

....0.x/hardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT.c
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_324P.hex 121 additions, 0 deletions

...rdware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_324P.hex
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_644.hex 120 additions, 0 deletions

...ardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_644.hex
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_644P.hex 121 additions, 0 deletions

...rdware/OMC_tkj/bootloaders/atmega644p/ATmegaBOOT_644P.hex
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/Makefile 56 additions, 0 deletions

...no_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/Makefile
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/README.txt 0 additions, 0 deletions

..._1.0.x/hardware/OMC_tkj/bootloaders/atmega644p/README.txt
ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/variants/sanguino/pins_arduino.h 269 additions, 0 deletions

...o_1.0.x/hardware/OMC_tkj/variants/sanguino/pins_arduino.h
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/boards.txt 0 additions, 0 deletions

ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/boards.txt
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c 0 additions, 0 deletions

...0.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168.c
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex 0 additions, 0 deletions

...anguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p.hex
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex 0 additions, 0 deletions

...uino/bootloaders/atmega/ATmegaBOOT_168_atmega1284p_8m.hex
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex 0 additions, 0 deletions

...Sanguino/bootloaders/atmega/ATmegaBOOT_168_atmega644p.hex
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega/Makefile 0 additions, 0 deletions

...duino_1.0.x/hardware/Sanguino/bootloaders/atmega/Makefile
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c 0 additions, 0 deletions

...0.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst 0 additions, 0 deletions

...hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf 0 additions, 0 deletions

...dware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.elf
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex 0 additions, 0 deletions

...dware/Sanguino/bootloaders/atmega644p/ATmegaBOOT_644P.hex
ArduinoAddons/Arduino_1.0.x/hardware/Sanguino/bootloaders/atmega644p/Makefile 0 additions, 0 deletions

...o_1.0.x/hardware/Sanguino/bootloaders/atmega644p/Makefile

with 1498 additions and 0 deletions

Please register or to comment