Merge branch 'master' into master

This commit is contained in:
Thomas Göttgens
2022-09-09 21:39:29 +02:00
committed by GitHub
56 changed files with 780 additions and 820 deletions

View File

@@ -303,7 +303,7 @@ void setup()
// Do this after service.init (because that clears error_code)
#ifdef HAS_PMU
if (!pmu_found)
RECORD_CRITICALERROR(CriticalErrorCode_NoAXP192); // Record a hardware fault for missing hardware
RECORD_CRITICALERROR(CriticalErrorCode_NO_AXP192); // Record a hardware fault for missing hardware
#endif
// Don't call screen setup until after nodedb is setup (because we need
@@ -421,7 +421,7 @@ void setup()
airTime = new AirTime();
if (!rIf)
RECORD_CRITICALERROR(CriticalErrorCode_NoRadio);
RECORD_CRITICALERROR(CriticalErrorCode_NO_RADIO);
else {
router->addInterface(rIf);