All movement, and like, actual valid code.

This commit is contained in:
Daniel Løvbrøtte Olsen 2017-03-30 12:19:39 +02:00 committed by GitHub
parent cf3e152612
commit a68e7e539e

View File

@ -14,36 +14,8 @@ struct LEDSelect {
// 0 - North; 1 - East; 2 - South, 3 - West
byte DIRECTIONS[6][4];
DIRECTIONS[0][0] = 4;
DIRECTIONS[0][1] = 1;
DIRECTIONS[0][2] = 5;
DIRECTIONS[0][3] = 3;
DIRECTIONS[1][0] = 4;
DIRECTIONS[1][1] = 2;
DIRECTIONS[1][2] = 5;
DIRECTIONS[1][3] = 0;
DIRECTIONS[2][0] = 4;
DIRECTIONS[2][1] = 3;
DIRECTIONS[2][2] = 5;
DIRECTIONS[2][3] = 1;
DIRECTIONS[3][0] = 4;
DIRECTIONS[3][1] = 0;
DIRECTIONS[3][2] = 5;
DIRECTIONS[3][3] = 2;
DIRECTIONS[4][0] = 0;
DIRECTIONS[4][1] = 3;
DIRECTIONS[4][2] = 2;
DIRECTIONS[4][3] = 1;
DIRECTIONS[5][0] = 2;
DIRECTIONS[5][1] = 3;
DIRECTIONS[5][2] = 0;
DIRECTIONS[5][3] = 1;
// Initializing mapping for directions
void initMap(void);
// Decodes side, column, row into n LED
int decodeLED(LEDSelect selection);
void encodeLED(int n, LEDSelect* Result);
@ -62,40 +34,82 @@ bool mirror(byte side, CRGB* leds);
//Prints large X in a given color
void printError(CRGB color, CRGB* leds);
void initMap(void)
{
DIRECTIONS[0][0] = 4;
DIRECTIONS[0][1] = 1;
DIRECTIONS[0][2] = 5;
DIRECTIONS[0][3] = 3;
int decodeLED(LEDSelect selection) {
DIRECTIONS[1][0] = 4;
DIRECTIONS[1][1] = 2;
DIRECTIONS[1][2] = 5;
DIRECTIONS[1][3] = 0;
DIRECTIONS[2][0] = 4;
DIRECTIONS[2][1] = 3;
DIRECTIONS[2][2] = 5;
DIRECTIONS[2][3] = 1;
DIRECTIONS[3][0] = 4;
DIRECTIONS[3][1] = 0;
DIRECTIONS[3][2] = 5;
DIRECTIONS[3][3] = 2;
DIRECTIONS[4][0] = 0;
DIRECTIONS[4][1] = 3;
DIRECTIONS[4][2] = 2;
DIRECTIONS[4][3] = 1;
DIRECTIONS[5][0] = 2;
DIRECTIONS[5][1] = 3;
DIRECTIONS[5][2] = 0;
DIRECTIONS[5][3] = 1;
}
int decodeLED(LEDSelect selection)
{
return 9 * selection.side + 3 * selection.row + selection.column;
}
void encodeLED(int n, LEDSelect* Result) {
void encodeLED(int n, LEDSelect* Result)
{
Result->side = n / 9;
Result->column = n % 9 / 3;
Result->row = n % 9 % 3;
}
void forceMove(LEDSelect* selection, byte direction) {
switch (origin_dir) {
case 0:
selection->row--;
break;
case 1:
selection->column++;
break;
case 2:
selection->row++:
break;
case 3:
selection->column--;
break;
void forceMove(LEDSelect* selection, byte direction)
{
switch (direction) {
case 0:
selection->row--;
break;
case 1:
selection->column++;
break;
case 2:
selection->row++;
break;
case 3:
selection->column--;
break;
}
return;
}
#define NORTH 0
#define EAST 1
#define SOUTH 2
#define WEST 3
// Takes a single LED and find its neighbor, based on direction
void getNeighborLED(LEDSelect* origin, byte origin_dir, LEDSelect* Result) {
void getNeighborLED(LEDSelect* origin, byte origin_dir, LEDSelect* Result)
{
byte row = origin->row;
byte column = origin->column;
byte side = origin->side;
*Result = *origin;
@ -107,87 +121,101 @@ void getNeighborLED(LEDSelect* origin, byte origin_dir, LEDSelect* Result) {
// Case edges, corners
if (row == 0 && origin_dir == 2) {
if (row == 0 && origin_dir == SOUTH) {
Result->row++;
return;
}
if (column == 2 && origin_dir == 3) {
if (column == 2 && origin_dir == WEST) {
Result->column--;
return;
}
if (row == 2 && origin_dir == 0) {
if (row == 2 && origin_dir == NORTH) {
Result->row--;
return;
}
if (column == 0 && origin_dir == 1) {
if (column == 0 && origin_dir == EAST) {
Result->column++;
return;
}
// Cases midten av edges
if (row == 0 && column == 1 && origin_dir != 0) {
if (row == 0 && column == 1 && origin_dir != NORTH) {
forceMove(Result, origin_dir);
return;
}
if (column == 2 && row == 1 && origin_dir != 1) {
if (column == 2 && row == 1 && origin_dir != EAST) {
forceMove(Result, origin_dir);
return;
}
if (row == 2 && column == 1 && origin_dir != 2) {
if (row == 2 && column == 1 && origin_dir != SOUTH) {
forceMove(Result, origin_dir);
return;
}
if (column == 0 && row == 1 && origin_dir != 3) {
if (column == 0 && row == 1 && origin_dir != WEST) {
forceMove(Result, origin_dir);
return;
}
Result->side = DIRECTIONS[origin->side][origin_dir];
byte edge;
for (edge = 0; edge < 4; edge++) {
if (DIRECTIONS[Result->side][edge] == origin->side) {
if (DIRECTIONS[Result->side][edge] == origin->side)
break;
}
}
switch (edge) {
case 0:
Result->row = 0;
break;
case 1:
Result->column = 2;
break;
case 2:
Result->row = 2;
break;
case 3:
Result->column = 0;
break;
}
if (column == 1) {
return;
}
if ((side == 0 && (origin_dir == 0 || origin_dir == 2)) || (side == 4 && origin_dir == 0)) {
(column == 0) ? Result->column = 2 : Result->column = 0;
}
if ((side == 1 && origin_dir == 0) || (side == 3 && origin_dir == 2)
||(side == 4 && origin_dir == 3) || (side == 5 && origin_dir == 1)) {
Result->column = row;
Result->row = column;
}
// Wrong!!
if ((side == 1 && origin_dir == 2) || (side == 3 && origin_dir == 0)) {
Result->column = 0;
(column == 0) ? Result->row = 2 : Result->row = 0;
}
if ((side == 4 && origin_dir == 1) || (side == 5 && origin_dir == 3)) {
case NORTH:
Result->row = 0;
break;
case EAST:
Result->column = 2;
break;
case SOUTH:
Result->row = 2;
(row == 0) ? Result->column = 2 : Result->column = 0;
break;
case WEST:
Result->column = 0;
break;
}
if (column == 1) // if middle pixel, no one has to get hurt ^^
return;
if ((side == 0 && (origin_dir == NORTH || origin_dir == SOUTH))
|| (side == 4 && origin_dir == NORTH)) {
(column == 0) ? Result->column = 2 : Result->column = 0; // Sets edge to opposite
return;
}
if ((side == 1 && origin_dir == NORTH)
|| (side == 3 && origin_dir == SOUTH)
|| (side == 4 && origin_dir == WEST)
|| (side == 5 && origin_dir == EAST)) {
Result->column = row;
Result->row = column;
return;
}
if (side == 1 && origin_dir == SOUTH
|| side == 5 && origin_dir == WEST
|| side == 4 && origin_dir == EAST
|| side == 3 && origin_dir == NORTH) {
if (column == row) {
if (column == 0) {
Result->column = 2;
Result->row = 2;
}
else {
Result->column = 0;
Result->row = 0;
}
}
}
}
bool setColor(LEDSelect selection, CRGB color, CRGB* leds) {
bool setColor(LEDSelect selection, CRGB color, CRGB* leds)
{
if (selection.side == 255) {
return false;
}
@ -219,7 +247,8 @@ bool setColor(LEDSelect selection, CRGB color, CRGB* leds) {
}
bool updateColors(LEDSelect selection, CRGB color, CRGB* leds) {
bool updateColors(LEDSelect selection, CRGB color, CRGB* leds)
{
if (selection.side == 255) {
return false;
}
@ -264,7 +293,8 @@ bool updateColors(LEDSelect selection, CRGB color, CRGB* leds) {
}
}
bool mirror(byte side, CRGB* leds) {
bool mirror(byte side, CRGB* leds)
{
/*TODO: figure out memory structure,
copy the nine leds to the the different memory parts, so it the text is displayed on all sides.
should probably use some form of modulo
@ -274,7 +304,8 @@ bool mirror(byte side, CRGB* leds) {
}
}
void printError(CRGB color, CRGB* leds) {
void printError(CRGB color, CRGB* leds)
{
setColor({0, 255, 255}, (CRGB) color, leds);
setColor({0, 0, 1}, (CRGB) 0, leds);
setColor({0, 1, 0}, (CRGB) 0, leds);