From 02b05e938b266979507915c2e887fd87c86ff26a Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 13 Mar 2019 16:31:08 +0100
Subject: arduino nano: bugfix, aspectc++ support

---
 src/arch/arduino-nano/arch.cc        | 2 ++
 src/arch/arduino-nano/driver/gpio.cc | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/arch')

diff --git a/src/arch/arduino-nano/arch.cc b/src/arch/arduino-nano/arch.cc
index 75f7f38..752b3f4 100644
--- a/src/arch/arduino-nano/arch.cc
+++ b/src/arch/arduino-nano/arch.cc
@@ -115,6 +115,7 @@ Arch arch;
 
 #if defined(WITH_LOOP) || defined(TIMER_S)
 
+#ifndef __acweaving
 ISR(TIMER1_COMPA_vect)
 {
 #ifdef WITH_LOOP
@@ -124,5 +125,6 @@ ISR(TIMER1_COMPA_vect)
 	uptime.tick_s();
 #endif
 }
+#endif
 
 #endif
diff --git a/src/arch/arduino-nano/driver/gpio.cc b/src/arch/arduino-nano/driver/gpio.cc
index 707f2bd..3b870b1 100644
--- a/src/arch/arduino-nano/driver/gpio.cc
+++ b/src/arch/arduino-nano/driver/gpio.cc
@@ -4,6 +4,7 @@
 
 GPIO gpio;
 
+#ifndef __acweaving
 ISR(PCINT0_vect)
 {
 }
@@ -15,3 +16,4 @@ ISR(PCINT1_vect)
 ISR(PCINT2_vect)
 {
 }
+#endif
-- 
cgit v1.2.3