summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/arch/arduino-nano/driver/counter.h4
-rw-r--r--src/arch/arduino-nano/arch.cc2
-rw-r--r--src/arch/arduino-nano/driver/gpio.cc2
3 files changed, 6 insertions, 2 deletions
diff --git a/include/arch/arduino-nano/driver/counter.h b/include/arch/arduino-nano/driver/counter.h
index 5685136..c4fc447 100644
--- a/include/arch/arduino-nano/driver/counter.h
+++ b/include/arch/arduino-nano/driver/counter.h
@@ -1,8 +1,8 @@
#include <avr/io.h>
#include <avr/interrupt.h>
-typedef counter_value_t uint16_t;
-typedef counter_overflow_t uint8_t;
+typedef uint16_t counter_value_t;
+typedef uint8_t counter_overflow_t;
class Counter {
private:
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