[parrot] fix upload on recent bebop2

Applying the modification proposed in #2138 after testing it.
The version check is for now disabled if the correct valid cannot be
retrive from the drone. This should be improved later.

close #2138
This commit is contained in:
Gautier Hattenberger
2017-12-14 21:39:01 +01:00
parent 4eb5ab1f13
commit 86101eca4d
+7 -10
View File
@@ -32,13 +32,6 @@ import argparse
import re
class ParrotVersion(object):
def __init__(self):
self.h = 0
self.m = 0
self.l = 0
self.rc = 0
self.raw = ''
def __init__(self, s):
try:
self.raw = s
@@ -52,7 +45,11 @@ class ParrotVersion(object):
else:
self.rc = 0
except:
self.__init__()
self.h = 0
self.m = 0
self.l = 0
self.rc = 0
self.raw = ''
def version(self):
return ( ( (self.h * 100 + self.m) * 100) + self.l) * 100 + self.rc
@@ -273,8 +270,8 @@ class ParrotUtils:
def upload_and_run(self, name, folder, min_ver=None, max_ver=None):
if self.check_version_before_run and min_ver is not None and max_ver is not None:
v = self.check_version()
print("Checking " + self.uav_name + " firmware version... " + str(v) )
if ((v < ParrotVersion(min_ver)) or (v > ParrotVersion(max_ver))):
print("Checking " + self.uav_name + " firmware version... " + str(v))
if ((not v == ParrotVersion('0.0.0.0')) and ((v < ParrotVersion(min_ver)) or (v > ParrotVersion(max_ver)))):
print("Error: please upgrade your " + self.uav_name + " firmware to version between " + min_ver + " and " + max_ver + "!")
return