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

v0.8.988

Browse Source
This commit is contained in:
e2002
2023-03-02 11:51:58 +03:00
parent c7fcb3c3bd
commit 04dd43f159
8 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
yoRadio/src/core/display.cpp
View File

@@ -425,11 +425,12 @@ void Display::_setRSSI(int rssi) {
return;
#endif
char rssiG[3];
if(rssi >= -50) strlcpy(rssiG, "\004\006", 3);
if(rssi >= -60 && rssi < -50) strlcpy(rssiG, "\004\005", 3);
if(rssi >= -70 && rssi < -60) strlcpy(rssiG, "\004\002", 3);
if(rssi >= -80 && rssi < -70) strlcpy(rssiG, "\003\002", 3);
if(rssi < -80 || rssi >= 0) strlcpy(rssiG, "\001\002", 3);
int rssi_steps[] = {RSSI_STEPS};
if(rssi >= rssi_steps[0]) strlcpy(rssiG, "\004\006", 3);
if(rssi >= rssi_steps[1] && rssi < rssi_steps[0]) strlcpy(rssiG, "\004\005", 3);
if(rssi >= rssi_steps[2] && rssi < rssi_steps[1]) strlcpy(rssiG, "\004\002", 3);
if(rssi >= rssi_steps[3] && rssi < rssi_steps[2]) strlcpy(rssiG, "\003\002", 3);
if(rssi < rssi_steps[3] || rssi >= 0) strlcpy(rssiG, "\001\002", 3);
_rssi->setText(rssiG);
}

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

@@ -1,7 +1,7 @@
#ifndef options_h
#define options_h
#define YOVERSION "0.8.981"
#define YOVERSION "0.8.988"
/*******************************************************
DO NOT EDIT THIS FILE.
@@ -291,6 +291,9 @@ The connection tables are located here https://github.com/e2002/yoradio#connecti
#ifndef RSSI_DIGIT
#define RSSI_DIGIT false // Extended weather
#endif
#ifndef RSSI_STEPS
#define RSSI_STEPS -50,-60,-70,-80
#endif
/*
*** ST7735 display submodel ***
INITR_BLACKTAB // 1.8' https://aliexpress.ru/item/1005002822797745.html

2
yoRadio/src/displays/conf/displayGC9A01Aconf.h
View File

@@ -58,7 +58,7 @@ const VUBandsConfig bandsConf PROGMEM = { 90, 20, 6, 2, 10, 5 };
const char numtxtFmt[] PROGMEM = "%d";
const char rssiFmt[] PROGMEM = "WIFI %d";
const char iptxtFmt[] PROGMEM = "%s";
const char voltxtFmt[] PROGMEM = "\016 %d";
const char voltxtFmt[] PROGMEM = "\023\025%d";
const char bitrateFmt[] PROGMEM = "%d KBS";
/* MOVES */ /* { left, top, width } */

2
yoRadio/src/displays/conf/displayILI9341conf.h
View File

@@ -57,7 +57,7 @@ const VUBandsConfig bandsConf PROGMEM = { 24, 100, 4, 2, 10, 5 };
const char numtxtFmt[] PROGMEM = "%d";
const char rssiFmt[] PROGMEM = "WiFi %d";
const char iptxtFmt[] PROGMEM = "\010 %s";
const char voltxtFmt[] PROGMEM = "\016 %d";
const char voltxtFmt[] PROGMEM = "\023\025%d";
const char bitrateFmt[] PROGMEM = "%d kBs";
/* MOVES */ /* { left, top, width } */

4
yoRadio/src/displays/conf/displayILI9488conf.h
View File

@@ -39,7 +39,7 @@ const WidgetConfig bootstrConf PROGMEM = { 0, 243, 1, WA_CENTER };
const WidgetConfig bitrateConf PROGMEM = { 6, 62, 2, WA_RIGHT };
const WidgetConfig voltxtConf PROGMEM = { 0, DSP_HEIGHT-38, 2, WA_CENTER };
const WidgetConfig iptxtConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38, 2, WA_LEFT };
const WidgetConfig rssiConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38-10, 3, WA_RIGHT };
const WidgetConfig rssiConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38-6, 3, WA_RIGHT };
const WidgetConfig numConf PROGMEM = { 0, 200, 70, WA_CENTER };
const WidgetConfig apNameConf PROGMEM = { TFT_FRAMEWDT, 88, 3, WA_CENTER };
const WidgetConfig apName2Conf PROGMEM = { TFT_FRAMEWDT, 120, 3, WA_CENTER };
@@ -58,7 +58,7 @@ const VUBandsConfig bandsConf PROGMEM = { 32, 130, 4, 2, 10, 10 };
const char numtxtFmt[] PROGMEM = "%d";
const char rssiFmt[] PROGMEM = "WiFi %d";
const char iptxtFmt[] PROGMEM = "%s";
const char voltxtFmt[] PROGMEM = "%d";
const char voltxtFmt[] PROGMEM = "\023\025%d";
const char bitrateFmt[] PROGMEM = "%d kBs";
/* MOVES */ /* { left, top, width } */

2
yoRadio/src/displays/conf/displayST7789conf.h
View File

@@ -57,7 +57,7 @@ const VUBandsConfig bandsConf PROGMEM = { 24, 100, 4, 2, 10, 4 };
const char numtxtFmt[] PROGMEM = "%d";
const char rssiFmt[] PROGMEM = "WiFi %d";
const char iptxtFmt[] PROGMEM = "\010 %s";
const char voltxtFmt[] PROGMEM = "\016 %d";
const char voltxtFmt[] PROGMEM = "\023\025%d";
const char bitrateFmt[] PROGMEM = "%d kBs";
/* MOVES */ /* { left, top, width } */

4
yoRadio/src/displays/conf/displayST7796conf.h
View File

@@ -39,7 +39,7 @@ const WidgetConfig bootstrConf PROGMEM = { 0, 243, 1, WA_CENTER };
const WidgetConfig bitrateConf PROGMEM = { 6, 62, 2, WA_RIGHT };
const WidgetConfig voltxtConf PROGMEM = { 0, DSP_HEIGHT-38, 2, WA_CENTER };
const WidgetConfig iptxtConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38, 2, WA_LEFT };
const WidgetConfig rssiConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38-16, 4, WA_RIGHT };
const WidgetConfig rssiConf PROGMEM = { TFT_FRAMEWDT, DSP_HEIGHT-38-6, 3, WA_RIGHT };
const WidgetConfig numConf PROGMEM = { 0, 200, 70, WA_CENTER };
const WidgetConfig apNameConf PROGMEM = { TFT_FRAMEWDT, 88, 3, WA_CENTER };
const WidgetConfig apName2Conf PROGMEM = { TFT_FRAMEWDT, 120, 3, WA_CENTER };
@@ -58,7 +58,7 @@ const VUBandsConfig bandsConf PROGMEM = { 32, 130, 4, 2, 10, 6 };
const char numtxtFmt[] PROGMEM = "%d";
const char rssiFmt[] PROGMEM = "WiFi %d";
const char iptxtFmt[] PROGMEM = "%s";
const char voltxtFmt[] PROGMEM = "%d";
const char voltxtFmt[] PROGMEM = "\023\025%d";
const char bitrateFmt[] PROGMEM = "%d kBs";
/* MOVES */ /* { left, top, width } */