noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Caterina changes to support Micro. includes newly rebuilt version of the bootloader merged with Blink produced using 1.0.2

This commit is contained in:
Zachary Eveland 2012-11-23 16:09:32 -05:00
parent b532d96564
commit d92a86f7b7
5 changed files with 1041 additions and 1048 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitignore vendored
View File

@ -1,18 +0,0 @@
app/bin/
app/pde.jar
build/macosx/work/
core/bin/
core/core.jar
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
hardware/arduino/bootloaders/caterina_LUFA/Caterina.o
hardware/arduino/bootloaders/caterina_LUFA/Caterina.map
hardware/arduino/bootloaders/caterina_LUFA/Caterina.lst
hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
hardware/arduino/bootloaders/caterina_LUFA/.dep/
.gitignore
build/windows/work/
build/linux/work/

2048
hardware/arduino/bootloaders/caterina/Caterina-Micro.hex
View File

File diff suppressed because it is too large Load Diff

15
hardware/arduino/bootloaders/caterina/Caterina.h
View File

@ -69,10 +69,17 @@
#define L_LED_OFF() PORTC &= ~(1<<7)
#define L_LED_ON() PORTC |= (1<<7)
#define L_LED_TOGGLE() PORTC ^= (1<<7)
#define TX_LED_OFF() PORTD |= (1<<5)
#define TX_LED_ON() PORTD &= ~(1<<5)
#define RX_LED_OFF() PORTB |= (1<<0)
#define RX_LED_ON() PORTB &= ~(1<<0)
#if DEVICE_PID == 0x0037 // polarity of the RX and TX LEDs is reversed on the Micro
#define TX_LED_OFF() PORTD &= ~(1<<5)
#define TX_LED_ON() PORTD |= (1<<5)
#define RX_LED_OFF() PORTB &= ~(1<<0)
#define RX_LED_ON() PORTB |= (1<<0)
#else
#define TX_LED_OFF() PORTD |= (1<<5)
#define TX_LED_ON() PORTD &= ~(1<<5)
#define RX_LED_OFF() PORTB |= (1<<0)
#define RX_LED_ON() PORTB &= ~(1<<0)
#endif
/* Type Defines: */
/** Type define for a non-returning pointer to the start of the loaded application in flash memory. */

2
hardware/arduino/bootloaders/caterina/Descriptors.c
View File

@ -195,6 +195,8 @@ const USB_Descriptor_String_t ProductString =
#if DEVICE_PID == 0x0036
.UnicodeString = L"Arduino Leonardo"
#elif DEVICE_PID == 0x0037
.UnicodeString = L"Arduino Micro "
#else
.UnicodeString = L"USB IO board "
#endif

6
hardware/arduino/bootloaders/caterina/Makefile
View File

@ -47,6 +47,7 @@
#----------------------------------------------------------------------------
# USB vendor ID (VID)
# reuse of this VID by others is forbidden by USB-IF
# official Arduino LLC VID
# VID = 0x2341
@ -54,7 +55,8 @@
# USB product ID (PID)
# official Leonardo PID
# PID = 0x0036
# official Micro PID
# PID = 0x0037
# MCU name
MCU = atmega32u4
@ -123,7 +125,7 @@ OBJDIR = .
# Path to the LUFA library
LUFA_PATH = ../../../../../LUFA-111009
LUFA_PATH = ../../../../../../LUFA/LUFA-111009
# LUFA library compile-time options and predefined tokens