Commit a0c1eb0

committed

Moved some "general" functions to a new Sketch.

1 parent 4ba3cc6 commit a0c1eb0Copy full SHA for a0c1eb0

File tree

2 files changed

+45

-41

lines changed

Arduino-Says.ino
PeripheralsControl.ino

2 files changed

+45

-41

lines changed

`‎Arduino-Says.ino‎`

Lines changed: 4 additions & 41 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,16 +71,17 @@ void playGame() {`
`71`	`71`	`int choice;`
`72`	`72`	`int onTime = 500, offTime = 300;`
`73`	`73`	`int timeDecrease = 25;`
`74`		`- bool rightAnswer = true;`
	`74`	`+ bool rightAnswer;`
`75`	`75`
`76`	`76`	`Node x;`
`77`	`77`	`List gameSequence = newList();`
`78`	`78`	`generateRandomSequence(gameSequence);`
`79`	`79`	`while (lives > 0) {`
	`80`	`+ rightAnswer = true;`
`80`	`81`	`playSequence(gameSequence, onTime, offTime);`
`81`	`82`	`x = getListHead(gameSequence);`
`82`	`83`	`while (x != NULL && rightAnswer) {`
`83`		`- //waits for input`
	`84`	`+ //Waits for input`
`84`	`85`	`choice = -1;`
`85`	`86`	`while (choice == -1) {`
`86`	`87`	`choice = checkInputArray(buttons, N_LEDS);`
`@@ -93,6 +94,7 @@ void playGame() {`
`93`	`94`	`rightAnswer = false;`
`94`	`95`	`}`
`95`	`96`	`}`
	`97`	`+`
`96`	`98`	`if (rightAnswer) {`
`97`	`99`	`score++;`
`98`	`100`	`displayRightAnswer(score);`
`@@ -143,27 +145,6 @@ void playLED(int index, int onTime) {`
`143`	`145`	`digitalWrite(leds[index], LOW);`
`144`	`146`	`}`
`145`	`147`
`146`		`-//Returns the pin number of an input that was set to HIGH in the inputs array.`
`147`		`-//If all were set to LOW, returns -1.`
`148`		`-int checkInputArray(int inputs[], int len) {`
`149`		`- for (int i = 0; i < len; i++) {`
`150`		`- if (digitalRead(inputs[i]) == HIGH) {`
`151`		`- return inputs[i];`
`152`		`- }`
`153`		`- }`
`154`		`- return -1;`
`155`		`-}`
`156`		`-`
`157`		`-//Returns the index of the pin pinNumber in the inputs array.`
`158`		`-int pinToIndex(int inputs[], int len, int pinNumber) {`
`159`		`- for (int i = 0; i < len; i++) {`
`160`		`- if (inputs[i] == pinNumber) {`
`161`		`- return i;`
`162`		`- }`
`163`		`- }`
`164`		`- return -1;`
`165`		`-}`
`166`		`-`
`167`	`148`	`//Plays the animation for when the answer is wrong. Turns of one LED.`
`168`	`149`	`void displayWrongAnswer(int lives) {`
`169`	`150`	`Serial.println("Wrong answer!");`
`@@ -195,23 +176,5 @@ void displayGameOver(int score) {`
`195`	`176`	`gameSetup();`
`196`	`177`	`}`
`197`	`178`
`198`		`-//Outputs value to all pins in the outputs array.`
`199`		`-void outputArray(int outputs[], int len, int value) {`
`200`		`- for (int i = 0; i < len; i++) {`
`201`		`- digitalWrite(outputs[i], value);`
`202`		`- }`
`203`		`-}`
`204`		`-`
`205`		`-//Writes HIGH for each pin in sequence and then LOW (following the order of the array).`
`206`		`-//Each steps lasts stepDelay ms.`
`207`		`-void outputArraySequence(int sequence[], int len, float loops, int stepDelay) {`
`208`		`- for (int i = 0; i < len*loops; i++) {`
`209`		`- digitalWrite(sequence[i%len], HIGH);`
`210`		`- delay(stepDelay);`
`211`		`- digitalWrite(sequence[i%len], LOW);`
`212`		`- delay(stepDelay);`
`213`		`- }`
`214`		`-}`
`215`		`-`
`216`	`179`	`//Nothing here`
`217`	`180`	`void loop() {}`

`‎PeripheralsControl.ino‎`

Lines changed: 41 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,41 @@`
	`1`	`+/* Useful functions to control electronic devices. */`
	`2`	`+`
	`3`	`+//Returns the pin number of an input that was set to HIGH in the inputs array.`
	`4`	`+//If all were set to LOW, returns -1.`
	`5`	`+int checkInputArray(int inputs[], int len) {`
	`6`	`+ for (int i = 0; i < len; i++) {`
	`7`	`+ if (digitalRead(inputs[i]) == HIGH) {`
	`8`	`+ return inputs[i];`
	`9`	`+ }`
	`10`	`+ }`
	`11`	`+ return -1;`
	`12`	`+}`
	`13`	`+`
	`14`	`+//Returns the index of the pin pinNumber in the inputs array.`
	`15`	`+int pinToIndex(int inputs[], int len, int pinNumber) {`
	`16`	`+ for (int i = 0; i < len; i++) {`
	`17`	`+ if (inputs[i] == pinNumber) {`
	`18`	`+ return i;`
	`19`	`+ }`
	`20`	`+ }`
	`21`	`+ return -1;`
	`22`	`+}`
	`23`	`+`
	`24`	`+//Outputs value to all pins in the outputs array.`
	`25`	`+void outputArray(int outputs[], int len, int value) {`
	`26`	`+ for (int i = 0; i < len; i++) {`
	`27`	`+ digitalWrite(outputs[i], value);`
	`28`	`+ }`
	`29`	`+}`
	`30`	`+`
	`31`	`+//Writes HIGH for each pin in sequence and then LOW (following the order of the array).`
	`32`	`+//Each steps lasts stepDelay ms.`
	`33`	`+void outputArraySequence(int sequence[], int len, float loops, int stepDelay) {`
	`34`	`+ for (int i = 0; i < len*loops; i++) {`
	`35`	`+ digitalWrite(sequence[i%len], HIGH);`
	`36`	`+ delay(stepDelay);`
	`37`	`+ digitalWrite(sequence[i%len], LOW);`
	`38`	`+ delay(stepDelay);`
	`39`	`+ }`
	`40`	`+}`
	`41`	`+`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a0c1eb0

File tree

2 files changed

2 files changed

`‎Arduino-Says.ino‎`

`‎PeripheralsControl.ino‎`

0 commit comments