radarsys Commit - r207:2d204f6ad0f7 · Jicamarca Repository

standardize functions in cgs device, abs device does not have read_device function...

Fiorella Quino -

r207:2d204f6ad0f7

parent child

Context file:

r207:2d204f6ad0f7

Collapse all files

apps/abs/models.py +58 -9

                  return bits
+             def up_conv_value(bits):
+                 if bits == "000": value=1.0
+                 if bits == "001": value=2.0
+                 if bits == "010": value=3.0
+                 if bits == "011": value=0.0
+                 if bits == "100": value=0.5
+                 if bits == "101": value=1.5
+                 if bits == "110": value=2.5
+                 if bits == "111": value=3.5
+                 return value
+             def down_conv_value(bits):
+                 if bits == "000": value=1.0
+                 if bits == "001": value=2.0
+                 if bits == "010": value=3.0
+                 if bits == "011": value=0.0
+                 if bits == "100": value=0.5
+                 if bits == "101": value=1.5
+                 if bits == "110": value=2.5
+                 if bits == "111": value=3.5
+                 return value
              def ip2position(module_number):
                  j=0
                  i=0
                      Read out-bits (up-down) of 1 abs module NOT for Configuration
                      """
-                     parameters = {}
                      ip_address  = self.device.ip_address
                      ip_address  = ip_address.split('.')
                      module_seq  = (ip_address[0],ip_address[1],ip_address[2])
                      module_port = self.device.port_address
                      read_route = 'http://'+module_ip+':'+str(module_port)+'/read'
+                     module_status = json.loads(self.module_status)
                      print(read_route)
-                     answer = ''
                      module_bits = ''
                      try:
-                         r_write = requests.get(read_route, timeout=0.7)
-                         answer  = r_write.json()
-                         self.message = answer['message']
-                         module_bits    = answer['allbits']
+                         r_read      = requests.get(read_route, timeout=0.5)
+                         answer      = r_read.json()
+                         module_bits = answer['allbits']
                      except:
-                         #message = "Could not read ABS parameters"
-                         answer  = r_write.json()
-                         return 0
+                         return {}
                      return module_bits
+                 def read_device(self):
+                     parms = {}
+                     # Reads active modules.
+                     module_status = json.loads(self.module_status)
+                     total = 0
+                     for status in module_status:
+                         if module_status[status] != 0:
+                             module_bits = self.read_module(int(status))
+                             bits={}
+                             if module_bits:
+                                 bits = (str(module_bits['um2']) + str(module_bits['um1']) + str(module_bits['um0']) +
+                                         str(module_bits['dm2']) + str(module_bits['dm1']) + str(module_bits['dm0']) )
+                                 parms[str(status)] = bits
+                             total +=1
+                     if total==0:
+                         self.message = "No ABS Module detected. Please select 'Status'."
+                         return False
+                     self.message = "ABS Modules have been read"
+                     #monitoreo_tx = JROABSClnt_01CeCnMod000000MNTR10
+                     return parms
                  def absmodule_status(self):
                      """

apps/cgs/models.py +11 -6

                      except:
                          self.device.status = 0
                          self.device.save()
-                         return self.device.status
+                         self.message = 'Could not read CGS status'
+                         return False
                      response = str(r.text)
                      response = response.split(";")
                      self.device.save()
-                     return self.device.status
+                     return True
                  def read_device(self):
                          r = requests.post(route, post_data, timeout=0.5)
                      except:
                          self.message = "Could not write CGS parameters"
-                         return None
+                         return False
                      text = r.text
                      text = text.split(',')
                          status = text[1]
                          if title == "okay":
                              self.message = status
-                             return 3
+                             self.device.status =  3
+                             self.device.save()
+                             return True
                          else:
                              self.message = title + ", " + status
-                             return 1
+                             self.device.status = 1
+                             self.device.save()
+                             return False
-                     return 1
+                     return False
                  class Meta:

apps/main/templates/dev_conf.html +2 0

                  <li><a href="{{ dev_conf.get_absolute_url_stop }}"><span class="glyphicon glyphicon-stop" aria-hidden="true"></span> Stop</a></li>
                  {% endif %}
                  <li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li>
+                 {% if dev_conf.device.device_type.name != 'abs' %}
                  <li><a href="{{ dev_conf.get_absolute_url_read }}"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span> Read</a></li>
+                 {% endif %}
                </ul>
              </span>
              {% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages