Skip to content

Commit 4a28ce8

Browse files
author
Anne Jan Brouwer
committed
Merge branch 'master' into develop
2 parents 5161fda + b91968a commit 4a28ce8

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ http://ijhack.nl/project/ijduino
99

1010
https://pad.ijhack.nl/p/ijduino
1111

12-
https://pad.ijhack.nl/p/20-projects-20-euro
12+
https://github.com/IJHack/ijduino/blob/master/documentation/ijduino.pdf?raw=true
1313

1414
Installing
1515
----------

documentation/ijduino.pdf

-5 Bytes
Binary file not shown.

documentation/src/ijduino.odt

-124 Bytes
Binary file not shown.

software/ijdice/ijdice.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
#include "LedControl.h"
3-
const int BUTTON_PIN = 4;
3+
const int BUTTON_PIN = 9;
44

55

66
//#define POTPIN A0 // Potentiometer
@@ -128,7 +128,11 @@ byte six[] = {
128128
};
129129

130130

131-
LedControl lc = LedControl(13, 11, 12, 1);
131+
static const int DATA_PIN = 20;
132+
static const int CLK_PIN = 5;
133+
static const int CS_PIN = 21;
134+
135+
LedControl lc=LedControl(DATA_PIN, CLK_PIN, CS_PIN, 1);
132136

133137
void setSprite(byte *sprite) {
134138
for (int r = 0; r < 8; r++) {
@@ -262,7 +266,7 @@ void randomdice() {
262266
// lc.clearDisplay(0);
263267
}
264268
if (randNumber == 5)
265-
{
269+
{
266270
Serial.println("55");
267271
setSprite(five);
268272
// delay(500);

software/ijpong_oneplayer/ijpong_oneplayer.ino

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
*
1717
*/
1818

19+
static const int DATA_PIN = 20;
20+
static const int CLK_PIN = 5;
21+
static const int CS_PIN = 21;
1922

2023
#include "LedControl.h"
2124
#include "Timer.h"
@@ -101,7 +104,7 @@ byte G[] = {
101104
};
102105
Timer timer;
103106

104-
LedControl lc = LedControl(13, 11, 12, 1);
107+
LedControl lc=LedControl(DATA_PIN, CLK_PIN, CS_PIN, 1);
105108

106109
byte direction; // Wind rose, 0 is north
107110
int xball;

0 commit comments

Comments
 (0)