rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-06 01:08:25 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:arduino/ARM

Browse Source
This commit is contained in:
Cristian Maglie 2012-10-10 18:47:48 +02:00
commit 66b4aac3c8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/processing/app/debug/TargetPlatform.java
View File

@ -45,6 +45,7 @@ public class TargetPlatform {
name = _name; name = _name;
folder = _folder; folder = _folder;
boards = new HashMap<String, PreferencesMap>(); boards = new HashMap<String, PreferencesMap>();
boardsOrder = new ArrayList<String>();
programmers = new HashMap<String, PreferencesMap>(); programmers = new HashMap<String, PreferencesMap>();
preferences = new PreferencesMap(); preferences = new PreferencesMap();

4
hardware/arduino/sam/variants/arduino_due_x/variant.h
View File

@ -119,13 +119,13 @@ static const uint8_t SCK = PIN_SPI_SCK ;
#define PIN_WIRE_SCL (21u) #define PIN_WIRE_SCL (21u)
#define WIRE_INTERFACE TWI1 #define WIRE_INTERFACE TWI1
#define WIRE_INTERFACE_ID ID_TWI1 #define WIRE_INTERFACE_ID ID_TWI1
#define WIRE_ISR_HANDLER TWI1_IrqHandler #define WIRE_ISR_HANDLER TWI1_Handler
#define PIN_WIRE1_SDA (70u) #define PIN_WIRE1_SDA (70u)
#define PIN_WIRE1_SCL (71u) #define PIN_WIRE1_SCL (71u)
#define WIRE1_INTERFACE TWI0 #define WIRE1_INTERFACE TWI0
#define WIRE1_INTERFACE_ID ID_TWI0 #define WIRE1_INTERFACE_ID ID_TWI0
#define WIRE1_ISR_HANDLER TWI0_IrqHandler #define WIRE1_ISR_HANDLER TWI0_Handler
/* /*
* UART/USART Interfaces * UART/USART Interfaces