diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-12-31 11:21:44 -0500 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-12-31 11:21:44 -0500 |
| commit | cbce8ed4bf330973a999220dd11444b6d1181d53 (patch) | |
| tree | e0e56d3e8a6cf6b12fdde5e511d61de3375b8095 | |
| parent | 80b02232e4b8912dbaadef47ca4cf24f35fa473d (diff) | |
| parent | 3ece2827a48166d957d3e347035561d5a1104930 (diff) | |
Merge branch 'master' of github.com:arduino/Arduino into new-extension
| -rwxr-xr-x | cores/arduino/Arduino.h | 4 | ||||
| -rw-r--r-- | 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 |