From 74d75898b237b9fc23c45d2444ce5e58b96a6281 Mon Sep 17 00:00:00 2001 From: Alisson Claudino Date: Thu, 16 Nov 2017 11:28:21 -0200 Subject: [PATCH] Implementada pausa na amostragem --- Firmware/ADS1115.ino/ADS1115.ino.ino | 8 +++---- Interface/CalibracaoP.py | 1 + Interface/Graph.py | 3 ++- Interface/Main.py | 7 +----- Interface/SerialManager.py | 3 +-- Interface/SystemEngine.py | 34 ++++++++++++++++++++-------- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/Firmware/ADS1115.ino/ADS1115.ino.ino b/Firmware/ADS1115.ino/ADS1115.ino.ino index 3888776..4e34970 100644 --- a/Firmware/ADS1115.ino/ADS1115.ino.ino +++ b/Firmware/ADS1115.ino/ADS1115.ino.ino @@ -21,16 +21,16 @@ void loop(void) { adc0 = ads0.readADC_SingleEnded(0); adc1 = ads0.readADC_SingleEnded(1); - adc2 = ads0.readADC_SingleEnded(2); + /*adc2 = ads0.readADC_SingleEnded(2); adc3 = ads0.readADC_SingleEnded(3); adc4 = ads1.readADC_SingleEnded(0); adc5 = ads1.readADC_SingleEnded(1); adc6 = ads1.readADC_SingleEnded(2); - adc7 = ads1.readADC_SingleEnded(3); + adc7 = ads1.readADC_SingleEnded(3);*/ Serial.print(adc0); Serial.print(" "); Serial.print(adc1); - Serial.print(" "); + /*Serial.print(" "); Serial.print(adc2); Serial.print(" "); Serial.print(adc3); @@ -43,7 +43,7 @@ void loop(void) Serial.print(" "); Serial.print(adc7); Serial.print(" "); - Serial.print(millis()); + Serial.print(millis());*/ Serial.print("\n"); while(millis()%100!=0); diff --git a/Interface/CalibracaoP.py b/Interface/CalibracaoP.py index 4ff6b2f..3193c28 100644 --- a/Interface/CalibracaoP.py +++ b/Interface/CalibracaoP.py @@ -316,4 +316,5 @@ class Ui_MainWindow(object): for i in range(0, len(seriaList)): self.usb.append(QtWidgets.QAction(self.MainWindow)) self.usb[i].setText(seriaList[i].device) + self.usb[i].setCheckable(True) self.menuPorta.addAction(self.usb[i]) \ No newline at end of file diff --git a/Interface/Graph.py b/Interface/Graph.py index daecbc3..b057bec 100644 --- a/Interface/Graph.py +++ b/Interface/Graph.py @@ -27,7 +27,7 @@ class Graph(pyqtgraph.GraphicsLayout): def updateGraph(self,y1,y2): - print(time.time()-self.timeant) + #print(time.time()-self.timeant) self.y1.append(y1) self.y2.append(y2) if len(self.y1)>self.x_range+1: @@ -50,6 +50,7 @@ class Graph(pyqtgraph.GraphicsLayout): if(y_range==0): y_range=1 + self.x_range=x_range self.y_range=y_range self.x1=[] diff --git a/Interface/Main.py b/Interface/Main.py index 5f5a83a..b1a9fd0 100644 --- a/Interface/Main.py +++ b/Interface/Main.py @@ -1,16 +1,11 @@ from PyQt5 import QtCore,QtGui,QtWidgets # importação de classes -import pyqtgraph -import serial -import serial.tools.list_ports import time import sys -from SerialManager import SerialManager -from CalibracaoP import Ui_MainWindow from SystemEngine import SystemEngine -from Graph import Graph if __name__ == '__main__': + engine=SystemEngine() timer = QtCore.QTimer() # timer.timeout.connect(engine.updateData) # diff --git a/Interface/SerialManager.py b/Interface/SerialManager.py index fa9c628..be621a8 100644 --- a/Interface/SerialManager.py +++ b/Interface/SerialManager.py @@ -1,9 +1,8 @@ import serial import serial.tools.list_ports import time - - class SerialManager(object): + def __init__(self): self.portList = serial.tools.list_ports.comports() self.portNum=len(self.portList) diff --git a/Interface/SystemEngine.py b/Interface/SystemEngine.py index 82da4d5..670a478 100644 --- a/Interface/SystemEngine.py +++ b/Interface/SystemEngine.py @@ -14,8 +14,7 @@ class SystemEngine(object): self.app = QtWidgets.QApplication(sys.argv) self.dialog = QtWidgets.QMainWindow() self.ser1 = SerialManager() - print(self.ser1.portList[0]) - self.ser1.startPort(str(self.ser1.portList[1].device),115200) + self.ser1.startPort(str(self.ser1.portList[0].device), 115200) self.uiCalibra1 = Ui_MainWindow() self.uiCalibra1.setupUi(self.dialog) self.uiCalibra1.serialListPanel(self.ser1.portList) @@ -28,13 +27,28 @@ class SystemEngine(object): self.x_scale=100 + def updateData(self): - readData = self.ser1.read() # Lê o dado da serial - readData = readData.decode('utf8') - dado = readData.split(' ', 8) - self.x_scale=int(self.uiCalibra1.t_max.text()) - if(self.x_scale != self.prev_x_scale): - self.layout.setGraphScale(int(self.x_scale),32700) - self.prev_x_scale = self.x_scale - self.layout.updateGraph(float(dado[0]),float(dado[1])) \ No newline at end of file + if(self.uiCalibra1.usb[0].isChecked()==True): + readData = self.ser1.read() # Lê o dado da serial + readData = readData.decode('utf8') + dado = readData.split(' ', 3) + print(dado) + try: + self.x_scale=int(self.uiCalibra1.t_max.text()) + except ValueError: + self.x_scale=100 + + if(self.x_scale != self.prev_x_scale): + try: + self.layout.setGraphScale(int(self.x_scale),32700) + except: + print("Err0r") + self.prev_x_scale = self.x_scale + self.uiCalibra1.forcaLabel.setText(str(dado[0])+" Tonf") + self.uiCalibra1.calibranteLabel.setText(str(dado[1].split()[0])+" mV") + self.layout.updateGraph(float(dado[0]),float(dado[1])) + + else: + pass \ No newline at end of file -- 2.22.0