Permalink
Browse files

Added motor failure detection / temporary removed setup screen for size

  • Loading branch information...
marcmerlin committed Oct 26, 2017
1 parent a28460b commit a05f3eef9c951a7eb4a081f48743e9703caa5af2
Showing with 24 additions and 14 deletions.
  1. +17 −7 MinimOsd_Extra/Panels.h
  2. +1 −1 MinimOsd_Extra/version.h
  3. +1 −1 Released/config.xml
  4. BIN Released/landing.tlog
  5. +5 −5 build.sh
@@ -898,19 +898,25 @@ static inline void check_warn(point p)
if (sets.battBv !=0 && iVolt!=0 && (iVolt < sets.battBv) )
wmask |= (1<<6);
// Motor running but amps too low likely means motor failure
// osd_curr_A is in hundreds of amps, so 1 = 0.01A
// 30% throttle or more, and less than 2A is deemed a motor failure
if(osd_throttle>30 && osd_curr_A < 200)
wmask |= (1<<7);
#if defined(USE_MAVLINK)
if(is_alt(p)) {
//8
if(mav_fence_status == FENCE_BREACH_MINALT)
wmask |= (1<<7);
wmask |= (1<<8);
//9
if(mav_fence_status == FENCE_BREACH_MAXALT)
wmask |= (1<<8);
wmask |= (1<<9);
//10
if(mav_fence_status == FENCE_BREACH_BOUNDARY)
wmask |= (1<<9);
wmask |= (1<<10);
}
#endif
@@ -952,9 +958,10 @@ const char PROGMEM w4[]="\x42\x61\x74\x74\x65\x72\x79\x20\x4c\x6f\x77\x21"; //Ba
const char PROGMEM w5[]="\x20\x4c\x6f\x77\x20\x52\x73\x73\x69!"; // Low Rssi!
const char PROGMEM w6[]="\x48\x69\x67\x68\x20\x56\x53\x70\x65\x65\x64\x21"; //Hi VSpeed!
const char PROGMEM w7[]="Batt B low!";
const char PROGMEM w8[]="Fence Low!";
const char PROGMEM w9[]="Fence High!";
const char PROGMEM w10[]="Fence Far!";
const char PROGMEM w8[]="Motor Dead?";
const char PROGMEM w9[]="Fence Low!";
const char PROGMEM w10[]="Fence High!";
const char PROGMEM w11[]="Fence Far!";
const char * const PROGMEM warn_str[] = {
w1,
@@ -966,7 +973,8 @@ const char * const PROGMEM warn_str[] = {
w7,
w8,
w9,
w10
w10,
w11,
};
static void panWarn(point p){
@@ -2542,6 +2550,7 @@ static void /*NOINLINE*/ move_screen(char dir){
static void panSetup(){
#if 0
const Params *p;
float v = 0;
byte size;
@@ -2768,6 +2777,7 @@ as_c: *((char *)pval) = cv + add;
}
#endif
}
#endif
@@ -1,3 +1,3 @@
#pragma once
#define RELEASE_NUM 936
#define RELEASE_NUM 937
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="us-ascii"?>
<Config>
<comport>COM4</comport>
<comport>COM25</comport>
<Pal>True</Pal>
<AutoUpdate>False</AutoUpdate>
<CheckForUpdates>True</CheckForUpdates>
BIN +258 KB Released/landing.tlog
Binary file not shown.
@@ -20,11 +20,11 @@ make_one(){
# build mavlink first since uavtalk requires extra libraries not included in this source.
make_one 'MAVLINK'
make_one 'UAVTALK'
make_one 'MWII'
make_one 'NMEA'
make_one 'LTM'
#make_one 'MAVLINK'
#make_one 'UAVTALK'
#make_one 'MWII'
#make_one 'NMEA'
#make_one 'LTM'
#make_one 'MAVLINK' '-DWALKERA_TELEM=RssiPin' &&

0 comments on commit a05f3ee

Please sign in to comment.