This commit is contained in:
e2002
2022-04-13 13:01:02 +03:00
parent 51f85109c9
commit 23a02da201
9 changed files with 31 additions and 14 deletions

View File

@@ -231,7 +231,13 @@ void Config::fillPlMenu(char plmenu[][40], int from, byte count) {
}
while (playlist.available()) {
if (parseCSV(playlist.readStringUntil('\n').c_str(), sName, sUrl, sOvol)) {
#ifdef PL_WITH_NUMBERS
char buf[BUFLEN];
sprintf(buf, "%d %s", (int)(from+c), sName);
strlcpy(plmenu[c], buf, 39);
#else
strlcpy(plmenu[c], sName, 39);
#endif
c++;
}
if (c >= count) break;

View File

@@ -1,5 +1,6 @@
#ifndef display_h
#define display_h
#include "options.h"
#include "Arduino.h"
#include <Ticker.h>

View File

@@ -1,7 +1,7 @@
#ifndef options_h
#define options_h
#define VERSION "0.6.202"
#define VERSION "0.6.210"
/*******************************************************
DO NOT EDIT THIS FILE.

View File

@@ -9,7 +9,7 @@
#include "../../network.h"
#ifndef DEF_SPI_FREQ
#define DEF_SPI_FREQ 8000000UL /* set it to 0 for system default */
#define DEF_SPI_FREQ 40000000 /* set it to 0 for system default */
#endif
DspCore::DspCore(): Adafruit_GC9106Ex(TFT_CS, TFT_DC, TFT_RST) {

View File

@@ -14,7 +14,7 @@
#define LOGO_HEIGHT 32
#ifndef DEF_SPI_FREQ
#define DEF_SPI_FREQ 7000000UL /* set it to 0 for system default */
#define DEF_SPI_FREQ 8000000UL /* set it to 0 for system default */
#endif
const char *dow[7] = {"вс","пн","вт","ср","чт","пт","сб"};

View File

@@ -12,6 +12,10 @@
#include "../../config.h"
#include "../../network.h"
#ifndef DEF_SPI_FREQ
#define DEF_SPI_FREQ 40000000UL /* set it to 0 for system default */
#endif
DspCore::DspCore(): Adafruit_ST7735(&SPI, TFT_CS, TFT_DC, TFT_RST) {
}
@@ -110,6 +114,7 @@ void DspCore::apScreen() {
void DspCore::initD(uint16_t &screenwidth, uint16_t &screenheight) {
initR(DTYPE);
if(DEF_SPI_FREQ > 0) setSPISpeed(DEF_SPI_FREQ);
cp437(true);
invertDisplay((DTYPE==INITR_MINI160x80)?TFT_INVERT:!TFT_INVERT);
fillScreen(TFT_BG);