Merge with latest 2.3

2020-01-08 16:35:30 +01:00
parent 3d6298b72e 22dacf7f85
commit 0626b31dfe
91 changed files with 1139 additions and 860 deletions
@@ -821,10 +821,8 @@ const char STR_MODELS_PATH[] = MODELS_PATH;
 const char STR_MODELS_EXT[] = MODELS_EXT;
 #endif

-#if defined(NIGHTLY_BUILD_WARNING)
-const char STR_NIGHTLY_WARNING[] = TR_NIGHTLY_WARNING;
-const char STR_NIGHTLY_NOTSAFE[] = TR_NIGHTLY_NOTSAFE;
-#endif
+const char STR_TEST_WARNING[] = TR_TEST_WARNING;
+const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE;

 #if LCD_W >= 212
 const char * const STR_PHASES_HEADERS[] = TR_PHASES_HEADERS;