pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-08 14:30:28 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

more linux build fixes

Browse Source
This commit is contained in:
Jm 2021-01-09 17:50:58 -08:00
parent 8b2798abd5
commit 5688c8b81e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/Screen.cpp
View File

@ -31,11 +31,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "graphics/images.h" #include "graphics/images.h"
#include "main.h" #include "main.h"
#include "mesh-pb-constants.h" #include "mesh-pb-constants.h"
#include "mesh/wifi/WiFiAPClient.h"
#include "plugins/TextMessagePlugin.h" #include "plugins/TextMessagePlugin.h"
#include "target_specific.h" #include "target_specific.h"
#include "utils.h" #include "utils.h"
#ifndef NO_ESP32
#include "mesh/wifi/WiFiAPClient.h"
#endif
using namespace meshtastic; /** @todo remove */ using namespace meshtastic; /** @todo remove */
namespace graphics namespace graphics
@ -895,10 +898,12 @@ void Screen::setFrames()
// call a method on debugInfoScreen object (for more details) // call a method on debugInfoScreen object (for more details)
normalFrames[numframes++] = &Screen::drawDebugInfoSettingsTrampoline; normalFrames[numframes++] = &Screen::drawDebugInfoSettingsTrampoline;
#ifndef NO_ESP32
if (isWifiAvailable()) { if (isWifiAvailable()) {
// call a method on debugInfoScreen object (for more details) // call a method on debugInfoScreen object (for more details)
normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline; normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline;
} }
#endif
ui.setFrames(normalFrames, numframes); ui.setFrames(normalFrames, numframes);
ui.enableAllIndicators(); ui.enableAllIndicators();

5
src/main.cpp
View File

@ -19,7 +19,6 @@
#include "concurrency/Periodic.h" #include "concurrency/Periodic.h"
#include "graphics/Screen.h" #include "graphics/Screen.h"
#include "main.h" #include "main.h"
#include "mesh/wifi/WiFiAPClient.h"
#include "plugins/Plugins.h" #include "plugins/Plugins.h"
#include "sleep.h" #include "sleep.h"
#include "target_specific.h" #include "target_specific.h"
@ -29,6 +28,7 @@
#ifndef NO_ESP32 #ifndef NO_ESP32
#include "mesh/wifi/WebServer.h" #include "mesh/wifi/WebServer.h"
#include "mesh/wifi/WiFiAPClient.h"
#include "nimble/BluetoothUtil.h" #include "nimble/BluetoothUtil.h"
#endif #endif
@ -513,10 +513,11 @@ void setup()
} }
#endif #endif
#ifndef NO_ESP32
// Initialize Wifi // Initialize Wifi
initWifi(forceSoftAP); initWifi(forceSoftAP);
#ifndef NO_ESP32
// Start web server thread. // Start web server thread.
webServerThread = new WebServerThread(); webServerThread = new WebServerThread();
#endif #endif