radarsys Commit - r158:03c8e52d0d74 · Jicamarca Repository

devices/jars/__init__.py created 644 0 0

NO CONTENT: new file 100644

devices/jars/api.py created 644 +113 0

@@ -0,0 +1,113
	1	'''
	2	Created on Nov 25, 2015
	3
	4	@author: Miguel Urco
	5
	6	eth_device decorator is used to implement an api to ethernet devices.
	7	When eth_device decorator is used it adds two parameters to any function (ip and port)
	8
	9	#Definition of a function using eth_device decorator
	10
	11	@eth_device(ID_CLASS)
	12	def enable_acq(message)
	13	cmd = "xxxxx"
	14	payload = message
	15
	16	return cmd, payload
	17
	18	#How to call this function:
	19	answer = enable_acq(ip, port, message)
	20
	21	'''
	22	import sys
	23	import struct
	24	import json
	25
	26	from devices.jro_device import eth_device, IdClass
	27
	28	ID_CLASS = IdClass["jars"]
	29
	30	CMD_RESET = 0X01
	31	CMD_CHANGEIP = 0X03
	32	#Add other commands
	33	CMD_CONFIGURE = 0X10
	34	CMD_STATUS = 0X11
	35	CMD_SET_EXEPATH = 0X12
	36	CMD_ECHO = 0XFE
	37	CMD_READ = 0X08
	38	CMD_STOP = 0X09
	39
	40	@eth_device(ID_CLASS)
	41	def reset():
	42
	43	cmd = CMD_RESET
	44	payload = ''
	45
	46	return cmd, payload
	47
	48	@eth_device(ID_CLASS)
	49	def stop():
	50
	51	cmd = CMD_STOP
	52	payload = ''
	53
	54	return cmd, payload
	55
	56	@eth_device(ID_CLASS)
	57	def echo(message):
	58
	59	cmd = CMD_ECHO
	60	payload = message
	61
	62	return cmd, payload
	63
	64	@eth_device(ID_CLASS)
	65	def configure(conf):
	66
	67	cmd = CMD_CONFIGURE
	68	payload = conf
	69
	70	return cmd, payload
	71
	72	@eth_device(ID_CLASS)
	73	def status():
	74
	75	cmd = CMD_STATUS
	76	payload = ''
	77
	78	return cmd, payload
	79
	80	@eth_device(ID_CLASS)
	81	def read():
	82
	83	cmd = CMD_READ
	84	payload = ''
	85
	86	return cmd, payload
	87
	88	@eth_device(ID_CLASS)
	89	def set_exepath(path):
	90
	91	cmd = CMD_SET_EXEPATH
	92	payload = path
	93
	94	return cmd, payload
	95
	96	#--To take .json file from computer:
	97	#with open('/home/fquino/Downloads/Experiment.json') as data_file:
	98	# data = json.load(data_file)
	99
	100	# data['configurations']['dds']=''
	101	# data['configurations']['rc']['pulses']=''
	102	# data['configurations']['rc']['delays']=''
	103
	104	#data = json.dumps(data)
	105	#-----------------------------------
	106
	107	#print reset('10.10.10.100', 10000)
	108	#print echo('10.10.10.95', 10000, 'Hola JARS :)')
	109
	110	#json_data = json.dumps({'name':'archivo1','variable':9})
	111	#print configure('10.10.10.95', 10000, data)
	112	#print configure('10.10.10.100', 10000, '')
	113	#print status('10.10.10.100', 10000)

apache/apache_radarsys.conf +1 -1

                 Require all granted
                 #Allow from all
               </Files>
-            </Directory>
  No newline at end of file
+            </Directory>

apps/abs/urls.py +1 -5

@@ -3,8 +3,4 from django.conf.urls import url
3	urlpatterns = (	3	urlpatterns = (
4	url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_abs_conf'),	4	url(r'^(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_abs_conf'),
5	url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_abs_conf'),	5	url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_abs_conf'),
6	url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_abs_conf'),	6	)
7	url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_abs_conf'),
8	url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_abs_conf'),
9	url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_abs_conf'),
10	) No newline at end of file

apps/cgs/forms.py +9 -9

             from .models import CGSConfiguration
             class CGSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     #request = kwargs.pop('request')
                     super(CGSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='cgs')
                         if instance.experiment:
                             self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                 def clean(self):
                     return
+            #
                 class Meta:
                     model = CGSConfiguration
                     exclude = ('type', 'parameters', 'status')
                     #fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
             class UploadFileForm(forms.Form):
                 title = forms.CharField(label='Extension Type', widget=forms.TextInput(attrs={'readonly':'readonly'}))
-                file = forms.FileField()
  No newline at end of file
+                file = forms.FileField()

apps/jars/models.py +5 0

                     return self.device.status
+                def start_device(self):
+                    self.write_device()
                 def echo(self):
                     answer = api.echo(self.device.ip_address,self.device.port_address,'(=')

apps/rc/forms.py +4 -6

             import os
-            import ast
             import json
             from django import forms
                                                         widget=forms.Select(attrs={'name':'%s|%s|%s' % (count, line.id, label)}),
                                                         help_text=help_text)
                         else:
                             self.fields[label] = forms.CharField(initial=value, help_text=help_text)
                             if label in ('code', ):
                                 elif params[label]['widget']=='dc':
                                     self.fields[label].widget = KmUnitDcWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                                 elif params[label]['widget']=='codes':
                                     self.fields[label].widget = CodesWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                             else:
-                                self.fields[label].widget = DefaultWidget(attrs={'name':'%s|%s|%s' % (count, line.id, label)})
+                                self.fields[label].widget = DefaultWidget(attrs={'line':line, 'name':'%s|%s|%s' % (count, line.id, label)})
                 class Meta:

devices/jro_device.py +5 -2

                 def __sendTCPData(self, cadena):
                     sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                    sck.settimeout(2)
+                    sck.settimeout(3)
                     try:
                         sck.connect(self.address)
                             if time.time() - ini > 0.5:
                                 break
-                            tmp = sck.recv(255)
+                            try:
+                                tmp = sck.recv(4096)
+                            except:
+                                break
                             if len(tmp) < 1:
                                 continue

devices/rc/api.py +8 -26

             RC_CMD_RESET        =0X10
             RC_CMD_WRITE        =0x50
             RC_CMD_READ         =0x8000
-            RC_CMD_ENABLE       =0X24
-            RC_CMD_DISABLE      =0X00
             @eth_device(ID_CLASS)
             def reset():
                 return cmd, payload
             @eth_device(ID_CLASS)
-            def enable():
-                cmd = RC_CMD_ENABLE
-                payload = chr(0x01)
-                return cmd, payload
-            @eth_device(ID_CLASS)
-            def disable():
-                cmd = RC_CMD_DISABLE
-                payload = chr(0x00)
-                return cmd, payload
-            @eth_device(ID_CLASS)
             def read_all_device():
                 payload = ""
-                return RC_CMD_READ, payload
+                return CR_CMD_READ, payload
             @eth_device(ID_CLASS)
             def write_all_device(payload):
-                return RC_CMD_WRITE, payload
+                return CR_CMD_WRITE, payload
             def read_config(ip, port):
                 """
                 """
-                payload = write_ram_memory(parms['pulses'], parms['delays'])
+                payload = data.dict_to_rc_str(parms)
                 answer = write_all_device(ip, port, payload)
             def __get_low_byte(valor):
-                return ord(valor & 0x00FF)
+               return ord(valor & 0x00FF)
             def __get_high_byte(valor):
-                return ord((valor & 0xFF00) >> 8)
+               return ord((valor & 0xFF00) >> 8)
+            @eth_device(ID_CLASS)
             def write_ram_memory(vector_valores, vector_tiempos):
                 l1 = len(vector_valores)
                 cad = ""
                 for i in range(l1):
-                    cad += ord(84) + __get_low_byte(vector_valores[i]) + ord(85) + __get_high_byte(vector_valores[i]) + \
+                  cad += ord(84) + __get_low_byte(vector_valores[i]) + ord(85) + __get_high_byte(vector_valores[i]) + \
                          ord(84) + __get_low_byte(vector_tiempos[i]) + ord(85) + __get_high_byte(vector_tiempos[i])
-                return cad
+                return RC_CMD_WRITE, cad
             if __name__ == '__main__':
                 ip = "10.10.20.150"

radarsys/urls.py +1 -1

             from django.contrib import admin
             urlpatterns = [
                 url(r'^$', 'apps.main.views.index', name='index'),
                 url(r'^admin/', include(admin.site.urls)),
                 url(r'^accounts/', include('apps.accounts.urls')),
                 url(r'^', include('apps.main.urls')),

requirements.txt 0 -1

             bokeh==0.11.0
             numpy==1.10.4
             matplotlib==1.5.1

	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