kopia lustrzana https://github.com/meshtastic/firmware
fix wrong include file exclusion
rodzic
9d8a5221a9
commit
cd60ee80bd
16
src/main.cpp
16
src/main.cpp
|
@ -41,13 +41,14 @@
|
||||||
#endif
|
#endif
|
||||||
#if !MESHTASTIC_EXCLUDE_BLUETOOTH
|
#if !MESHTASTIC_EXCLUDE_BLUETOOTH
|
||||||
#include "nimble/NimbleBluetooth.h"
|
#include "nimble/NimbleBluetooth.h"
|
||||||
NimbleBluetooth *nimbleBluetooth;
|
NimbleBluetooth *nimbleBluetooth = nullptr;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ARCH_NRF52
|
#ifdef ARCH_NRF52
|
||||||
#include "NRF52Bluetooth.h"
|
#include "NRF52Bluetooth.h"
|
||||||
NRF52Bluetooth *nrf52Bluetooth;
|
NRF52Bluetooth *nrf52Bluetooth = nullptr;
|
||||||
|
;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_WIFI
|
#if HAS_WIFI
|
||||||
|
@ -94,23 +95,26 @@ NRF52Bluetooth *nrf52Bluetooth;
|
||||||
#include "ButtonThread.h"
|
#include "ButtonThread.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "AmbientLightingThread.h"
|
||||||
#include "PowerFSMThread.h"
|
#include "PowerFSMThread.h"
|
||||||
|
|
||||||
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
||||||
#include "AccelerometerThread.h"
|
#include "AccelerometerThread.h"
|
||||||
#include "AmbientLightingThread.h"
|
AccelerometerThread *accelerometerThread = nullptr;
|
||||||
AccelerometerThread *accelerometerThread;
|
;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAS_I2S
|
#ifdef HAS_I2S
|
||||||
#include "AudioThread.h"
|
#include "AudioThread.h"
|
||||||
AudioThread *audioThread;
|
AudioThread *audioThread = nullptr;
|
||||||
|
;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using namespace concurrency;
|
using namespace concurrency;
|
||||||
|
|
||||||
// We always create a screen object, but we only init it if we find the hardware
|
// We always create a screen object, but we only init it if we find the hardware
|
||||||
graphics::Screen *screen;
|
graphics::Screen *screen = nullptr;
|
||||||
|
;
|
||||||
|
|
||||||
// Global power status
|
// Global power status
|
||||||
meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();
|
meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();
|
||||||
|
|
Ładowanie…
Reference in New Issue