Classe abstraite ctrl command + default + un peu de back sur les views et le simulateur

Quentin Durand
1 parent 54f89f9d
Showing 7 changed files with 144 additions and 61 deletions Show diff stats
src/dashboard/views.py
src/devices/Device.py
src/devices/Telescope.py
src/devices/TelescopeRemoteControl.py
src/devices/TelescopeRemoteControlAbstract.py
src/devices/TelescopeRemoteControlDefault.py
src/misc/static/js/command_control.js
@@ -17,7 +17,7 @@ from django.http import Http404
 import json
 from random import randint
 from devices.Telescope import TelescopeController
-from devices.TelescopeRemoteControl import TelescopeRemoteControl
+from devices.TelescopeRemoteControlDefault import TelescopeRemoteControlDefault
 from django.core.mail import send_mail
 import time
 import utils.celme as celme
@@ -298,25 +298,32 @@ def send_command_to_telescope(request):
 @level_required(3)
 def submit_command_to_telescope(request):
     if request.method == 'POST':
-        commands = [request.POST.get("comande"), request.POST.get("param1")]
-        try: #TODO faire un truc plus joli pour gérer les param
-            param2 = request.POST.get("param2")
-            if param2:
-                commands.append(param2)
+        commands = [request.POST.get("first_command"), request.POST.get("first_param")]
+        try: #TODO faire un truc plus joli pour gérer les params queqlue soit leur nombre
+            input_0 = request.POST.get("input_number_0")
+            input_1 = request.POST.get("input_number_1")
+            input_2 = request.POST.get("input_number_2")
+            if input_0:
+                commands.append(input_0)
+            if input_1:
+                commands.append(input_1)
+            if input_2:
+                commands.append(input_2)
         except Exception:
             pass
-        TelescopeRemoteControl(commands, False).exec_command()
+        response = TelescopeRemoteControlDefault(commands, False).exec_command()
+        #TODO passer en JS pour send les réponses en  AJAX
     return redirect('send_command_to_telescope')
  
 @login_required
 @level_required(3)
 def submit_command_to_telescope_expert(request):
-    import os
+    #import os
     if request.method == 'POST':
         param = request.POST.get("commande_expert")
         if param:
-            response = TelescopeRemoteControl(param, expert_mode=True).exec_command()
-            os.system("echo \"status :" + response + "\" >> /home/portos/IRAP/pyros/src/status")
+            response = TelescopeRemoteControlDefault(param, expert_mode=True).exec_command()
+            #os.system("echo \"status :" + response + "\" >> /home/portos/IRAP/pyros/src/status")
             return HttpResponse(json.dumps({'message': "Command send OK", 'response': response}))
         return HttpResponse(json.dumps({'message': "Missing command data"}))
     return redirect('submit_command_to_telescope')
@@ -103,7 +103,8 @@ class DeviceController():
         try:
             readable, writable, exceptional = select.select([self.sock], [], [self.sock], 0)
             if not (readable or exceptional):
-                raise (Exception("Socket not readable"))
+                ret = self.sock.recv(size).decode()
+                raise (Exception("KO: " + ret))
             ret = self.sock.recv(size).decode()
             if (not ret):
                 if (settings.DEBUG):
@@ -113,7 +114,7 @@ class DeviceController():
         except Exception as e:
             if (settings.DEBUG):
                 self.log(self.name, "Socket not readable : " + str(e))
-            return ("FAILED")
+            return (str(e))
         return (ret)
  
     def blockAndReadBytes(self, size) -> str:
@@ -28,6 +28,10 @@ class TelescopeController(DeviceController):
         response = self.blockAndReadMessage()
         return response
  
+    def send_command(self, command):
+        self.sendMessage(command)
+        return self.blockAndReadMessage()
+
     def getStatus(self):
         self.get("STATUS")
         return "OK"
@@ -1,49 +0,0 @@
-from django.conf import settings
-from common.models import Log
-from devices.Telescope import TelescopeController
-
-
-'''
-    Class managing the input from the remote commands sent by the dashboard
-    the command is parsed and sent to the Telescope via an instance of TelescopeController
-
-'''
-
-class TelescopeRemoteControl():
-    _command = []
-    _command_matcher = {}
-    def __init__(self, command, expert_mode):
-        self._command = command
-        if expert_mode:
-            self._command = str(command).split()
-        self._telescope = TelescopeController()
-        self._command_matcher = {
-            "GET": self.get,
-            "SET": self.set,
-            "DO": self.do,
-        }
-
-    def exec_command(self):
-        if self._command[0] in self._command_matcher:
-            response = self._command_matcher[self._command[0]]()
-        else:
-            return "KO: Unknown command"
-        return response
-
-    def get(self):
-        param_a = {"POSITION", "STATUS", "SETUP"}
-        if self._command[1] in param_a:
-            response = self._telescope.get(self._command[1])
-            return response
-        return "KO: Unknown command"
-
-    def set(self):
-        response = self._telescope.set(' '.join(self._command[1:]))
-        return "OK Command sent"
-
-    def do(self):
-        response = self._telescope.do(' '.join(self._command[1:]))
-        return "OK command sent"
-
-    def expert_command(self):
-        return True
@@ -0,0 +1,54 @@
+from django.conf import settings
+from common.models import Log
+from devices.Telescope import TelescopeController
+
+
+'''
+    Class managing the input from the remote commands sent by the dashboard
+    the command is parsed and sent to the Telescope via an instance of TelescopeController
+
+'''
+
+class TelescopeRemoteControlAbstract():
+    _command = []
+    _command_matcher_set = {}
+    _command_matcher_get = {}
+    _command_matcher_do = {}
+    _telescope = None
+
+    def __init__(self, command, expert_mode):
+        self._command = command
+        if expert_mode:
+            self._command = str(command).split()
+        self._telescope = TelescopeController()
+
+    def exec_command(self):
+        raise NotImplementedError("You must implement %s method" % type(self).__name__)
+        # if self._command[0] in self._command_matcher:
+        #     response = self._command_matcher[self._command[0]]()
+        # else:
+        #     return "KO: Unknown command"
+        # return response
+
+    def get(self):
+        # param_a = {"POSITION", "STATUS", "SETUP"}
+        # if self._command[1] in param_a:
+        #     response = self._telescope.get(self._command[1])
+        #     return response
+        # return "KO: Unknown command"
+        raise NotImplementedError("You must implement %s method" % type(self).__name__)
+
+    def set(self):
+        # response = self._telescope.set(' '.join(self._command[1:]))
+        # return "OK Command sent"
+        raise NotImplementedError("You must implement %s method" % type(self).__name__)
+
+    def do(self):
+        #response = self._telescope.do(' '.join(self._command[1:]))
+        #return "OK command sent"
+        raise NotImplementedError("You must implement %s method" % type(self).__name__)
+
+
+    def expert_command(self):
+        raise NotImplementedError("You must implement %s method" % type(self).__name__)
+        #return True
@@ -0,0 +1,64 @@
+from django.conf import settings
+from common.models import Log
+from devices.TelescopeRemoteControlAbstract import TelescopeRemoteControlAbstract
+from devices.Telescope import TelescopeController
+import os
+
+class TelescopeRemoteControlDefault(TelescopeRemoteControlAbstract):
+    _command_matcher_set = {
+        "COORD_RADEC": "COORD_RADEC",
+        "COORD_HADEC": "COORD_HADEC",
+        "COORD_ALTAZ": "COORD_ALTAZ",
+        "DRIFT_HADEC": "DRIFT_HADEC",
+        "ROTATOR_ANGLE": "ROTATOR_ANGLE"
+    }
+    _command_matcher_get = {
+        "INFORMATIONS": "INFORMATIONS",
+        "COORD_RADEC": "COORD_RADEC",
+        "COORD_HADEC": "COORD_HADEC",
+        "COORD_ALTAZ": "COORD_ALTAZ"
+    }
+    _command_matcher_do = {
+        "EVAL": "EVAL",
+        "HOMING": "HOMING",
+        "ZENITH": "ZENITH",
+        "GOTO": "GOTO",
+        "STOP": "STOP",
+        "DRIFT_ON": "DRIFT_ON",
+        "DRIFT_OFF": "DRIFT_OFF",
+        "ROTATOR_GOTO": "ROTATOR_GOTO"
+    }
+    def __init__(self, command, expert_mode):
+        super().__init__(command, expert_mode)
+
+    def exec_command(self):
+
+        os.system("echo \"status :" + str(self._command) + "\" >> /home/portos/IRAP/pyros/src/commande_recu")
+        if self._command[0] == "GET": return self.get()
+        elif self._command[0] == "SET": return self.set()
+        elif self._command[0] == "DO": return self.do()
+        else: return "KO: Unknown command"
+
+    def do(self):
+        if self._command[1] in self._command_matcher_do:
+            definitive_command = "DO " + self._command_matcher_do[self._command[1]] + ' ' + ' '.join(self._command[2:])
+            response = self._telescope.send_command(definitive_command)
+        else:
+            response = "KO: Unknown command"
+        return response
+
+    def set(self):
+        if self._command[1] in self._command_matcher_set:
+            definitive_command = "SET " + self._command_matcher_set[self._command[1]] + ' ' + ' '.join(self._command[2:])
+            response = self._telescope.send_command(definitive_command)
+        else:
+            response = "KO: Unknown command"
+        return response
+
+    def get(self):
+        if self._command[1] in self._command_matcher_get:
+            definitive_command = "GET " + self._command_matcher_get[self._command[1]] #+ " " + self._command[2:]
+            response = self._telescope.send_command(definitive_command)
+        else:
+            response = "KO: Unknown command"
+        return response
 \ No newline at end of file
@@ -159,6 +159,8 @@ $(&quot;#command_form_expert&quot;).submit(function(event){
       console.log(obj.response);
       if (obj.response === "KO: Unknown command")
         alert("Unknown command");
+      else if (obj.response.startsWith("KO"))
+          alert(obj.response);
     })
        .fail(function() {
          alert( "An error occured" );