From f5d800564d1728271d4e77211c6307265e8c8bf8 Mon Sep 17 00:00:00 2001 From: Ryan Brideau Date: Tue, 21 Apr 2015 22:28:31 -0300 Subject: [PATCH 1/4] Updated bounce library --- .gitignore | 1 + sketch_06_07/sketch_06_07.ino | 24 ++++++++++++++++++++++++ sketch_06_07/sketch_06_07.pde | 26 -------------------------- 3 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 .gitignore create mode 100644 sketch_06_07/sketch_06_07.ino delete mode 100644 sketch_06_07/sketch_06_07.pde diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72f1563 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +._* \ No newline at end of file diff --git a/sketch_06_07/sketch_06_07.ino b/sketch_06_07/sketch_06_07.ino new file mode 100644 index 0000000..bb37ac2 --- /dev/null +++ b/sketch_06_07/sketch_06_07.ino @@ -0,0 +1,24 @@ +#include + +int inputPin = 5; +int ledPin = 13; + +int ledValue = LOW; +Bounce bouncer = Bounce(); + +void setup() { + pinMode(ledPin, OUTPUT); + + pinMode(inputPin, INPUT); + digitalWrite(inputPin, HIGH); + + bouncer.attach(inputPin); + bouncer.interval(5); +} + +void loop() { + if (bouncer.update() && bouncer.read() == LOW) { + ledValue = ! ledValue; + digitalWrite(ledPin, ledValue); + } +} diff --git a/sketch_06_07/sketch_06_07.pde b/sketch_06_07/sketch_06_07.pde deleted file mode 100644 index 39d3fc6..0000000 --- a/sketch_06_07/sketch_06_07.pde +++ /dev/null @@ -1,26 +0,0 @@ -//sketch 06-07 - -#include - -int inputPin = 5; -int ledPin = 13; - -int ledValue = LOW; -Bounce bouncer = Bounce(inputPin, 5); - -void setup() -{ - pinMode(inputPin, INPUT); - digitalWrite(inputPin, HIGH); - pinMode(ledPin, OUTPUT); -} - -void loop() -{ - if (bouncer.update() && bouncer.read() == LOW) - { - ledValue = ! ledValue; - digitalWrite(ledPin, ledValue); - } -} - From f004623186a30ae0852391475a2b7b71d2013327 Mon Sep 17 00:00:00 2001 From: Ryan Brideau Date: Tue, 21 Apr 2015 22:29:29 -0300 Subject: [PATCH 2/4] Updated code to compile with new IDE --- sketch_08_01/sketch_08_01.ino | 111 +++++++++++++++++++++++++++++++++ sketch_08_01/sketch_08_01.pde | 112 ---------------------------------- 2 files changed, 111 insertions(+), 112 deletions(-) create mode 100644 sketch_08_01/sketch_08_01.ino delete mode 100644 sketch_08_01/sketch_08_01.pde diff --git a/sketch_08_01/sketch_08_01.ino b/sketch_08_01/sketch_08_01.ino new file mode 100644 index 0000000..aa13cef --- /dev/null +++ b/sketch_08_01/sketch_08_01.ino @@ -0,0 +1,111 @@ +// sketch 08-01 +#include +int ledPin = 13; +int dotDelay = 200; + +const PROGMEM char sA[] = ".-"; +const PROGMEM char sB[] = "-..."; +const PROGMEM char sC[] = "-.-."; +const PROGMEM char sD[] = "-.."; +const PROGMEM char sE[] = "."; +const PROGMEM char sF[] = "..-."; +const PROGMEM char sG[] = "--."; +const PROGMEM char sH[] = "...."; +const PROGMEM char sI[] = ".."; +const PROGMEM char sJ[] = ".---"; +const PROGMEM char sK[] = "-.-"; +const PROGMEM char sL[] = ".-.."; +const PROGMEM char sM[] = "--"; +const PROGMEM char sN[] = "-."; +const PROGMEM char sO[] = "---"; +const PROGMEM char sP[] = ".--."; +const PROGMEM char sQ[] = "--.-"; +const PROGMEM char sR[] = ".-."; +const PROGMEM char sS[] = "..."; +const PROGMEM char sT[] = "-"; +const PROGMEM char sU[] = "..-"; +const PROGMEM char sV[] = "...-"; +const PROGMEM char sW[] = ".--"; +const PROGMEM char sX[] = "-..-"; +const PROGMEM char sY[] = "-.--"; +const PROGMEM char sZ[] = "--.."; + +const PROGMEM char* const letters[] = {sA, sB, sC, sD, sE, sF, sG, sH, sI, sJ, sK, sL, sM, + sN, sO, sP, sQ, sR, sS, sT, sU, sV, sW, sX, sY, sZ}; + +const PROGMEM char s0[] = "-----"; +const PROGMEM char s1[] = ".----"; +const PROGMEM char s2[] = "..---"; +const PROGMEM char s3[] = "...--"; +const PROGMEM char s4[] = "....-"; +const PROGMEM char s5[] = "....."; +const PROGMEM char s6[] = "-...."; +const PROGMEM char s7[] = "--..."; +const PROGMEM char s8[] = "---.."; +const PROGMEM char s9[] = "----."; + + +const PROGMEM char* const numbers[] = {s0, s1, s2, s3, s4, s5, s6, s7, s8, s9}; + +char buffer[6]; + +void setup() +{ + pinMode(ledPin, OUTPUT); + Serial.begin(9600); +} + +void loop() +{ + char ch; + if (Serial.available() > 0) + { + ch = Serial.read(); + if (ch >= 'a' && ch <= 'z') + { + strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - 'a']))); + flashSequence(buffer); + } + else if (ch >= 'A' && ch <= 'Z') + { + strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - 'A']))); + flashSequence(buffer); + } + else if (ch >= '0' && ch <= '9') + { + strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - '0']))); + flashSequence(buffer); + } + else if (ch == ' ') + { + delay(dotDelay * 4); // gap between words + } + } +} + +void flashSequence(char* sequence) +{ + int i = 0; + while (sequence[i] != NULL) + { + flashDotOrDash(sequence[i]); + i++; + } + delay(dotDelay * 3); // gap between letters +} + +void flashDotOrDash(char dotOrDash) +{ + digitalWrite(ledPin, HIGH); + if (dotOrDash == '.') + { + delay(dotDelay); + } + else // must be a dash + { + delay(dotDelay * 3); + } + digitalWrite(ledPin, LOW); + delay(dotDelay); // gap between flashes +} + diff --git a/sketch_08_01/sketch_08_01.pde b/sketch_08_01/sketch_08_01.pde deleted file mode 100644 index 8daf31c..0000000 --- a/sketch_08_01/sketch_08_01.pde +++ /dev/null @@ -1,112 +0,0 @@ -// sketch 08-01 -#include -int ledPin = 13; -int dotDelay = 200; - -PROGMEM prog_char sA[] = ".-"; -PROGMEM prog_char sB[] = "-..."; -PROGMEM prog_char sC[] = "-.-."; -PROGMEM prog_char sD[] = "-.."; -PROGMEM prog_char sE[] = "."; -PROGMEM prog_char sF[] = "..-."; -PROGMEM prog_char sG[] = "--."; -PROGMEM prog_char sH[] = "...."; -PROGMEM prog_char sI[] = ".."; -PROGMEM prog_char sJ[] = ".---"; -PROGMEM prog_char sK[] = "-.-"; -PROGMEM prog_char sL[] = ".-.."; -PROGMEM prog_char sM[] = "--"; -PROGMEM prog_char sN[] = "-."; -PROGMEM prog_char sO[] = "---"; -PROGMEM prog_char sP[] = ".--."; -PROGMEM prog_char sQ[] = "--.-"; -PROGMEM prog_char sR[] = ".-."; -PROGMEM prog_char sS[] = "..."; -PROGMEM prog_char sT[] = "-"; -PROGMEM prog_char sU[] = "..-"; -PROGMEM prog_char sV[] = "...-"; -PROGMEM prog_char sW[] = ".--"; -PROGMEM prog_char sX[] = "-..-"; -PROGMEM prog_char sY[] = "-.--"; -PROGMEM prog_char sZ[] = "--.."; - -PROGMEM const char* letters[] = {sA, sB, sC, sD, sE, sF, sG, sH, sI, sJ, sK, sL, sM, - sN, sO, sP, sQ, sR, sS, sT, sU, sV, sW, sX, sY, sZ}; - -PROGMEM prog_char s0[] = "-----"; -PROGMEM prog_char s1[] = ".----"; -PROGMEM prog_char s2[] = "..---"; -PROGMEM prog_char s3[] = "...--"; -PROGMEM prog_char s4[] = "....-"; -PROGMEM prog_char s5[] = "....."; -PROGMEM prog_char s6[] = "-...."; -PROGMEM prog_char s7[] = "--..."; -PROGMEM prog_char s8[] = "---.."; -PROGMEM prog_char s9[] = "----."; - - -PROGMEM const char* numbers[] = {s0, s1, s2, s3, s4, s5, s6, s7, s8, s9}; - -char buffer[6]; - -void setup() -{ - pinMode(ledPin, OUTPUT); - Serial.begin(9600); -} - -void loop() -{ - char ch; - if (Serial.available() > 0) - { - ch = Serial.read(); - if (ch >= 'a' && ch <= 'z') - { - strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - 'a']))); - flashSequence(buffer); - } - else if (ch >= 'A' && ch <= 'Z') - { - strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - 'A']))); - flashSequence(buffer); - } - else if (ch >= '0' && ch <= '9') - { - strcpy_P(buffer, (char*)pgm_read_word(&(letters[ch - '0']))); - flashSequence(buffer); - } - else if (ch == ' ') - { - delay(dotDelay * 4); // gap between words - } - } -} - -void flashSequence(char* sequence) -{ - int i = 0; - while (sequence[i] != NULL) - { - flashDotOrDash(sequence[i]); - i++; - } - delay(dotDelay * 3); // gap between letters -} - -void flashDotOrDash(char dotOrDash) -{ - digitalWrite(ledPin, HIGH); - if (dotOrDash == '.') - { - delay(dotDelay); - } - else // must be a dash - { - delay(dotDelay * 3); - } - digitalWrite(ledPin, LOW); - delay(dotDelay); // gap between flashes -} - - From ed88c97b74da1f0c47a30229ffdee7b4ab1f3ddf Mon Sep 17 00:00:00 2001 From: Ryan Brideau Date: Tue, 21 Apr 2015 22:59:07 -0300 Subject: [PATCH 3/4] Added opening comment --- sketch_06_07/sketch_06_07.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sketch_06_07/sketch_06_07.ino b/sketch_06_07/sketch_06_07.ino index bb37ac2..929daa3 100644 --- a/sketch_06_07/sketch_06_07.ino +++ b/sketch_06_07/sketch_06_07.ino @@ -1,3 +1,5 @@ +//sketch 06-07 + #include int inputPin = 5; From 3020fe24e4ec75a25dbaa278f949837dcb57d73c Mon Sep 17 00:00:00 2001 From: Ryan Brideau Date: Wed, 22 Apr 2015 08:29:52 -0300 Subject: [PATCH 4/4] Changed extensions back --- sketch_06_07/{sketch_06_07.ino => sketch_06_07.pde} | 0 sketch_08_01/{sketch_08_01.ino => sketch_08_01.pde} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sketch_06_07/{sketch_06_07.ino => sketch_06_07.pde} (100%) rename sketch_08_01/{sketch_08_01.ino => sketch_08_01.pde} (100%) diff --git a/sketch_06_07/sketch_06_07.ino b/sketch_06_07/sketch_06_07.pde similarity index 100% rename from sketch_06_07/sketch_06_07.ino rename to sketch_06_07/sketch_06_07.pde diff --git a/sketch_08_01/sketch_08_01.ino b/sketch_08_01/sketch_08_01.pde similarity index 100% rename from sketch_08_01/sketch_08_01.ino rename to sketch_08_01/sketch_08_01.pde