Hopiu/rpi-rgb-led-matrix
1
0
Fork 0
mirror of https://github.com/Hopiu/rpi-rgb-led-matrix.git synced 2026-05-28 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

o Re-add some options that got lost in the cleanup

Browse source 
Fixes #202
This commit is contained in:
Henner Zeller 2016-08-23 20:00:49 -07:00
parent c4f5d64bd4
commit b87bf5e2fb
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples-api-use/demo-main.cc
View file

@ -1064,7 +1064,7 @@ int main(int argc, char *argv[]) {
// First things first: extract the command line flags that contain
// relevant matrix options.
if (!ParseOptionsFromFlags(&argc, &argv, &matrix_options, &runtime_opt)) {
usage(argv[0]);
return usage(argv[0]);
}
int opt;

33
utils/led-image-viewer.cc
View file

@ -187,7 +187,9 @@ static int usage(const char *progname) {
"\t-t<seconds> : "
"For gif animations: stop after this time.\n"
"\t-l<loop-count> : "
"For gif animations: number of loops through a full cycle.\n");
"For gif animations: number of loops through a full cycle.\n"
"\t-L : 64x64 large display made out of "
"chain of four 32x32\n");
fprintf(stderr, "\nGeneral LED matrix options:\n");
rgb_matrix::PrintMatrixFlags(stderr);
@ -202,16 +204,21 @@ static int usage(const char *progname) {
int main(int argc, char *argv[]) {
Magick::InitializeMagick(*argv);
RGBMatrix *const matrix = rgb_matrix::CreateMatrixFromFlags(&argc, &argv);
RGBMatrix::Options matrix_options;
if (!rgb_matrix::ParseOptionsFromFlags(&argc, &argv, &matrix_options)) {
return usage(argv[0]);
}
bool do_forever = false;
bool large_display = false; // 64x64 made out of 4 in sequence.
const tmillis_t distant_future = (1LL<<40); // that is a while.
tmillis_t anim_duration_ms = distant_future;
tmillis_t wait_ms = 1500;
int loops = -1;
int opt;
while ((opt = getopt(argc, argv, "w:t:l:fh")) != -1) {
while ((opt = getopt(argc, argv, "w:t:l:fr:c:P:Lh")) != -1) {
switch (opt) {
case 'w':
wait_ms = roundf(atof(optarg) * 1000.0f);
@ -225,6 +232,20 @@ int main(int argc, char *argv[]) {
case 'f':
do_forever = true;
break;
case 'r':
matrix_options.rows = atoi(optarg);
break;
case 'c':
matrix_options.chain_length = atoi(optarg);
break;
case 'P':
matrix_options.parallel = atoi(optarg);
break;
case 'L':
matrix_options.rows = 32;
matrix_options.chain_length = 4;
large_display = true;
break;
case 'h':
default:
return usage(argv[0]);
@ -248,9 +269,15 @@ int main(int argc, char *argv[]) {
loops = 1;
}
RGBMatrix *matrix = CreateMatrixFromOptions(matrix_options);
if (matrix == NULL)
return 1;
if (large_display) {
// Mapping the coordinates of a 32x128 display mapped to a square of 64x64
matrix->SetTransformer(new rgb_matrix::LargeSquare64x64Transformer());
}
// These parameters are needed once we do scrolling.
const bool fill_width = false;
const bool fill_height = false;