Merge with latest 2.3

2020-10-07 21:01:45 +02:00
parent fd9ae06519 c07be1eb9b
commit 42a3198568
376 changed files with 10566 additions and 8633 deletions
@@ -36,11 +36,14 @@
 #define DISPLAY_VERSION "-radiomaster"
 #elif defined(TBS_RELEASE)
 #define DISPLAY_VERSION "-tbs"
+#elif defined(IMRC_RELEASE)
+#define DISPLAY_VERSION "-imrc"
 #else
 #define DISPLAY_VERSION
 #endif

 #if defined(COLORLCD)
+  const char fw_stamp[]    =   "FW" TAB ": opentx-" FLAVOUR;
  const char vers_stamp[]  =   "VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")";
  const char date_stamp[]  =   "DATE" TAB ": " DATE;
  const char time_stamp[]  =   "TIME" TAB ": " TIME;