Merge branch '2.4' into 3djc/diag-touch

This commit is contained in:
3djc
2021-04-10 13:31:50 +02:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -132,7 +132,7 @@ void storageEraseAll(bool warn)
TRACE("storageEraseAll");
generalDefault();
setModelDefault(0);
setModelDefaults(0);
if (warn) {
ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
+1
View File
@@ -27,6 +27,7 @@
#define SWAP_DEFINED
#include "opentx.h"
#include "model_init.h"
#define CHANNEL_MAX (1024*256)