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

woopsie

Browse Source
This commit is contained in:
Thomas Göttgens 2024-10-08 13:53:51 +02:00
parent f0c97b8806
commit 19bcb60120
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.cpp
View File

@ -19,12 +19,9 @@
#include "concurrency/OSThread.h" #include "concurrency/OSThread.h"
#include "concurrency/Periodic.h" #include "concurrency/Periodic.h"
#include "detect/ScanI2C.h" #include "detect/ScanI2C.h"
<<<<<<< HEAD
#include "gps/RTC.h"
=======
#include "error.h" #include "error.h"
#include "gps/RTC.h"
#include "power.h" #include "power.h"
>>>>>>> master
#if !MESHTASTIC_EXCLUDE_I2C #if !MESHTASTIC_EXCLUDE_I2C
#include "detect/ScanI2CTwoWire.h" #include "detect/ScanI2CTwoWire.h"
@ -108,13 +105,8 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
#include "AmbientLightingThread.h" #include "AmbientLightingThread.h"
#include "PowerFSMThread.h" #include "PowerFSMThread.h"
<<<<<<< HEAD #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_APOLLO3)
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(ARCH_APOLLO3) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
#include "AccelerometerThread.h"
=======
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
#include "motion/AccelerometerThread.h" #include "motion/AccelerometerThread.h"
>>>>>>> master
AccelerometerThread *accelerometerThread = nullptr; AccelerometerThread *accelerometerThread = nullptr;
#endif #endif