Skip to content

Commit e4a1e19

Browse files
tombrazierLCh-77
authored andcommitted
🚸 Vertical Max7219::quantity in portrait orientation (MarlinFirmware#24415)
1 parent 6c2f57f commit e4a1e19

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Marlin/src/feature/max7219.cpp

+10-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#define HAS_SIDE_BY_SIDE 1
5353
#endif
5454

55+
#define _ROT ((MAX7219_ROTATE + 360) % 360)
5556
#if _ROT == 0 || _ROT == 180
5657
#define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
5758
#define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
@@ -597,7 +598,15 @@ void Max7219::range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const
597598
// Apply changes to update a quantity
598599
void Max7219::quantity(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {
599600
for (uint8_t i = _MIN(nv, ov); i < _MAX(nv, ov); i++)
600-
led_set(i, pos, nv >= ov, rcm);
601+
led_set(
602+
#if MAX7219_X_LEDS >= MAX7219_Y_LEDS
603+
i, pos // Single matrix or multiple matrices in Landscape
604+
#else
605+
pos, i // Multiple matrices in Portrait
606+
#endif
607+
, nv >= ov
608+
, rcm
609+
);
601610
}
602611

603612
void Max7219::quantity16(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {

Marlin/src/feature/max7219.h

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#ifndef MAX7219_ROTATE
4848
#define MAX7219_ROTATE 0
4949
#endif
50-
#define _ROT ((MAX7219_ROTATE + 360) % 360)
5150

5251
#ifndef MAX7219_NUMBER_UNITS
5352
#define MAX7219_NUMBER_UNITS 1

0 commit comments

Comments
 (0)