From f1a76708088659850b98a92779a2cb1aaf5793d8 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sun, 13 Jul 2008 19:26:59 +0000
Subject: Changing pin outs on LiquidCrystal examples and adding parentheses to
Servo code.
---
libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde | 2 +-
libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde | 2 +-
libraries/Servo/Servo.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde b/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
index d514215..f755d9c 100644
--- a/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
+++ b/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
@@ -1,6 +1,6 @@
#include <LiquidCrystal.h>
-LiquidCrystal lcd(12, 11, 2, 7, 8, 9, 10);
+LiquidCrystal lcd(12, 11, 10, 5, 4, 3, 2);
void setup()
{
diff --git a/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde b/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
index c1f405a..6e4336c 100644
--- a/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
+++ b/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
@@ -1,6 +1,6 @@
#include <LiquidCrystal.h>
-LiquidCrystal lcd(12, 11, 2, 7, 8, 9, 10);
+LiquidCrystal lcd(12, 11, 10, 5, 4, 3, 2);
void setup()
{
diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp
index 4d04145..248a215 100755
--- a/libraries/Servo/Servo.cpp
+++ b/libraries/Servo/Servo.cpp
@@ -69,12 +69,12 @@ uint8_t Servo::attach(int pinArg)
if (pin == 9) {
attached9 = 1;
- TCCR1A = TCCR1A & ~_BV(COM1A0) | _BV(COM1A1);
+ TCCR1A = (TCCR1A & ~_BV(COM1A0)) | _BV(COM1A1);
}
if (pin == 10) {
attached10 = 1;
- TCCR1A = TCCR1A & ~_BV(COM1B0) | _BV(COM1B1);
+ TCCR1A = (TCCR1A & ~_BV(COM1B0)) | _BV(COM1B1);
}
return 1;
}
--
cgit v1.2.3-18-g5258