mirror of
https://github.com/meshtastic/firmware.git
synced 2025-07-31 02:45:41 +00:00
Code updates to resolve build failures
This commit is contained in:
parent
90385ab0cb
commit
436a3a6944
@ -3,6 +3,8 @@
|
|||||||
#include "gps/GeoCoord.h"
|
#include "gps/GeoCoord.h"
|
||||||
#include "graphics/Screen.h"
|
#include "graphics/Screen.h"
|
||||||
|
|
||||||
|
#if HAS_SCREEN
|
||||||
|
|
||||||
using namespace meshtastic;
|
using namespace meshtastic;
|
||||||
|
|
||||||
const int32_t BRC_LATI = (40.786958 * 1e7);
|
const int32_t BRC_LATI = (40.786958 * 1e7);
|
||||||
@ -150,3 +152,5 @@ int BRCAddress::compact(char *buf, size_t len)
|
|||||||
buf[l] = 0; // always null terminated
|
buf[l] = 0; // always null terminated
|
||||||
return l;
|
return l;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
@ -905,7 +905,7 @@ void Screen::setFrames(FrameFocus focus)
|
|||||||
|
|
||||||
// Show detailed node views only on E-Ink builds
|
// Show detailed node views only on E-Ink builds
|
||||||
#ifdef USE_EINK
|
#ifdef USE_EINK
|
||||||
fsi.positions.nodelist_bearings = numframes;
|
fsi.positions.nodelist_lastheard = numframes;
|
||||||
normalFrames[numframes++] = graphics::NodeListRenderer::drawLastHeardScreen;
|
normalFrames[numframes++] = graphics::NodeListRenderer::drawLastHeardScreen;
|
||||||
indicatorIcons.push_back(icon_nodes);
|
indicatorIcons.push_back(icon_nodes);
|
||||||
|
|
||||||
@ -916,15 +916,17 @@ void Screen::setFrames(FrameFocus focus)
|
|||||||
fsi.positions.nodelist_distance = numframes;
|
fsi.positions.nodelist_distance = numframes;
|
||||||
normalFrames[numframes++] = graphics::NodeListRenderer::drawDistanceScreen;
|
normalFrames[numframes++] = graphics::NodeListRenderer::drawDistanceScreen;
|
||||||
indicatorIcons.push_back(icon_distance);
|
indicatorIcons.push_back(icon_distance);
|
||||||
|
#endif
|
||||||
|
#if HAS_GPS
|
||||||
fsi.positions.nodelist_bearings = numframes;
|
fsi.positions.nodelist_bearings = numframes;
|
||||||
normalFrames[numframes++] = graphics::NodeListRenderer::drawNodeListWithCompasses;
|
normalFrames[numframes++] = graphics::NodeListRenderer::drawNodeListWithCompasses;
|
||||||
indicatorIcons.push_back(icon_list);
|
indicatorIcons.push_back(icon_list);
|
||||||
#endif
|
|
||||||
#if HAS_GPS
|
#if HAS_SCREEN
|
||||||
fsi.positions.nodelist_brc = numframes;
|
fsi.positions.nodelist_brc = numframes;
|
||||||
normalFrames[numframes++] = graphics::NodeListRenderer::drawBRCList;
|
normalFrames[numframes++] = graphics::NodeListRenderer::drawBRCList;
|
||||||
indicatorIcons.push_back(icon_bm);
|
indicatorIcons.push_back(icon_bm);
|
||||||
|
#endif
|
||||||
|
|
||||||
fsi.positions.gps = numframes;
|
fsi.positions.gps = numframes;
|
||||||
normalFrames[numframes++] = graphics::UIRenderer::drawCompassAndLocationScreen;
|
normalFrames[numframes++] = graphics::UIRenderer::drawCompassAndLocationScreen;
|
||||||
|
Loading…
Reference in New Issue
Block a user