mirror
/
LoRa_APRS_iGate
kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_iGate
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "Closing comm devices" 

This reverts commit da77afcbe5.
pull/231/head
Morgan Diepart 2022-12-20 22:19:34 +01:00
rodzic da77afcbe5
commit 1df06c66d5
1 zmienionych plików z 2 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
lib/BoardFinder/BoardFinder.cpp
Wyświetl plik

@ -21,7 +21,6 @@ BoardConfig const *BoardFinder::searchBoardConfig(logging::Logger &logger) {
Wire.begin(boardconf->OledSda, boardconf->OledScl); Wire.begin(boardconf->OledSda, boardconf->OledScl);
powerManagement.begin(Wire); powerManagement.begin(Wire);
powerManagement.activateOLED(); powerManagement.activateOLED();
Wire.end();
} else if (boardconf->needCheckPowerChip) { } else if (boardconf->needCheckPowerChip) {
continue; continue;
} }
@ -39,7 +38,6 @@ BoardConfig const *BoardFinder::searchBoardConfig(logging::Logger &logger) {
Wire.begin(boardconf->OledSda, boardconf->OledScl); Wire.begin(boardconf->OledSda, boardconf->OledScl);
powerManagement.begin(Wire); powerManagement.begin(Wire);
powerManagement.activateLoRa(); powerManagement.activateLoRa();
Wire.end();
} }
if (checkModemConfig(boardconf)) { if (checkModemConfig(boardconf)) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, MODULE_NAME, "found a board config: %s", boardconf->Name.c_str()); logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, MODULE_NAME, "found a board config: %s", boardconf->Name.c_str());
@ -77,10 +75,8 @@ bool BoardFinder::checkOledConfig(BoardConfig const *boardConfig, logging::Logge
} }
Wire.beginTransmission(boardConfig->OledAddr); Wire.beginTransmission(boardConfig->OledAddr);
if (!Wire.endTransmission()) { if (!Wire.endTransmission()) {
Wire.end();
return true; return true;
} }
Wire.end();
return false; return false;
} }
@ -102,8 +98,9 @@ bool BoardFinder::checkModemConfig(BoardConfig const *boardConfig) {
SPI.transfer(0x42); SPI.transfer(0x42);
uint8_t response = SPI.transfer(0x00); uint8_t response = SPI.transfer(0x00);
SPI.endTransaction(); SPI.endTransaction();
digitalWrite(boardConfig->LoraCS, HIGH); digitalWrite(boardConfig->LoraCS, HIGH);
SPI.end();
if (response == 0x12) { if (response == 0x12) {
return true; return true;
} }
@ -123,8 +120,6 @@ bool BoardFinder::checkPowerConfig(BoardConfig const *boardConfig, logging::Logg
int response = Wire.read(); int response = Wire.read();
Wire.endTransmission(); Wire.endTransmission();
Wire.end();
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "wire response: %d", response); logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "wire response: %d", response);
if (response == 0x03) { if (response == 0x03) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "power chip found!"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, MODULE_NAME, "power chip found!");