neingeist/arduinisten
Archived
1
0
Fork 0
Code Releases Activity

fix up arduino-0022 a bit

Browse source
This commit is contained in:
Eve Entropia 2011-03-03 02:02:03 +01:00
parent db55ca4bf7
commit da63707eed
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arduino-0022-linux-x64/arduino
View file

@ -3,6 +3,9 @@
APPDIR="$(dirname -- $(readlink -f -- "${0}") )" APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
cd $APPDIR cd $APPDIR
# Fix for F14
CLASSPATH="${CLASSPATH}:/usr/share/java/RXTXcomm.jar"
for LIB in \ for LIB in \
java/lib/rt.jar \ java/lib/rt.jar \

4
arduino-0022-linux-x64/hardware/arduino/cores/arduino/wiring.c
View file

@ -23,6 +23,7 @@
*/ */
#include "wiring_private.h" #include "wiring_private.h"
#include <avr/delay.h>
// the prescaler is set so that timer0 ticks every 64 clock cycles, and the // the prescaler is set so that timer0 ticks every 64 clock cycles, and the
// the overflow handler is called every 256 ticks. // the overflow handler is called every 256 ticks.
@ -104,6 +105,7 @@ unsigned long micros() {
void delay(unsigned long ms) void delay(unsigned long ms)
{ {
/*
uint16_t start = (uint16_t)micros(); uint16_t start = (uint16_t)micros();
while (ms > 0) { while (ms > 0) {
@ -112,6 +114,8 @@ void delay(unsigned long ms)
start += 1000; start += 1000;
} }
} }
*/
_delay_ms(ms);
} }
/* Delay for the given number of microseconds. Assumes a 8 or 16 MHz clock. */ /* Delay for the given number of microseconds. Assumes a 8 or 16 MHz clock. */