DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LED matrix scroll function added

Browse Source
This commit is contained in:
Verkehrsrot 2019-08-18 16:47:28 +02:00
parent 77352b832e
commit a4419ab6f0
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ledmatrixdisplay.h
View File

@ -13,5 +13,6 @@ void refreshTheMatrixDisplay(bool nextPage = false);
void DrawNumber(String strNum, uint8_t iDotPos = 0); void DrawNumber(String strNum, uint8_t iDotPos = 0);
uint8_t GetCharFromFont(char cChar); uint8_t GetCharFromFont(char cChar);
uint8_t GetCharWidth(char cChar); uint8_t GetCharWidth(char cChar);
void ShiftLeft(uint8_t *arr, uint32_t len);
#endif #endif

39
src/ledmatrixdisplay.cpp
View File

@ -14,13 +14,14 @@ uint8_t MatrixDisplayIsOn = 0;
static unsigned long ulLastNumMacs = 0; static unsigned long ulLastNumMacs = 0;
static time_t ulLastTime = myTZ.toLocal(now()); static time_t ulLastTime = myTZ.toLocal(now());
// Display Buffer 128 = 64 * 16 / 8
static const uint32_t DisplaySize = LED_MATRIX_WIDTH * LED_MATRIX_HEIGHT / 8;
uint8_t displaybuf[DisplaySize] = {0};
LEDMatrix matrix(LED_MATRIX_LA_74138, LED_MATRIX_LB_74138, LED_MATRIX_LC_74138, LEDMatrix matrix(LED_MATRIX_LA_74138, LED_MATRIX_LB_74138, LED_MATRIX_LC_74138,
LED_MATRIX_LD_74138, LED_MATRIX_EN_74138, LED_MATRIX_DATA_R1, LED_MATRIX_LD_74138, LED_MATRIX_EN_74138, LED_MATRIX_DATA_R1,
LED_MATRIX_LATCHPIN, LED_MATRIX_CLOCKPIN); LED_MATRIX_LATCHPIN, LED_MATRIX_CLOCKPIN);
// Display Buffer 128 = 64 * 16 / 8
uint8_t displaybuf[LED_MATRIX_WIDTH * LED_MATRIX_HEIGHT / 8];
// --- SELECT YOUR FONT HERE --- // --- SELECT YOUR FONT HERE ---
const FONT_INFO *ActiveFontInfo = &digital7_18ptFontInfo; const FONT_INFO *ActiveFontInfo = &digital7_18ptFontInfo;
// const FONT_INFO *ActiveFontInfo = &arialNarrow_17ptFontInfo; // const FONT_INFO *ActiveFontInfo = &arialNarrow_17ptFontInfo;
@ -41,6 +42,7 @@ void init_matrix_display(bool reverse) {
void refreshTheMatrixDisplay(bool nextPage) { void refreshTheMatrixDisplay(bool nextPage) {
static uint8_t DisplayPage = 0, col = 0, row = 0; static uint8_t DisplayPage = 0, col = 0, row = 0;
uint8_t level;
char buff[16]; char buff[16];
// if Matrixdisplay is switched off we don't refresh it to relax cpu // if Matrixdisplay is switched off we don't refresh it to relax cpu
@ -82,20 +84,20 @@ void refreshTheMatrixDisplay(bool nextPage) {
// next count cycle? // next count cycle?
if (macs.size() == 0) { if (macs.size() == 0) {
col++;
// display full?
if (col >= NUMCOLS) {
col = 0;
matrix.clear();
}
} else {
// clear previous dot
matrix.drawPoint(col, row, 0);
}
// set current dot // matrix full? then scroll left 1 dot, else increment column
if (col < NUMCOLS - 1)
col++;
else
ShiftLeft(displaybuf, DisplaySize);
} else
matrix.drawPoint(col, row, 0); // clear current dot
// scale and set new dot
ulLastNumMacs = macs.size(); ulLastNumMacs = macs.size();
row = NUMROWS - 1 - ((ulLastNumMacs / LINE_DIAGRAM_DIVIDER) % NUMROWS); level = ulLastNumMacs / LINE_DIAGRAM_DIVIDER;
row = level <= NUMROWS ? NUMROWS - 1 - level % NUMROWS : 0;
matrix.drawPoint(col, row, 1); matrix.drawPoint(col, row, 1);
} }
} }
@ -195,4 +197,11 @@ uint8_t GetCharWidth(char cChar) {
return CharDescriptor.width; return CharDescriptor.width;
} }
void ShiftLeft(uint8_t *arr, uint32_t len) {
uint32_t i;
for (i = 0; i < len - 1; ++i) {
arr[i] = (arr[i] << 1) | ((arr[i + 1] >> 31) & 1);
}
arr[len - 1] = arr[len - 1] << 1;
}
#endif // HAS_MATRIX_DISPLAY #endif // HAS_MATRIX_DISPLAY