From f69c3008c853147a0fca2e8d8643d1960c5e1c61 Mon Sep 17 00:00:00 2001
From: zrg <674148718@qq.com>
Date: Tue, 21 Dec 2021 16:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BD=8D=E6=9C=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=A7=8B=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82=E6=9B=B4=E6=96=B0=E4=BA=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=B8=85=E5=8D=95=E9=87=8C=E9=9D=A2=E7=9A=84=E7=94=B5?=
 =?UTF-8?q?=E6=9C=BA=E8=B4=AD=E4=B9=B0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arduino/main/main.ino                         |  31 +++++---
 .../gui/__pycache__/main_ui.cpython-37.pyc    | Bin 10326 -> 10542 bytes
 python_gui/gui/main.py                        |  70 ++++++++++++++----
 python_gui/gui/main_ui.py                     |   8 ++
 python_gui/gui/main_ui.ui                     |  17 ++++-
 物料清单.xlsx                                 | Bin 16319 -> 16381 bytes
 6 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/arduino/main/main.ino b/arduino/main/main.ino
index 8d9684c..b21f457 100644
--- a/arduino/main/main.ino
+++ b/arduino/main/main.ino
@@ -135,10 +135,14 @@ void setup() {
     ESP.restart();
   }
 // eeprom 读取
-
-float nan = EEPROM.readFloat(0);
-if(isnan(nan))
+int k,j;
+j = 0;
+for(k=0;k<=24;k=k+4)
+{
+  float nan = EEPROM.readFloat(k);
+  if(isnan(nan))
   {
+      j = 1;
       Serial.println("frist write");
       EEPROM.writeFloat(0, target_angle);       delay(10);EEPROM.commit();
       EEPROM.writeFloat(4, swing_up_voltage);      delay(10);EEPROM.commit();
@@ -148,8 +152,9 @@ if(isnan(nan))
       EEPROM.writeFloat(20, v_p_2);      delay(10);EEPROM.commit();
       EEPROM.writeFloat(24, v_i_2);       delay(10);EEPROM.commit();
   }
-  else
-  {
+}
+if(j == 0)
+{
      target_angle = EEPROM.readFloat(0);
   swing_up_voltage = EEPROM.readFloat(4);
   swing_up_angle = EEPROM.readFloat(8);  
@@ -159,7 +164,7 @@ if(isnan(nan))
   v_i_2 = EEPROM.readFloat(24);
   motor.PID_velocity.P = v_p_1;
   motor.PID_velocity.I = v_i_1;
-  }
+}
    //命令设置
  comm.add("TA",do_TA);
  comm.add("START",do_START);
@@ -364,12 +369,14 @@ if (abs(pendulum_angle) < swing_up_angle) // if angle small enough stabilize 0.5
 Serial.print(pitch);Serial.print("\t");
 Serial.print(kalAngleZ);Serial.print("\t");
 
-//  Serial.print(target_voltage);Serial.print("\t");
-////  Serial.print(target_velocity);Serial.print("\t");
-//  Serial.print(motor.shaft_velocity);Serial.print("\t");
-//  Serial.print(target_angle);Serial.print("\t");
-//  Serial.print(pendulum_angle);Serial.print("\t");
-//  Serial.print(gyroZrate);Serial.print("\t");
+  Serial.print(target_voltage);Serial.print("\t");
+//  Serial.print(target_velocity);Serial.print("\t");
+  Serial.print(motor.shaft_velocity);Serial.print("\t");
+   Serial.print(motor.voltage.q);Serial.print("\t");
+
+  Serial.print(target_angle);Serial.print("\t");
+  Serial.print(pendulum_angle);Serial.print("\t");
+  Serial.print(gyroZrate);Serial.print("\t");
   Serial.print("\r\n");
 #endif
 //  motor.move(target_velocity);
diff --git a/python_gui/gui/__pycache__/main_ui.cpython-37.pyc b/python_gui/gui/__pycache__/main_ui.cpython-37.pyc
index ee35059224e63fb4f75f03601c58cc8c33547b9f..15fecf559cfe63336dd5bf37d14f3d0233d16c09 100644
GIT binary patch
literal 10542
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
BER+BM

literal 10326
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
Xn-D{7XVi&Y=CNF%A}>%wwI}qSTx;l$

diff --git a/python_gui/gui/main.py b/python_gui/gui/main.py
index d88aae5..20ba125 100644
--- a/python_gui/gui/main.py
+++ b/python_gui/gui/main.py
@@ -1,5 +1,6 @@
 import sys
 from PyQt5.QtWidgets import QApplication, QMainWindow, QMessageBox
+from PyQt5.QtGui import QTextCursor
 from main_ui import *
 from wifi_udp import *
 import threading    #引入并行
@@ -7,12 +8,13 @@ import numpy as np
 import pyqtgraph as pg
 import re
 from sharedcomponets import GUIToolKit
+import copy
 
 class MyWindow(QMainWindow, Ui_MainWindow):
     signalColors = [GUIToolKit.RED_COLOR, GUIToolKit.BLUE_COLOR, GUIToolKit.PURPLE_COLOR, GUIToolKit.YELLOW_COLOR,
                     GUIToolKit.MAROON_COLOR, GUIToolKit.ORANGE_COLOR, GUIToolKit.GREEN_COLOR]
     signalIcons = ['reddot', 'bluedot', 'purpledot', 'yellowdot', 'maroondot', 'orangedot', 'greendot']
-
+    textColors = ['FF5C5C','398AD9','5BEC8D','FD42AC','FF33FF','4B8200','DE87B8']
     def __init__(self, parent=None):
         super(MyWindow, self).__init__(parent)
         self.setupUi(self)
@@ -23,8 +25,6 @@ class MyWindow(QMainWindow, Ui_MainWindow):
         # self.CreateItems()
         # 设置信号与槽
         self.CreateSignalSlot()
-
-
     # 设置信号与槽
     def CreateSignalSlot(self):
         self.horizontalSlider_1.valueChanged.connect(self.horizontalSlider_1_valueChanged)
@@ -41,6 +41,25 @@ class MyWindow(QMainWindow, Ui_MainWindow):
         self.VI1_pushButton.clicked.connect(self.VI1_pushButton_clicked)
         self.VP2_pushButton.clicked.connect(self.VP2_pushButton_clicked)
         self.VI2_pushButton.clicked.connect(self.VI2_pushButton_clicked)
+
+        self.raw_pushButton.clicked.connect(self.raw_pushButton_clicked)
+        self.wave_pushButton.clicked.connect(self.wave_pushButton_clicked)
+    def raw_pushButton_clicked(self):
+        self.change_state = 1
+        self.stackedWidget.setCurrentIndex(1)
+        # for i in range(self.gridLayout.count()):
+        #     self.gridLayout.removeWidget(self.gridLayout.itemAt(i).widget())
+        # self.gridLayout.addWidget(self.raw_line)
+
+    def wave_pushButton_clicked(self):
+        self.change_state = 0
+        self.stackedWidget.setCurrentIndex(0)
+        # for i in range(self.gridLayout.count()):
+        #     self.gridLayout.removeWidget(self.gridLayout.itemAt(i).widget())
+        #
+        #
+        # self.gridLayout.addWidget(self.plotWidget)
+
     # 设置实例
     def CreateItems(self):
         # 定时器-绘图刷新
@@ -54,7 +73,9 @@ class MyWindow(QMainWindow, Ui_MainWindow):
         # wifi变量
         self.wifi_recv_flag = 0
         self.close_flag = 1
+        self.change_state = 0
         self.re_item = []
+        self.raw_roll = 0
     def plot_init(self):
         # 绘图对象
         pg.setConfigOptions(antialias=True)
@@ -81,8 +102,16 @@ class MyWindow(QMainWindow, Ui_MainWindow):
             self.signalPlotFlags.append(True)
             # add callback
             checkBox.stateChanged.connect(self.signalPlotFlagUpdate)
-        self.gridLayout.addWidget(self.plotWidget)
+        self.stackedWidget = QtWidgets.QStackedWidget()
+        self.gridLayout.addWidget(self.stackedWidget)
+        self.raw_line = QtWidgets.QTextEdit()
+        self.raw_line.setStyleSheet('background: rgb(0, 0, 0)')
+        self.stackedWidget.addWidget(self.plotWidget)
+        self.stackedWidget.addWidget(self.raw_line)
         self.tool_layout.addWidget(self.controlPlotWidget)
+
+
+
     # checkbox
     def signalPlotFlagUpdate(self):
         for i, (checkBox, plotFlag) in enumerate(zip(self.controlPlotWidget.signalCheckBox, self.signalPlotFlags)):
@@ -178,24 +207,32 @@ class MyWindow(QMainWindow, Ui_MainWindow):
             recv_data = recv_data.split(',')
             """处理接受的信息"""
             # print(recv_data)
+            self.re_text = ''
             for i, data in enumerate(recv_data):
                 if self.signalPlotFlags[i]:
-                    self.re_item.append(''.join(re.split(r'[^A-Za-z]', data)))
+                    # self.re_item.append(''.join(re.split(r'[^A-Za-z]', data)))
                     data = data.replace(self.re_item[i],'')
-
-                    self.signalDataArrays[i] = np.roll(self.signalDataArrays[i], -1)
-                    self.signalDataArrays[i][-1] = data
-
+                    if self.change_state:
+                        self.re_text += '<font color=\"#{1}\">{0}\t</font>'.format(data,self.textColors[i])
+                    else:
+                        self.signalDataArrays[i] = np.roll(self.signalDataArrays[i], -1)
+                        self.signalDataArrays[i][-1] = data
     def update_plot(self):
         if self.wifi_recv_flag:
-            for i, plotFlag in enumerate(self.signalPlotFlags):
-                if plotFlag:
-                    self.signalPlots[i].setData(self.timeArray, self.signalDataArrays[i])
-                    self.signalPlots[i].updateItems()
-                    self.signalPlots[i].sigPlotChanged.emit(self.signalPlots[i])
+            if self.change_state:
+                self.raw_line.append(self.re_text)
+                if self.raw_roll:
+                    self.raw_line.moveCursor(QTextCursor.End)
+            else:
+                for i, plotFlag in enumerate(self.signalPlotFlags):
+                    if plotFlag:
+                        self.signalPlots[i].setData(self.timeArray, self.signalDataArrays[i])
+                        self.signalPlots[i].updateItems()
+                        self.signalPlots[i].sigPlotChanged.emit(self.signalPlots[i])
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         print("关闭")
+        self.udp.send_message('START')
         self.close_flag = 0
         self.udp.udpClientSocket.close()
 
@@ -247,7 +284,10 @@ class ControlPlotPanel(QtWidgets.QWidget):
             self.signalCheckBox.append(checkBox)
             self.horizontalLayout1.addWidget(checkBox)
     def zoomAllPlot(self):
-        self.controlledPlot.plotWidget.enableAutoRange()
+        if self.controlledPlot.change_state:
+            self.controlledPlot.raw_roll = ~self.controlledPlot.raw_roll
+        else:
+            self.controlledPlot.plotWidget.enableAutoRange()
     def wifi_recv_open_pushButton_clicked(self):
         if self.controlledPlot.wifi_recv_flag == 0:
             # 打开wifi接收
diff --git a/python_gui/gui/main_ui.py b/python_gui/gui/main_ui.py
index 0c92d07..5929b95 100644
--- a/python_gui/gui/main_ui.py
+++ b/python_gui/gui/main_ui.py
@@ -54,6 +54,12 @@ class Ui_MainWindow(object):
         self.tool_layout_2 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget_6)
         self.tool_layout_2.setContentsMargins(0, 0, 0, 0)
         self.tool_layout_2.setObjectName("tool_layout_2")
+        self.wave_pushButton = QtWidgets.QPushButton(self.horizontalLayoutWidget_6)
+        self.wave_pushButton.setObjectName("wave_pushButton")
+        self.tool_layout_2.addWidget(self.wave_pushButton)
+        self.raw_pushButton = QtWidgets.QPushButton(self.horizontalLayoutWidget_6)
+        self.raw_pushButton.setObjectName("raw_pushButton")
+        self.tool_layout_2.addWidget(self.raw_pushButton)
         self.groupBox_3 = QtWidgets.QGroupBox(self.centralwidget)
         self.groupBox_3.setGeometry(QtCore.QRect(10, 10, 291, 381))
         self.groupBox_3.setObjectName("groupBox_3")
@@ -354,6 +360,8 @@ class Ui_MainWindow(object):
         self.wifi_IP_lineEdit.setText(_translate("MainWindow", "192.168.4.2"))
         self.wifi_config_pushButton.setText(_translate("MainWindow", "设置"))
         self.groupBox_2.setTitle(_translate("MainWindow", "可视化图表"))
+        self.wave_pushButton.setText(_translate("MainWindow", "波形图"))
+        self.raw_pushButton.setText(_translate("MainWindow", "原始数据"))
         self.groupBox_3.setTitle(_translate("MainWindow", "command命令"))
         self.wifi_command_pushButton_1.setText(_translate("MainWindow", "发送"))
         self.wifi_command_pushButton_2.setText(_translate("MainWindow", "发送"))
diff --git a/python_gui/gui/main_ui.ui b/python_gui/gui/main_ui.ui
index 11123cc..ed57e99 100644
--- a/python_gui/gui/main_ui.ui
+++ b/python_gui/gui/main_ui.ui
@@ -99,7 +99,22 @@
        <height>31</height>
       </rect>
      </property>
-     <layout class="QHBoxLayout" name="tool_layout_2"/>
+     <layout class="QHBoxLayout" name="tool_layout_2">
+      <item>
+       <widget class="QPushButton" name="wave_pushButton">
+        <property name="text">
+         <string>波形图</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="raw_pushButton">
+        <property name="text">
+         <string>原始数据</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </widget>
    <widget class="QGroupBox" name="groupBox_3">
diff --git a/物料清单.xlsx b/物料清单.xlsx
index 94c46502f43a69f2f3613b21c04a543870aca33a..fdf5b1a3ae00c88d08778838be1b48d29d7ce64c 100644
GIT binary patch
delta 8349
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
I{_mjw0^TynGynhq

delta 8290
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