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

Merge pull request #52 from mc-hamster/osthread

Browse Source 
maybe this will fix the linux build?
This commit is contained in:
Jm Casler 2021-01-09 19:32:40 -08:00 committed by GitHub
commit 37e0f9a325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesh/NodeDB.cpp
View File

@ -16,10 +16,13 @@
#include "configuration.h" #include "configuration.h"
#include "error.h" #include "error.h"
#include "mesh-pb-constants.h" #include "mesh-pb-constants.h"
#include "mesh/wifi/WiFiAPClient.h"
#include <pb_decode.h> #include <pb_decode.h>
#include <pb_encode.h> #include <pb_encode.h>
#ifndef NO_ESP32
#include "mesh/wifi/WiFiAPClient.h"
#endif
NodeDB nodeDB; NodeDB nodeDB;
// we have plenty of ram so statically alloc this tempbuf (for now) // we have plenty of ram so statically alloc this tempbuf (for now)

5
src/nimble/BluetoothUtil.cpp
View File

@ -7,13 +7,16 @@
#include "esp_bt.h" #include "esp_bt.h"
#include "host/util/util.h" #include "host/util/util.h"
#include "main.h" #include "main.h"
#include "mesh/wifi/WiFiAPClient.h"
#include "nimble/NimbleDefs.h" #include "nimble/NimbleDefs.h"
#include "services/gap/ble_svc_gap.h" #include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h" #include "services/gatt/ble_svc_gatt.h"
#include <Arduino.h> #include <Arduino.h>
#include <WiFi.h> #include <WiFi.h>
#ifndef NO_ESP32
#include "mesh/wifi/WiFiAPClient.h"
#endif
static bool pinShowing; static bool pinShowing;
static uint32_t doublepressed; static uint32_t doublepressed;