From 9edabf17a023830b6d61256b604ed1904dfbf1ee Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sat, 31 Dec 2011 17:29:36 +0100 Subject: [PATCH] Merge remote-tracking branch 'arduino/master' into platforms-b --- cores/arduino/Arduino.h | 4 ++-- programmers.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index c05b919..bfec943 100755 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -73,8 +73,8 @@ extern "C"{ #define noInterrupts() cli() #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L ) -#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (F_CPU / 1000L) ) -#define microsecondsToClockCycles(a) ( ((a) * (F_CPU / 1000L)) / 1000L ) +#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() ) +#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() ) #define lowByte(w) ((uint8_t) ((w) & 0xff)) #define highByte(w) ((uint8_t) ((w) >> 8)) diff --git a/programmers.txt b/programmers.txt index b4b12ef..02457d9 100644 --- a/programmers.txt +++ b/programmers.txt @@ -21,4 +21,4 @@ parallel.force=true arduinoisp.name=Arduino as ISP arduinoisp.communication=serial arduinoisp.protocol=stk500v1 -arduinoisp.speed=19200 +arduinoisp.speed=9600