Skip to content

Commit

Permalink
Merge pull request #2 from Tatskaari/master
Browse files Browse the repository at this point in the history
Removed \r from serial prints
  • Loading branch information
Jonathan Poole committed Dec 9, 2015
2 parents 3471ebb + 56dba28 commit 0654f7e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions christmas.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef __christmas_h_
#define __christmas_h_

#define HO_HO_HO "HO! HO! HO!"
#define MERRY_CHRISTMAS "Merry Christmas!"
#define HAPPY_NEW_YEAR "Happy New Year!"
#define HO_HO_HO "HO! HO! HO!\n"
#define MERRY_CHRISTMAS "Merry Christmas!\n"
#define HAPPY_NEW_YEAR "Happy New Year!\n"

void initialise();
void tick();
Expand Down
6 changes: 3 additions & 3 deletions christmas_arduino_led_example.ino
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ void initialise(){
//These methods are called when HO_HO_HO, MERRY_CHRISTMASS and HAPPY_NEW_YEAR are received over serial
void ho_ho_ho(){
is_red_on = !is_red_on;
Serial.println(MERRY_CHRISTMAS);
Serial.print(MERRY_CHRISTMAS);
}

void merry_christmas(){
is_green_on = !is_green_on;
Serial.println(HAPPY_NEW_YEAR);
Serial.print(HAPPY_NEW_YEAR);
}

void happy_new_year(){
is_blue_on = !is_blue_on;
Serial.println(HO_HO_HO);
Serial.print(HO_HO_HO);
}

// Turns the led at the specified pin to on or off
Expand Down

0 comments on commit 0654f7e

Please sign in to comment.