Option do disable flight timer alarm. Disable sumamry reset from high…

… throttle
ShikOfTheRa · Jan 2, 2018 · 8f41150 · 8f41150
1 parent 8432c8f
commit 8f41150
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/MW_OSD/Config.h b/MW_OSD/Config.h
@@ -246,7 +246,7 @@
 //#define CROPGPSPOSITION           // Crop GPS coordinate display to decimals only ".DDDDDDD"
 //#define MASKGPSLOCATION           // MASK GPS coordinate display with major digits set to random location "XXX.DDDDDDD" 
 //#define TEXTMODE                  // Enable to display the flyingmode as text instead of symbols
-
+//NOSUMMARYTHROTTLERESET            // Enable to supress summary display clearing from throttle
 
 /********************       Power / efficiency display Settings         ************************/
 #define DISPLAYWATTS                // Enable this to display Watts (if Watts selected in layouts). Select one of WATTS/MAHMIN/EFFICIENCY

diff --git a/MW_OSD/Def.h b/MW_OSD/Def.h
@@ -547,6 +547,7 @@
   #undef  OSD_SWITCH_RC
   #undef  DISPLAY_PR
   #define NOAHI
+  #define NOSUMMARYTHROTTLERESET
 
 //  #define HIDEARMEDSTATUS
   #define ALARM_GPS 5
@@ -765,6 +766,7 @@ enum {
 #ifdef PROTOCOL_MAVLINK
 #undef  PROTOCOL_MSP
 #define FORCESENSORS
+#define NOSUMMARYTHROTTLERESET
 #endif
 
 #ifdef PROTOCOL_LTM

diff --git a/MW_OSD/Screen.ino b/MW_OSD/Screen.ino
@@ -792,8 +792,10 @@ void displayTime(void)
 
   uint32_t displaytime;
   if (armed) { 
-    if(((flyTime/60)>=Settings[S_FLYTIME_ALARM])&&(timer.Blink2hz))
-      return;
+    if (Settings[S_FLYTIME_ALARM]>0){
+      if(((flyTime/60)>=Settings[S_FLYTIME_ALARM])&&(timer.Blink2hz))
+        return;
+    }
 
     if(flyTime < 3600) {
       screenBuffer[0] = SYM_FLY_M;

diff --git a/MW_OSD/Serial.ino b/MW_OSD/Serial.ino
@@ -939,14 +939,14 @@ if((MwRcData[PITCHSTICK]>MAXSTICK)&&(MwRcData[YAWSTICK]>MAXSTICK)&&(MwRcData[THR
     else if(configMode) {
       int8_t oldmenudir=constrain(menudir,-5,5);
       menudir=0;
-#ifndef GPSOSD 
+#ifndef NOSUMMARYTHROTTLERESET 
       if(previousarmedstatus&&(MwRcData[THROTTLESTICK]>1300))
       {
 	// EXIT from SHOW STATISTICS AFTER DISARM (push throttle up)
 	waitStick = 2;
 	configExit();
       }
-#endif // GPSOSD 
+#endif // NOSUMMARYTHROTTLERESET 
 #ifdef TX_MODE1
       if(configMode&&(MwRcData[YAWSTICK]>MAXSTICK)) // MOVE RIGHT
 #else