Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

jeremy
2 parents 6c2793c2 dbacdf02
Showing 5 changed files with 2 additions and 4 deletions Show diff stats
install/install.json
install/install.py
src/analyzer/analyzer
src/observation_manager/calibrator
src/observation_manager/tasks.py
@@ -12,8 +12,6 @@
             "update"
         ],
         "normal": [
-            "pip install --upgrade pip",
-            "pip install virtualenv --upgrade"
         ],
         "private": [
             "create", "pyros"
@@ -336,8 +336,6 @@ class Config:
         "env_bin": [],
         "env_pip": [],
         "normal": [
-            "pip install --upgrade pip",
-            "pip install virtualenv --upgrade"
         ],
         "special": ["create"],
         "link": ["update"]
@@ -109,6 +109,7 @@ class execute_plan_vis(execute_plan):
         self.tel.do("GOTO " + str(self.plan.position))
         self.vis_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration))
         self.log("Sleeping for " + str(int(self.duration)))
+        #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible
         time.sleep(int(self.duration))
         self.launchCalibration()
         return 0
@@ -132,6 +133,7 @@ class execute_plan_nir(execute_plan):
         self.tel.do("GOTO " + str(self.plan.position))
         self.nir_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration))
         self.log("Sleeping for " + str(int(self.duration)))
+        #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible
         time.sleep(int(self.duration))
         self.launchCalibration()
         return 0