@@ -188,6 +188,8 @@ def menu_callback(self, m):
188
188
189
189
def estimated_time_remaining (self , lat , lon , wpnum , speed ):
190
190
'''estimate time remaining in mission in seconds'''
191
+ if self .module ('wp' ) is None :
192
+ return 0
191
193
idx = wpnum
192
194
if wpnum >= self .module ('wp' ).wploader .count ():
193
195
return 0
@@ -382,13 +384,14 @@ def handle_vfr_hud(self, msg):
382
384
alt = master .field ('GPS_RAW_INT' , 'alt' , 0 ) / 1.0e3
383
385
else :
384
386
alt = master .field ('GPS_RAW' , 'alt' , 0 )
385
- home = self .module ('wp' ).get_home ()
386
- if home is not None :
387
- home_lat = home .x
388
- home_lng = home .y
389
- else :
390
- home_lat = None
391
- home_lng = None
387
+ home_lat = None
388
+ home_lng = None
389
+ if self .module ('wp' ) is not None :
390
+ home = self .module ('wp' ).get_home ()
391
+ if home is not None :
392
+ home_lat = home .x
393
+ home_lng = home .y
394
+
392
395
lat = master .field ('GLOBAL_POSITION_INT' , 'lat' , 0 ) * 1.0e-7
393
396
lng = master .field ('GLOBAL_POSITION_INT' , 'lon' , 0 ) * 1.0e-7
394
397
rel_alt = master .field ('GLOBAL_POSITION_INT' , 'relative_alt' , 0 ) * 1.0e-3
@@ -631,7 +634,10 @@ def handle_heartbeat(self, msg):
631
634
632
635
def handle_mission_current (self , msg ):
633
636
master = self .master
634
- wpmax = self .module ('wp' ).wploader .count ()
637
+ if self .module ('wp' ) is not None :
638
+ wpmax = self .module ('wp' ).wploader .count ()
639
+ else :
640
+ wpmax = 0
635
641
if wpmax > 0 :
636
642
wpmax = "/%u" % wpmax
637
643
else :
0 commit comments