Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development
This commit is contained in:
commit
4d6e590d0c
@ -4,7 +4,7 @@
|
||||
#include "LEDMatrix.h"
|
||||
#include "ledmatrixfonts.h"
|
||||
|
||||
extern uint8_t MatrixDisplayIsOn = 0;
|
||||
extern uint8_t MatrixDisplayIsOn;
|
||||
|
||||
extern LEDMatrix matrix;
|
||||
|
||||
|
@ -72,6 +72,7 @@ lib_deps_all =
|
||||
${common.lib_deps_display}
|
||||
${common.lib_deps_rgbled}
|
||||
${common.lib_deps_gps}
|
||||
${common.lib_deps_matrix_display}
|
||||
build_flags_basic =
|
||||
-include "src/hal/${PIOENV}.h"
|
||||
-include "src/paxcounter.conf"
|
||||
@ -356,6 +357,7 @@ upload_speed = 921600
|
||||
lib_deps =
|
||||
${common.lib_deps_basic}
|
||||
${common.lib_deps_rgbled}
|
||||
${common.lib_deps_matrix_display}
|
||||
build_flags =
|
||||
${common.build_flags_basic}
|
||||
upload_protocol = ${common.upload_protocol}
|
||||
|
@ -24,7 +24,7 @@ const FONT_CHAR_INFO *ActiveFontCharInfo = ActiveFontInfo->Descriptors;
|
||||
void init_matrix_display(const char *Productname, const char *Version) {
|
||||
ESP_LOGI(TAG, "Initializing LED Matrix display");
|
||||
matrix.begin(displaybuf, LED_MATRIX_WIDTH, LED_MATRIX_HEIGHT);
|
||||
matrix.reverse();
|
||||
//matrix.reverse();
|
||||
matrix.clear();
|
||||
DrawNumber(String("0"));
|
||||
} // init_display
|
||||
|
@ -108,12 +108,13 @@
|
||||
#define CAYENNE_SENSORREAD 13 // sensor period configuration
|
||||
#define CAYENNE_SENSORENABLE 14 // sensor enable configuration
|
||||
|
||||
// LMIC settings
|
||||
// -> in src/lmic_config.h
|
||||
|
||||
// LED Matrix display settings. Pin numbers work fine for Wemos Lolin32 board (all used pins are on 1 side of the board)
|
||||
// LED Matrix display settings.
|
||||
// Note: LED Matrix will only show number of found devices, no other information will be shown for now
|
||||
//#define HAS_MATRIX_DISPLAY 1 // Uncomment to enable LED matrix display output
|
||||
#define LED_MATRIX_WIDTH 64 // Width in pixels (LEDs) of your display
|
||||
#define LED_MATRIX_HEIGHT 16 // Height in pixels (LEDs ) of your display
|
||||
|
||||
// Pin numbers work fine for Wemos Lolin32 board (all used pins are on 1 side of the board)
|
||||
#define MATRIX_DISPLAY_SCAN_US 500 // Matrix display scan rate in microseconds (1ms is about 'acceptable')
|
||||
#define LED_MATRIX_LATCHPIN 13 // Connects to LAT pin on display
|
||||
#define LED_MATRIX_CLOCKPIN 32 // Connects to CLK pin on display
|
||||
@ -123,5 +124,3 @@
|
||||
#define LED_MATRIX_LC_74138 25 // Connects to LC pin on display
|
||||
#define LED_MATRIX_LD_74138 26 // Connects to LD pin on display
|
||||
#define LED_MATRIX_DATA_R1 33 // Connects to R1 pin on display
|
||||
#define LED_MATRIX_WIDTH 64 // Width in pixels (LEDs) of your display
|
||||
#define LED_MATRIX_HEIGHT 16 // Height in pixels (LEDs ) of your display
|
Loading…
Reference in New Issue
Block a user