projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1e831f3
)
fixed serial init
author
Christian Pointner
<equinox@realraum.at>
Sun, 14 Mar 2010 18:25:59 +0000
(18:25 +0000)
committer
Christian Pointner
<equinox@realraum.at>
Sun, 14 Mar 2010 18:25:59 +0000
(18:25 +0000)
rf433ctl/rf433ctl.pde
patch
|
blob
|
history
diff --git
a/rf433ctl/rf433ctl.pde
b/rf433ctl/rf433ctl.pde
index
915f298
..
2cf589a
100644
(file)
--- a/
rf433ctl/rf433ctl.pde
+++ b/
rf433ctl/rf433ctl.pde
@@
-289,6
+289,8
@@
void setup()
pinMode(PANIC_BUTTON_PIN, INPUT); // set pin to input
digitalWrite(PANIC_BUTTON_PIN, HIGH); // turn on pullup resistors
analogWrite(BLUELED_PWM_PIN,0);
pinMode(PANIC_BUTTON_PIN, INPUT); // set pin to input
digitalWrite(PANIC_BUTTON_PIN, HIGH); // turn on pullup resistors
analogWrite(BLUELED_PWM_PIN,0);
+
+ Serial.begin(9600);
onewire.reset();
onewire.reset_search();
onewire.reset();
onewire.reset_search();
@@
-296,9
+298,7
@@
void setup()
//in case we change temp sensor:
if (!dallas_sensors.getAddress(onShieldTemp, 0))
Serial.println("Error: Unable to find address for Device 0");
//in case we change temp sensor:
if (!dallas_sensors.getAddress(onShieldTemp, 0))
Serial.println("Error: Unable to find address for Device 0");
- dallas_sensors.setResolution(onShieldTemp, 9);
-
- Serial.begin(9600);
+ dallas_sensors.setResolution(onShieldTemp, 9);
}
unsigned int ir_time=IR_SAMPLE_DURATION;
}
unsigned int ir_time=IR_SAMPLE_DURATION;