iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.045

Browse Source
This commit is contained in:
e2002
2023-03-10 21:44:34 +03:00
parent 30ded099ae
commit 9ac7b0efc6
5 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yoRadio/src/SSD1322/SSD1322.cpp
View File

@@ -315,6 +315,7 @@ void Jamis_SSD1322::drawPixel(int16_t x, int16_t y, uint16_t color) {
ssd1322_swap(x, y);
y = HEIGHT - y - 1;
break;
default: break;
}
buffer[(x >> 1) + (y)*WIDTH/2] &= (x % 2) ? 0xF0 : 0x0F;
buffer[(x >> 1) + (y)*WIDTH/2] |= (color << (!(x & 1) * 4) );

9
yoRadio/src/SSD1322/SSD1322.h
View File

@@ -33,9 +33,16 @@
#endif
#include <Adafruit_GFX.h>
#define BLACK 0 ///< Draw 'off' pixels
#define WHITE 0xf ///< Draw 'on' pixels
#define GRAY_D 0xd
#define GRAY_B 0xb
#define GRAY_9 0x9
#define GRAY_7 0x7
#define GRAY_5 0x5
#define GRAY_3 0x3
#define GRAY_2 0x2
#define GRAY_1 0x1
#define INVERSE 2 ///< Invert pixels
#define SSD1322_DISPLAYOFF 0xAE

2
yoRadio/src/core/options.h
View File

@@ -1,7 +1,7 @@
#ifndef options_h
#define options_h
#define YOVERSION "0.9.042"
#define YOVERSION "0.9.045"
/*******************************************************
DO NOT EDIT THIS FILE.

36
yoRadio/src/displays/displaySSD1322.cpp
View File

@@ -12,7 +12,9 @@
#ifndef DEF_SPI_FREQ
#define DEF_SPI_FREQ 16000000UL /* set it to 0 for system default */
#endif
#ifndef SSD1322_GRAYSCALE
#define SSD1322_GRAYSCALE false
#endif
const unsigned char logo [] PROGMEM=
{
0x06, 0x03, 0x00, 0x0f, 0x07, 0x80, 0x1f, 0x8f, 0xc0, 0x1f, 0x8f, 0xc0,
@@ -35,7 +37,37 @@ const unsigned char logo [] PROGMEM=
#include "tools/utf8RusGFX.h"
void DspCore::initDisplay() {
#include "tools/oledcolorfix.h"
#if !SSD1322_GRAYSCALE
#include "tools/oledcolorfix.h"
#else
config.theme.background = TFT_BG;
#if DSP_INVERT_TITLE
config.theme.meta = TFT_BG;
config.theme.metabg = GRAY_9;
config.theme.metafill = GRAY_9;
#else
config.theme.meta = GRAY_9;
config.theme.metabg = TFT_BG;
config.theme.metafill = TFT_BG;
#endif
config.theme.clock = TFT_FG;
config.theme.weather = GRAY_2;
config.theme.title1 = GRAY_B;
config.theme.title2 = GRAY_3;
config.theme.rssi = GRAY_5;
config.theme.ip = GRAY_2;
config.theme.vol = TFT_FG;
config.theme.bitrate = TFT_FG;
config.theme.digit = TFT_FG;
config.theme.buffer = TFT_FG;
config.theme.volbarout = GRAY_9;
config.theme.volbarin = GRAY_9;
config.theme.plcurrent = TFT_BG;
config.theme.plcurrentbg = GRAY_7;
config.theme.plcurrentfill = GRAY_7;
for(byte i=0;i<5;i++) config.theme.playlist[i] = GRAY_1;
#endif //!SSD1322_GRAYSCALE
begin();
cp437(true);
flip();