bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0.x] Max7219 cleanup, simplify, and extend (#11575)

Browse Source
This commit is contained in:
Scott Lahteine
2018-08-18 01:33:13 -05:00
committed by GitHub
parent 0b2d686160
commit 56f1e17a25
4 changed files with 411 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Marlin/src/gcode/feature/leds/M7219.cpp
View File

@ -32,7 +32,7 @@
*
* I - Initialize (clear) the matrix
* F - Fill the matrix (set all bits)
* P - Dump the LEDs[] array values
* P - Dump the led_line[] array values
* C<column> - Set a column to the 8-bit value V
* R<row> - Set a row to the 8-bit value V
* X<pos> - X position of an LED to set or toggle
@ -43,45 +43,47 @@
*/
void GcodeSuite::M7219() {
if (parser.seen('I')) {
Max7219_Clear();
Max7219_register_setup();
max7219.clear();
max7219.register_setup();
}
if (parser.seen('F'))
for (uint8_t x = 0; x < MAX7219_X_LEDS; x++)
Max7219_Set_Column(x, 0xFFFFFFFF);
max7219.set_column(x, 0xFFFFFFFF);
const uint32_t v = parser.ulongval('V');
if (parser.seenval('R')) {
const uint32_t r = parser.value_int();
Max7219_Set_Row(r, parser.ulongval('V'));
return;
const uint8_t r = parser.value_byte();
max7219.set_row(r, v);
}
else if (parser.seenval('C')) {
const uint32_t c = parser.value_int();
Max7219_Set_Column(c, parser.ulongval('V'));
return;
const uint8_t c = parser.value_byte();
max7219.set_column(c, v);
}
if (parser.seenval('X') || parser.seenval('Y')) {
else if (parser.seenval('X') || parser.seenval('Y')) {
const uint8_t x = parser.byteval('X'), y = parser.byteval('Y');
if (parser.seenval('V'))
Max7219_LED_Set(x, y, parser.boolval('V'));
max7219.led_set(x, y, parser.boolval('V'));
else
Max7219_LED_Toggle(x, y);
max7219.led_toggle(x, y);
}
else if (parser.seen('D')) {
const uint8_t r = parser.value_byte();
if (r < MAX7219_ROWS) {
max7219.led_line[r] = v;
return max7219.all(r);
}
}
if (parser.seen('P')) {
for (int8_t x = 0; x < 8 * MAX7219_NUMBER_UNITS; x++) {
SERIAL_ECHOPAIR("LEDs[", x);
SERIAL_ECHO("]=");
for (int8_t j = 7; j >= 0; j--) {
if ( LEDs[x] & (0x01<<j) )
SERIAL_ECHO("1");
else
SERIAL_ECHO("0");
}
SERIAL_EOL();
return;
for (uint8_t r = 0; r < MAX7219_ROWS; r++) {
SERIAL_ECHOPGM("led_line[");
if (r < 10) SERIAL_CHAR('_');
SERIAL_ECHO(r);
SERIAL_ECHO("]=");
for (uint8_t b = 8; b--;) SERIAL_CHAR('0' + TEST(max7219.led_line[r], b));
SERIAL_EOL();
}
}
}