From af932ef0ceb839d2ec35af9b8ee75e2264f6652e Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Wed, 10 Oct 2012 09:13:57 -0400 Subject: [PATCH 1/2] Avoid null-pointer exception with old-style third-party hardware folders. --- app/src/processing/app/debug/TargetPlatform.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/processing/app/debug/TargetPlatform.java b/app/src/processing/app/debug/TargetPlatform.java index ca5d4aac6..9fcc51d43 100644 --- a/app/src/processing/app/debug/TargetPlatform.java +++ b/app/src/processing/app/debug/TargetPlatform.java @@ -45,6 +45,7 @@ public class TargetPlatform { name = _name; folder = _folder; boards = new HashMap(); + boardsOrder = new ArrayList(); programmers = new HashMap(); preferences = new PreferencesMap(); From 1ff87e3e72a9681dfa0ba1d8b2a10a8e8401611b Mon Sep 17 00:00:00 2001 From: Fede85 Date: Wed, 10 Oct 2012 17:35:34 +0200 Subject: [PATCH 2/2] modified TWI handler --- hardware/arduino/sam/variants/arduino_due_x/variant.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/arduino/sam/variants/arduino_due_x/variant.h b/hardware/arduino/sam/variants/arduino_due_x/variant.h index e7d720ff2..8ac0fd30f 100644 --- a/hardware/arduino/sam/variants/arduino_due_x/variant.h +++ b/hardware/arduino/sam/variants/arduino_due_x/variant.h @@ -119,13 +119,13 @@ static const uint8_t SCK = PIN_SPI_SCK ; #define PIN_WIRE_SCL (21u) #define WIRE_INTERFACE 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_SCL (71u) #define WIRE1_INTERFACE TWI0 #define WIRE1_INTERFACE_ID ID_TWI0 -#define WIRE1_ISR_HANDLER TWI0_IrqHandler +#define WIRE1_ISR_HANDLER TWI0_Handler /* * UART/USART Interfaces