projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2896935
)
pin 10 follows 13 (bug in arduino-0015?)
author
Bernhard Tittelbach
<xro@realraum.at>
Wed, 24 Mar 2010 00:22:17 +0000
(
00:22
+0000)
committer
Bernhard Tittelbach
<xro@realraum.at>
Wed, 24 Mar 2010 00:22:17 +0000
(
00:22
+0000)
rf433ctl/rf433ctl.pde
patch
|
blob
|
history
diff --git
a/rf433ctl/rf433ctl.pde
b/rf433ctl/rf433ctl.pde
index
b1aca33
..
3501cb3
100644
(file)
--- a/
rf433ctl/rf433ctl.pde
+++ b/
rf433ctl/rf433ctl.pde
@@
-11,7
+11,7
@@
#define ONE_WIRE_PIN 8
#define PANIC_BUTTON_PIN 7
#define BLUELED_PWM_PIN 6
#define ONE_WIRE_PIN 8
#define PANIC_BUTTON_PIN 7
#define BLUELED_PWM_PIN 6
-#define BLUELED2_PWM_PIN 10
+#define BLUELED2_PWM_PIN 11
#define PHOTO_ANALOGPIN 0
//movement is reported if during IR_SAMPLE_DURATION at least IR_TRESHOLD ir signals are detectd
#define IR_SAMPLE_DURATION 15000
#define PHOTO_ANALOGPIN 0
//movement is reported if during IR_SAMPLE_DURATION at least IR_TRESHOLD ir signals are detectd
#define IR_SAMPLE_DURATION 15000
@@
-274,13
+274,13
@@
void calculate_led_level(unsigned int pwm_pin)
flash_led_time_--;
int c = abs(sin(float(flash_led_time_) / 100.0)) * flash_led_brightness_;
//int d = abs(sin(float(flash_led_time_) / 100.0)) * flash_led_brightness_;
flash_led_time_--;
int c = abs(sin(float(flash_led_time_) / 100.0)) * flash_led_brightness_;
//int d = abs(sin(float(flash_led_time_) / 100.0)) * flash_led_brightness_;
- analogWrite(BLUELED2_PWM_PIN,255-c);
+ analogWrite(BLUELED2_PWM_PIN, 255-c);
if (flash_led_brightness_ == 255)
{
if (flash_led_time_)
if (flash_led_brightness_ == 255)
{
if (flash_led_time_)
- analogWrite(BLUELED_PWM_PIN,255-c);
+ analogWrite(BLUELED_PWM_PIN, 255-c);
else
else
- analogWrite(BLUELED_PWM_PIN,c);
+ analogWrite(BLUELED_PWM_PIN, c);
}
}
}
}