Skip to content

Commit

Permalink
Removed comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsammelson
rsammelson committed Mar 26, 2017
1 parent 7442adf commit b0a7822
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 117 deletions.
6 changes: 1 addition & 5 deletions Images_and_Text.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ void printText (String Phrase, int color[], int run_time, bool scroll, bool uppe

void rectangleZoom (int x, int y, int width, int height, int color, int Delay, bool noFill) {
int iterations = min(width / 2, height / 2);
// int c = 0;
for (int i = 0; i < iterations; i++) {
matrix.drawRect(x, y, width, height, color);
delay(Delay);
Expand All @@ -43,9 +42,6 @@ void rectangleZoom (int x, int y, int width, int height, int color, int Delay, b
y += 1;
width -= 2;
height -= 2;
// if (Length < c) {
// c += 1;
// }
}
}

Expand Down Expand Up @@ -75,7 +71,7 @@ void creditsPrint (String message, uint16_t color, int Delay, bool twoText, Stri
matrix.clear();
delay(Delay);
}
// delay(endDelay);
// delay(endDelay); removed (causing problems)
matrix.setFont(&FONT);
}

Expand Down
80 changes: 0 additions & 80 deletions Matrix.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,68 +47,6 @@ void theaterChase(int Skips, int Delay, int color, bool bow) {
updateScreen();
}

//void theaterChase(int Width, int Skips, int Delay, int color) {
// Serial.println("a");
// for (int i = 0; i < matrix.height(); i += 2) {
// Serial.println("b");
// for (int j = 0; j < matrix.width(); j += Skips) {
// Serial.println("c");
// for (int l = 0; (l + j) < Width; l++) {
// Serial.println("d");
// if (l >= matrix.width()) {
// matrix.drawPixel((matrix.width() * 2) - (j + l), i, color);
// Serial.println("wrap");
// } else {
// matrix.drawPixel(j + l, i, color);
// Serial.println("no wrap");
// }
// }
// delay(Delay);
// updateScreen();
// for (int n = 0; n < Skips; n++) {
// matrix.drawPixel(j + n, i, matrix.Color(0, 0, 0));
// }
// }
// for (int j = matrix.width(); j > 0; j -= Skips) {
// for (int j = 0; j < matrix.width(); j += Skips) {
// for (int l = 0; l < Width; l++) {
// if (l >= matrix.width()) {
// matrix.drawPixel((matrix.width() * 2) - (j + l), i, color);
// } else {
// matrix.drawPixel(j + l, i, color);
// }
// }
// delay(Delay);
// updateScreen();
// for (int n = 0; n < Skips; n++) {
// matrix.drawPixel(j + n, i, matrix.Color(0, 0, 0));
// }
// }
// }
// }
// delay(Delay);
// updateScreen();
//}

//theaterChaseRainbow(int Skips, int Delay = 10) {
// for (int i = 0; i < matrix.height(); i += 2) {
// for (int j = 0; j < matrix.width(); j += Skips) {
// matrix.drawPixel(j, i, Wheel( ((i * matrix.width()) + j) % 255));
// delay(Delay);
// updateScreen();
// matrix.drawPixel(j, i, matrix.Color(0, 0, 0));
// }
// for (int j = matrix.width(); j > 0; j -= Skips) {
// matrix.drawPixel(j, i + 1, Wheel( (i * matrix.width()) + matrix.width() + (Skips * -1) % 255));
// updateScreen();
// delay(Delay);
// matrix.drawPixel(j, i + 1, matrix.Color(0, 0, 0));
// }
// }
// delay(Delay);
// updateScreen();
//}

void zigZag(unsigned long Stop, uint16_t color, uint16_t color2, int d, int gap) {
unsigned long Start = millis();
Stop += millis();
Expand Down Expand Up @@ -143,24 +81,6 @@ void zigZag(unsigned long Stop, uint16_t color, uint16_t color2, int d, int gap)

}

//void rDraw(unsigned long Stop, uint16_t color, int n, int Delay, bool Random) {
// unsigned long Start; //Guarantees at least 1 iteration.
// int i = 0;
// Stop += millis();
// while (Start < Stop) {
// if (Random) {
// color = matrix.Color(random(250), random(220), random(170));
// }
// matrix.drawPixel(random(0, matrix.width() + 1), random(0, matrix.height() + 1), color);
// if (i % n == 0 && i != 0) {
// updateScreen();
// delay(Delay);
// }
// Start = millis();
// i++;
// }
//}

void rDraw(unsigned long Stop, uint16_t color, int n, int Delay, bool Random) {
unsigned long Start; //Guarantees at least 1 iteration.
int i = 0;
Expand Down
21 changes: 0 additions & 21 deletions Sine.ino
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
/*
void sinWave (uint16_t color, int Delay, float mult) {
float w = matrix.width();
float he = matrix.height();
float h = he / 2;
float a = (h - 1) / w;
float co;
int c;
for (int i = 0; i < w; i++) {
co = i * a;
c = ceil(h - co);
double r = sin(i * mult) * double(c);
Serial.println("X: " + String(i) + " Y: " + String(round(r) + 8) + " C: " + String(c, 9) + " CO: " + String(co));
matrix.drawPixel((i), (round(r) + 8), color);
updateScreen();
delay(Delay);
}
delay(Delay * 2);
}
*/

void sinWave (uint16_t color, int Delay, int n, float mult) {
float w = matrix.width() * n;
float he = matrix.height();
Expand Down
2 changes: 1 addition & 1 deletion _0-_Main_Bling.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#define WIDTH 40 // each
#define HEIGHT 8 // each
#define NUMBER 2 // number high
#define NUMBER 2 // number of panels

#define PROGS 14 // programs that exist
#define ToRUN 12 // # to run (if oneOfEach is false) (if true, must equal number of progams being run)
Expand Down
10 changes: 0 additions & 10 deletions _Basic_Control.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,6 @@ bool serialInterp () {
}
}

/*
else if (in == "DISABLE" || in == "DISABLE\n") {
if (serialBool("Would you like to disable Serial? ")) {
noSerial = true;
return true;
} else {
return false;
}
*/

bool serialBool (String message) {
Serial.print(message);
String in = serialIn();
Expand Down

2 comments on commit b0a7822

@rsammelson
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually committed on 3/26 at about 1 pm (see #5)

@rsammelson
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed #1

Please sign in to comment.