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

fix merge issue

Browse Source
This commit is contained in:
mverch67 2024-10-14 15:42:05 +02:00
parent f7e708753c
commit 339bbdbf37
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@ -744,7 +744,7 @@ void setup()
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)\n", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)\n", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
SPI.setFrequency(4000000); SPI.setFrequency(4000000);
#endif
#if HAS_TFT #if HAS_TFT
#ifdef PORTDUINO #ifdef PORTDUINO
if (settingsMap[displayPanel] != no_screen) { if (settingsMap[displayPanel] != no_screen) {