- use bigger screen fonts on Wiphone

- erase oldest entry from NodeDB if it is full.
pull/1774/head
Thomas Göttgens 2022-10-08 17:07:16 +02:00
rodzic e433895873
commit 6e40102f26
3 zmienionych plików z 18 dodań i 6 usunięć

Wyświetl plik

@ -97,7 +97,7 @@ static uint16_t displayWidth, displayHeight;
#define SCREEN_WIDTH displayWidth #define SCREEN_WIDTH displayWidth
#define SCREEN_HEIGHT displayHeight #define SCREEN_HEIGHT displayHeight
#if defined(USE_EINK) || defined(ILI9341_DRIVER) #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
// The screen is bigger so use bigger fonts // The screen is bigger so use bigger fonts
#define FONT_SMALL ArialMT_Plain_16 #define FONT_SMALL ArialMT_Plain_16
#define FONT_MEDIUM ArialMT_Plain_24 #define FONT_MEDIUM ArialMT_Plain_24

Wyświetl plik

@ -699,11 +699,23 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
if (!info) { if (!info) {
if (*numNodes >= MAX_NUM_NODES) { if (*numNodes >= MAX_NUM_NODES) {
screen->print("error: node_db full!\n"); screen->print("warning: node_db full! erasing oldest entry\n");
DEBUG_MSG("ERROR! could not create new node, node_db is full! (%d nodes)", *numNodes); // look for oldest node and erase it
return NULL; uint32_t oldest = UINT32_MAX;
int oldestIndex = -1;
for (int i = 0; i < *numNodes; i++) {
if (nodes[i].last_heard < oldest) {
oldest = nodes[i].last_heard;
oldestIndex = i;
}
}
// Shove the remaining nodes down the chain
for (int i = oldestIndex; i < *numNodes - 1; i++) {
nodes[i] = nodes[i + 1];
}
(*numNodes)--;
} }
// add the node // add the node at the end
info = &nodes[(*numNodes)++]; info = &nodes[(*numNodes)++];
// everything is missing except the nodenum // everything is missing except the nodenum

Wyświetl plik

@ -11,7 +11,7 @@
#include "graphics/fonts/OLEDDisplayFontsRU.h" #include "graphics/fonts/OLEDDisplayFontsRU.h"
#endif #endif
#if defined(USE_EINK) || defined(ILI9341_DRIVER) #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
// The screen is bigger so use bigger fonts // The screen is bigger so use bigger fonts
#define FONT_SMALL ArialMT_Plain_16 #define FONT_SMALL ArialMT_Plain_16
#define FONT_MEDIUM ArialMT_Plain_24 #define FONT_MEDIUM ArialMT_Plain_24