pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-07 20:19:25 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removed one if by employing &&

Browse Source
This commit is contained in:
Patrick Siegl 2025-01-05 14:35:40 +00:00
parent 3237885897
commit e8577e8b66
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.cpp
View File

@ -863,24 +863,22 @@ void setup()
} }
}; };
for (auto& loraModule : loraModules) { for (auto& loraModule : loraModules) {
if (settingsMap[loraModule.cfgName]) { if (settingsMap[loraModule.cfgName] && !rIf) {
if (!rIf) { LOG_DEBUG("Activate %s radio on SPI port %s", loraModule.strName, settingsStrings[spidev].c_str());
LOG_DEBUG("Activate %s radio on SPI port %s", loraModule.strName, settingsStrings[spidev].c_str()); if (loraModule.ch341halsupport
if (loraModule.ch341halsupport && settingsStrings[spidev] == "ch341") {
&& settingsStrings[spidev] == "ch341") { RadioLibHAL = ch341Hal;
RadioLibHAL = ch341Hal; } else {
} else { RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
RadioLibHAL = new LockingArduinoHal(SPI, spiSettings); }
} rIf = loraModuleInterface(loraModule.cfgName, (LockingArduinoHal *)RadioLibHAL, settingsMap[cs_pin], settingsMap[irq_pin], settingsMap[reset_pin], settingsMap[busy_pin]);
rIf = loraModuleInterface(loraModule.cfgName, (LockingArduinoHal *)RadioLibHAL, settingsMap[cs_pin], settingsMap[irq_pin], settingsMap[reset_pin], settingsMap[busy_pin]); if (!rIf->init()) {
if (!rIf->init()) { LOG_WARN("No %s radio", loraModule.strName);
LOG_WARN("No %s radio", loraModule.strName); delete rIf;
delete rIf; rIf = NULL;
rIf = NULL; exit(EXIT_FAILURE);
exit(EXIT_FAILURE); } else {
} else { LOG_INFO("%s init success", loraModule.strName);
LOG_INFO("%s init success", loraModule.strName);
}
} }
} }
} }