Moving stuff up to remote so a new branch can be made without stashing
This commit is contained in:
@@ -24,16 +24,13 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"connections": [
|
"connections": [
|
||||||
["esp32:TX0", "$serialMonitor:RX", "", []],
|
|
||||||
["esp32:RX0", "$serialMonitor:TX", "", []],
|
|
||||||
["esp:GND", "neopixels:VSS", "black"],
|
["esp:GND", "neopixels:VSS", "black"],
|
||||||
["esp:D5", "neopixels:DIN", "green"],
|
["esp:D5", "neopixels:DIN", "green"],
|
||||||
["esp:5V", "neopixels:VDD", "red"]
|
["esp:5V", "neopixels:VDD", "red"]
|
||||||
],
|
],
|
||||||
"serialMonitor": {
|
"serialMonitor": {
|
||||||
"display": "always",
|
"display": "always",
|
||||||
"newline": "lf",
|
"newline": "lf"
|
||||||
"convertEol": false
|
|
||||||
},
|
},
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
}
|
}
|
||||||
16
src/main.cpp
16
src/main.cpp
@@ -23,6 +23,7 @@
|
|||||||
#include "CLEDControllerPhysicalStrip.h"
|
#include "CLEDControllerPhysicalStrip.h"
|
||||||
#include "CLEDControllerPhysicalMatrix.h"
|
#include "CLEDControllerPhysicalMatrix.h"
|
||||||
#include "SmartMatrixPhysicalMatrix.h"
|
#include "SmartMatrixPhysicalMatrix.h"
|
||||||
|
#include "elapsedMillis.h"
|
||||||
|
|
||||||
#define NUMLEDS 1024
|
#define NUMLEDS 1024
|
||||||
|
|
||||||
@@ -52,12 +53,14 @@ LEDHAL2D* hal2D;
|
|||||||
|
|
||||||
MatrixAnimation* animation;
|
MatrixAnimation* animation;
|
||||||
|
|
||||||
|
elapsedMillis printTimer;
|
||||||
|
|
||||||
int animationCode = 0;
|
int animationCode = 0;
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
Serial.begin(115200);
|
Serial.begin(9600);
|
||||||
|
|
||||||
while(!Serial) {}
|
delay(5000);
|
||||||
|
|
||||||
Serial.println(F("STARTUP!"));
|
Serial.println(F("STARTUP!"));
|
||||||
|
|
||||||
@@ -68,7 +71,7 @@ void setup() {
|
|||||||
|
|
||||||
if(animationCode == 0) {
|
if(animationCode == 0) {
|
||||||
animation = new PlasmaMatrix(hal2D, "Plasma Matrix", 10);
|
animation = new PlasmaMatrix(hal2D, "Plasma Matrix", 10);
|
||||||
} else if(animationCode == 1) {
|
} /*else if(animationCode == 1) {
|
||||||
animation = new AlternateMatrix(hal2D, "Alternate Matrix", 125, rainbow, 6, AlternateType::HORIZONTAL_ALTERNATE);
|
animation = new AlternateMatrix(hal2D, "Alternate Matrix", 125, rainbow, 6, AlternateType::HORIZONTAL_ALTERNATE);
|
||||||
} else if(animationCode == 2) {
|
} else if(animationCode == 2) {
|
||||||
animation = new CollisionMatrix(hal2D, "Collision Matrix", 125, CRGB(255, 45, 0), CRGB::Green, CollisionType::HORIZONTAL_COLLISION);
|
animation = new CollisionMatrix(hal2D, "Collision Matrix", 125, CRGB(255, 45, 0), CRGB::Green, CollisionType::HORIZONTAL_COLLISION);
|
||||||
@@ -90,7 +93,7 @@ void setup() {
|
|||||||
} else if(animationCode == 8) {
|
} else if(animationCode == 8) {
|
||||||
//It works, kinda? It doesn't look like the original version of the animation
|
//It works, kinda? It doesn't look like the original version of the animation
|
||||||
animation = new CycloneMatrix(hal2D, "Cyclone Matrix", 100, 16, 16, 4, 16, 6, rainbow);
|
animation = new CycloneMatrix(hal2D, "Cyclone Matrix", 100, 16, 16, 4, 16, 6, rainbow);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
animation->enable();
|
animation->enable();
|
||||||
}
|
}
|
||||||
@@ -99,4 +102,9 @@ void loop() {
|
|||||||
animation->update();
|
animation->update();
|
||||||
|
|
||||||
hal2D->show();
|
hal2D->show();
|
||||||
|
|
||||||
|
if(printTimer >= 5000) {
|
||||||
|
Serial.println("PRINT!");
|
||||||
|
printTimer = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user