radarsys Commit - r397:e40954e05ac0 · Jicamarca Repository

ATRAD actualizando títulos

Renato Huallpa -

r397:e40954e05ac0

parent child

Context file:

r397:e40954e05ac0

Expand all files

.env 644 ➡ 755 +1 0

             MQTT_USER_ATRAD=''
             MQTT_PASSWORD_ATRAD = ''
             MQTT_TOPIC_ATRAD_RECIEVE = "atrad/test4"
+            MQTT_TOPIC_ATRAD_CONTROL = "atrad/test2"
             MQTT_USER = abs
             MQTT_PASSWORD = abs

apps/abs/models.py +1 -27

                         try:
                             #self.write_device()
                             send_task('task_change_beam', [self.id],)
-                            # print("*************************RUNNING ABS**************************",flush=True)
                             self.message = 'ABS running'
                         except Exception as e:
                             message += ''.join([fromBinary2Char(beam.module_6bits(i)) for beam in beams])
                         status = ['0'] * 64
                         n = 0
-                        print("Estoy en write_device normal",flush=True)
                         sock = self.send_multicast(message)
                         while True:
                         return False
                     sock = self.send_multicast('MNTR')
-                    print("Estoy en status_deice",flush=True)
+                    # print("Estoy en status_deice",flush=True)
                     n = 0
                     status = ['0'] * 64
                     else:
                         beam_pos = 0
-                    #El indice del apunte debe ser menor que el numero total de apuntes
-                    #El servidor tcp en el embebido comienza a contar desde 0
-                    # status = ['0'] * 64
-                    # message = 'CHGB{}'.format(beam_pos)
-                    # sock = self.send_multicast(message)
-                    # while True:
-                    # #for i in range(32):
-                    #     try:
-                    #         data, address = sock.recvfrom(1024)
-                    #         print (address, data)
-                    #         data = data.decode()
-                    #         if data == '1':
-                    #             status[int(address[0][10:])-1] = '3'
-                    #         elif data == '0':
-                    #             status[int(address[0][10:])-1] = '1'
-                    #     except socket.timeout:
-                    #         print('Timeout')
-                    #         break
-                    #     except  Exception as e:
-                    #         print ('Error {}'.format(e))
-                    #         pass
-                    # sock.close()
                     mqtt_client.publish('abs/change_beam',str(beam_pos))
                     if confdds:
                         confdds.start_device()
                     if confrc:
-                        #print confrc
                         confrc.start_device()
                     if confjars:
                         confjars.start_device()

apps/abs/views.py +3 -3

                 return render(request, 'abs_conf.html', kwargs)
             def abs_conf_mqtt(request, id_conf):
-                print("Estoy en abs_conf_mqtt",flush=True)
+                # print("Estoy en abs_conf_mqtt",flush=True)
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beams = ABSBeam.objects.filter(abs_conf=conf)
                 #------------Colors for Active Beam:-------------
             def change_beam_mqtt(request, id_conf, id_beam):
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
-                print("conf: {}".format(conf),flush=True)
+                # print("conf: {}".format(conf),flush=True)
                 abs = Configuration.objects.filter(pk=conf.device.conf_active).first()
-                print("abs: {}".format(abs),flush=True)
+                # print("abs: {}".format(abs),flush=True)
                 if abs!=conf:
                     url = '#' if abs is None else abs.get_absolute_url()
                     label = 'None' if abs is None else abs.label

apps/atrad/models.py +5 0

                 potinc6_4 = models.SmallIntegerField()
                 potret6_4 = models.SmallIntegerField()
+                combiner1 = models.SmallIntegerField()
+                combiner2 = models.SmallIntegerField()
+                combiner3 = models.SmallIntegerField()
+                combiner4 = models.SmallIntegerField()
                 class Meta:
                     db_table = 'atrad_datas'

apps/atrad/mqtt.py +8 -6

                     temp4_3,potinc4_3,potret4_3,temp5_3,potinc5_3,potret5_3,temp6_3,potinc6_3,potret6_3,
                     status_4,temp_cll_4,nboards_4,tempdvr_4,potincdvr_4,potretdvr_4,
                     temp1_4,potinc1_4,potret1_4,temp2_4,potinc2_4,potret2_4,temp3_4,potinc3_4,potret3_4,
-                    temp4_4,potinc4_4,potret4_4,temp5_4,potinc5_4,potret5_4,temp6_4,potinc6_4,potret6_4)
+                    temp4_4,potinc4_4,potret4_4,temp5_4,potinc5_4,potret5_4,temp6_4,potinc6_4,potret6_4,
+                    combiner1,combiner2,combiner3,combiner4)
                     VALUES(%s,%s,%s,%s,%s,%s,%s,%s,
                     %s,%s,%s,%s,%s,%s,%s,%s,%s,
                     %s,%s,%s,%s,%s,%s,%s,%s,%s,
                     %s,%s,%s,%s,%s,%s,%s,%s,%s,
                     %s,%s,%s,%s,%s,%s,
                     %s,%s,%s,%s,%s,%s,%s,%s,%s,
-                    %s,%s,%s,%s,%s,%s,%s,%s,%s);"""
+                    %s,%s,%s,%s,%s,%s,%s,%s,%s,
+                    %s,%s,%s,%s);"""
                 try:
                     # connect to the PostgreSQL database
                     conn = psycopg2.connect(database="radarsys", user='docker', password='docker', host='radarsys-postgres', port= '5432')
                     cur = conn.cursor()
                     # execute the INSERT statement
                     #data_tuple = [tuple(i[:]) for i in a]
-                    values = (time,) + tuple(data[0][:25])+tuple(data[1][1:25])+tuple(data[2][1:25])+tuple(data[3][1:25])
+                    values = (time,) + tuple(data[0][:25])+tuple(data[1][1:25])+tuple(data[2][1:25])+tuple(data[3][1:25]) + tuple(data[0][29:31]) +tuple(data[2][27:29])
                     cur.execute(sql, values)
                     # get the generated id back
             def on_connect(mqtt_client, userdata, flags, rc):
                if rc == 0:
-                   print('Connected successfullyasdss')
+                #    print('Connected successfullyasdss')
-                   mqtt_client.subscribe("atrad/test4")
+                   mqtt_client.subscribe(os.environ.get('MQTT_TOPIC_ATRAD_RECIEVE', 'atrad/test4'))
-                   print("Exito")
+                #    print("Exito")
                else:
                    print('Bad connection. Code:', rc)

apps/atrad/templates/atrad_conf.html +8 -8

               <!-- Second row : Status and alerts -->
               <div class="row">
-                <div class="card-deck" style="width: 90%;">
+                <div class="card-deck" style="width: 100%;">
                   <div class="card border-light">
                     <div class="card-body">
                       <h4 class="card-title">Status</h4>
             <!--Modales-->
             <div class="modal fade" id="Pot-1" role="dialog">
-              <div class="modal-dialog modal-lg" style="max-width:50%;min-width:750px">
+              <div class="modal-dialog modal-lg" style="max-width:50%;min-width:928px">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <h4 class="modal-title">Potencia incidente - Transmisor 1</h4>
+                    <h4 class="modal-title">Incident Power - Transmitter 1 </h4>
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                   </div>
                   <div class="modal-body">
                           <tbody>
                             <tr>
                               <th scope="col"># Amp</th>
-                              <th scope="col">Potencia (kW)</th>
+                              <th scope="col">Power (kW)</th>
                             </tr>
                             <tr>
                               <th scope="row">P1</th>
             </div>
             <div class="modal fade" id="Pot-2" role="dialog">
-              <div class="modal-dialog modal-lg" style="max-width:50%;min-width:750px">
+              <div class="modal-dialog modal-lg" style="max-width:50%;min-width:928px">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <h4 class="modal-title">Potencia incidente - Transmisor 2</h4>
+                    <h4 class="modal-title">Incident Power - Transmitter 2</h4>
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                   </div>
                   <div class="modal-body">
                           <tbody>
                             <tr>
                               <th scope="col"># Amp</th>
-                              <th scope="col">Potencia (kW)</th>
+                              <th scope="col">Power (kW)</th>
                             </tr>
                             <tr>
                               <th scope="row">P1</th>
               </div>
             </div>
-            <script src="{% static 'js/atrad-conf.js' %}"></script>
+            <script src="{% static 'js/atrad-mainpage.js' %}"></script>
             {% endblock %}

apps/atrad/templates/atrad_tx.html +15 -9

                 <div class="row ">
                   <div class="panel panel-default">
                       <div class="panel-heading">
-                        <h3 class="panel-title">Amplifiers</h3>
+                        <h3 class="panel-title">Amplifiers Temperature (°C)</h3>
                       </div>
                       <div class="panel-body">
                         <div class="card border-0">
                 <div class="row">
                   <div class="panel panel-default">
                       <div class="panel-heading">
-                      <h3 class="panel-title">Controllers and combiners</h3>
+                      <h3 class="panel-title">Combiners Temperature °C</h3>
                       </div>
                       <div class="panel-body">
                         <div id="plot-temp-0"></div>
                     console.log('Connecting... OK');
                     var basedata = JSON.parse('{{data|safe}}')
                     console.log(basedata);
-                    makePlot("plot-temp-0",4,["PC1","PC2","PC3","PC4"],[10,40]);
+                    makePlot("plot-temp-0",4,["PC1","PC2","PC3","PC4"],[10,40],basedata);
                     makePlot2("plot-temp-1",6,["PA1","PA2","PA3","PA4","PA5","PA6"],[10,40],basedata)
                     makePlot2("plot-temp-2",6,["PA1","PA2","PA3","PA4","PA5","PA6"],[10,40],basedata)
                     makePlot2("plot-temp-3",6,["PA1","PA2","PA3","PA4","PA5","PA6"],[10,40],basedata)
                     makePlot2("plot-temp-4",6,["PA1","PA2","PA3","PA4","PA5","PA6"],[10,40],basedata)
                   })
                   socket.on("temptx"+"{{id_tx}}", function(data) {
-                    var controllers = [data.temp[0][1],data.temp[1][1],data.temp[2][1],data.temp[3][1]]
+                    var combiners = [data.temp[0][8],data.temp[0][9],data.temp[2][8],data.temp[2][9]]
                     streamPlot2("plot-temp-0",data.time,controllers,4);
                     streamPlot2("plot-temp-1",data.time,data.temp[0].slice(2,8),6);
                     streamPlot2("plot-temp-2",data.time,data.temp[1].slice(2,8),6);
                   })
                 });
-                function makePlot(div, n=1, names=["", ""],ranges){
+                function makePlot(div, n=1, names=["", ""],ranges,data){
                   var plotDiv = document.getElementById(div);
                   var traces = [];
+                  var keys = ['combiner1','combiner2','combiner3','combiner4']
                   for (let i = 0; i < n; i++) {
-                    traces.push({x: [], y: [],mode: 'lines', name: names[i]});
+                    var x = [];
+                    var y = [];
+                    for(let j = 0;j < data.length; j++){
+                      x[j] = data[j].datetime;
+                      y[j] = data[j][keys[i]];
+                    }
+                    traces.push({x:x, y:y,mode: 'lines', name: names[i]});
                   }
-                  traces.push({x: [], y: [],mode: 'lines',line: {color:'rgb(219, 64, 82)',dash: 'dot',width: 2},name:"nominal",showlegend: false});
                   var yrange = ranges;
                   var layout = {
                     width: 505,
                   Plotly.newPlot(plotDiv, traces, layout,config);
                 };
-                function makePlot2(div, n=1, names=["", ""],ranges,data){
+                function makePlot2(div, n=1, names=["", ""],ranges,data,keys){
                   var plotDiv = document.getElementById(div);
                   var traces = [];
                   var keys = ['temp1','temp2','temp3','temp4','temp5','temp6']
                   var yrange = ranges;
                   var layout = {
                     width: 505,
-                    height: 400,
+                    height: 300,
                     font: {size: 12},
                     margin: { t: 10, b:50, r:15 ,l:15},
                     xaxis: {

apps/atrad/views.py +12 -4

             from .mqtt import client as mqtt_client
             from radarsys.socketconfig import sio as sio
             from datetime import timedelta
+            from datetime import datetime
             def atrad_conf(request, id_conf):
                 kwargs['id_tx'] = id_tx[-1]
                 kwargs['title'] = 'Temperature Details'
                 kwargs['button'] = 'Edit Configuration'
+                try:
                     time = ATRADData.objects.last().datetime
+                except:
+                    time = datetime.now()
                 id_stx = (int(id_tx[-1])-1)*4+1
-                mydata = ATRADData.objects.filter(datetime__gte = (time-timedelta(hours=1)),nstx = id_stx).values('datetime','temp1_1','temp2_1','temp3_1','temp4_1','temp5_1','temp6_1',
+                mydata = ATRADData.objects.filter(datetime__gte = (time-timedelta(hours=1)),nstx = id_stx).values('datetime',
-                'temp1_2','temp2_2','temp3_2','temp4_2','temp5_2','temp6_2','temp1_3','temp2_3','temp3_3','temp4_3','temp5_3','temp6_3',
+                'temp1_1','temp2_1','temp3_1','temp4_1','temp5_1','temp6_1',
-                'temp1_4','temp2_4','temp3_4','temp4_4','temp5_4','temp6_4')
+                'temp1_2','temp2_2','temp3_2','temp4_2','temp5_2','temp6_2',
+                'temp1_3','temp2_3','temp3_3','temp4_3','temp5_3','temp6_3',
+                'temp1_4','temp2_4','temp3_4','temp4_4','temp5_4','temp6_4',
+                'combiner1','combiner2','combiner3','combiner4')
                 kwargs['data'] = json.dumps(list(mydata),default=str)
                 return render(request, 'atrad_tx.html', kwargs)
             @sio.event
             def atrad_control_event(sid,message):
-                mqtt_client.publish('test/data2', json.dumps(message))
  No newline at end of file
+                mqtt_client.publish(os.environ.get('MQTT_TOPIC_ATRAD_CONTROL', 'atrad/test2'), json.dumps(message))
  No newline at end of file

apps/jars/models.py +1 -1

                         return False
                     json_data = json.dumps(data)
-                    print("STATUS:", self.device.status,flush=True)
+                    # print("STATUS:", self.device.status,flush=True)
                     try:
                         payload = self.request('write', 'post', json=json_data)

apps/main/management/commands/scheduler.py ~~apps/main/management/commands/hello.py~~ renamed 0 0

NO CONTENT: file renamed from apps/main/management/commands/hello.py to apps/main/management/commands/scheduler.py

apps/main/models.py 0 -3

                 def stop_device(self):
                     self.message = 'Function not implemented'
-                    print("BUENAS SEÑALES??? NO LO CREO2",flush=True)
                     return False
                 def start_device(self):
                     self.message = 'Function not implemented'
-                    print("BUENAS SEÑALES??? NO LO CREO",flush=True)
                     return False
                 def write_device(self, parms):
                     self.message = 'Function not implemented'
-                    print("BUENAS SEÑALES??? NO LO CREO3",flush=True)
                     return False
                 def write_device_mqtt(self, parms):

apps/rc/views.py 0 -8

             def import_file(request, conf_id):
-                # print("HOLA",flush=True)
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
-                # print("HOLA2",flush=True)
                 if request.method=='POST':
                     form = RCImportForm(request.POST, request.FILES)
-                    # print("HOLA3",flush=True)
                     if form.is_valid():
-                        #print("HOLA4",flush=True)
                         # try:
-                        #print("HOLA5",flush=True)
                         data = conf.import_from_file(request.FILES['file_name'])
-                        #print("HOLA6",flush=True)
                         conf.dict_to_parms(data)
-                        #print("1",flush=True)
                         conf.update_pulses()
-                        #print("2",flush=True)
                         messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                         return redirect(conf.get_absolute_url_edit())

docker-compose.yml +2 -2

                   ofelia.enabled: "true"
                   # ofelia.job-exec.restart-reception.schedule: "0 1/5 * * * *"
                   ofelia.job-exec.test.schedule: "@every 5s"
-                  ofelia.job-exec.test.command: "python manage.py hello"
+                  ofelia.job-exec.test.command: "python manage.py scheduler"
                   # ofelia.job-exec.restart-pedestal.schedule: "0 2/10 * * * *"
                   # ofelia.job-exec.restart-pedestal.command: "python manage.py restart_pedestal"
                   # ofelia.job-exec.restart-experiment.schedule: "@midnight"
                 restart: always
                 build: ./nginx/
                 ports:
-                  - '0.0.0.0:8086:80'
+                  - '0.0.0.0:80:80'
                 volumes_from:
                   - radarsys
                 links:

radarsys/settings.py +1 0

                 "http://localhost:8030",
                 "http://127.0.0.1:8030",
                 "http://*.localhost:8086",
+                "http://0.0.0.0:8086",
                 "http://localhost:8086",
                 "http://127.0.0.1:8086"
             ]

radarsys/static/js/atrad-mainpage.js ~~radarsys/static/js/atrad-conf.js~~ renamed 0 0

NO CONTENT: file renamed from radarsys/static/js/atrad-conf.js to radarsys/static/js/atrad-mainpage.js

radarsys/static/js/bokeh-3.0.0.min.js 644 ➡ 755 0 0