rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-20 08:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

trunk fmt

Browse Source
This commit is contained in:
Thomas Göttgens
2023-08-17 12:24:43 +02:00
parent 2b074e60d9
commit a7bf7f47b5
7 changed files with 416 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/RedirectablePrint.cpp
View File

@@ -1,8 +1,8 @@
#include "RedirectablePrint.h"
#include "NodeDB.h"
#include "gps/RTC.h"
#include "concurrency/OSThread.h"
#include "configuration.h"
#include "gps/RTC.h"
#include <assert.h>
#include <cstring>
#include <memory>

3
src/freertosinc.h
View File

@@ -12,7 +12,8 @@
#include <freertos/task.h>
#endif
#if defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_APOLLO3)
#if defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_RP2040) || \
defined(ARDUINO_ARCH_APOLLO3)
#define HAS_FREE_RTOS
#include <FreeRTOS.h>

6
src/main.cpp
View File

@@ -11,7 +11,6 @@
#include "power.h"
// #include "debug.h"
#include "FSCommon.h"
#include "gps/RTC.h"
#include "SPILock.h"
#include "concurrency/OSThread.h"
#include "concurrency/Periodic.h"
@@ -19,6 +18,7 @@
#include "detect/ScanI2CTwoWire.h"
#include "detect/axpDebug.h"
#include "detect/einkScan.h"
#include "gps/RTC.h"
#include "graphics/RAKled.h"
#include "graphics/Screen.h"
#include "main.h"
@@ -534,12 +534,12 @@ void setup()
pinMode(RF95_NSS, OUTPUT);
digitalWrite(RF95_NSS, HIGH);
SPI1.begin(false);
#else // HW_SPI1_DEVICE
#else // HW_SPI1_DEVICE
SPI.setSCK(RF95_SCK);
SPI.setTX(RF95_MOSI);
SPI.setRX(RF95_MISO);
SPI.begin(false);
#endif // HW_SPI1_DEVICE
#endif // HW_SPI1_DEVICE
#elif defined(ARCH_APOLLO3)
// Apollo3
SPI.begin();

2
src/mesh/MeshService.cpp
View File

@@ -8,8 +8,8 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "PowerFSM.h"
#include "gps/RTC.h"
#include "TypeConversions.h"
#include "gps/RTC.h"
#include "main.h"
#include "mesh-pb-constants.h"
#include "modules/NodeInfoModule.h"

2
src/mesh/NodeDB.cpp
View File

@@ -9,10 +9,10 @@
#include "NodeDB.h"
#include "PacketHistory.h"
#include "PowerFSM.h"
#include "gps/RTC.h"
#include "Router.h"
#include "TypeConversions.h"
#include "error.h"
#include "gps/RTC.h"
#include "main.h"
#include "mesh-pb-constants.h"
#include "modules/NeighborInfoModule.h"

2
src/platform/apollo3/main-apollo3.cpp
View File

@@ -1,5 +1,5 @@
#include "gps/RTC.h"
#include "configuration.h"
#include "gps/RTC.h"
void setBluetoothEnable(bool on) {}