Merge pull request #447 from EdgeTX/2.4

Merge from 2.4 branch
This commit is contained in:
richardclli
2021-07-14 10:41:13 +08:00
committed by GitHub
33 changed files with 1011 additions and 165 deletions
+1 -4
View File
@@ -26,6 +26,7 @@
// #include "shutdown_animation.h"
#include "radio_calibration.h"
#include "view_main.h"
#include "view_text.h"
#endif
#if defined(PCBSKY9X)
@@ -749,13 +750,9 @@ void checkAll()
disableVBatBridge();
#endif
#if defined(COLORLCD)
#warning "Model notes missing"
#else
if (g_model.displayChecklist && modelHasNotes()) {
readModelNotes();
}
#endif
#if defined(MULTIMODULE)
checkMultiLowPower();