Skip to content

Commit

Permalink
updated wiring diagram for XYBot;
Browse files Browse the repository at this point in the history
updated firmware for XYBot in the APP
  • Loading branch information
Wang Yu committed Feb 25, 2016
1 parent cb5d51b commit 65dda3b
Show file tree
Hide file tree
Showing 13 changed files with 70,535 additions and 56,633 deletions.
2 changes: 2 additions & 0 deletions mDrawGui/.settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
eclipse.preferences.version=1
encoding/ParserGUI.py=utf-8
encoding/ScaraGui.py=utf-8
encoding/WireGui.py=utf-8
encoding/XySetup.py=utf-8
encoding/images_rc.py=utf-8
29 changes: 29 additions & 0 deletions mDrawGui/WireGui_XY.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'WireGui_XY.ui'
#
# Created by: PyQt5 UI code generator 5.5.1
#
# WARNING! All changes made in this file will be lost!

from PyQt5 import QtCore, QtGui, QtWidgets

class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName("Form")
Form.resize(602, 608)
self.labelModel = QtWidgets.QLabel(Form)
self.labelModel.setGeometry(QtCore.QRect(10, 10, 591, 591))
self.labelModel.setStyleSheet("")
self.labelModel.setText("")
self.labelModel.setPixmap(QtGui.QPixmap(":/images/wire_xy.png"))
self.labelModel.setObjectName("labelModel")

self.retranslateUi(Form)
QtCore.QMetaObject.connectSlotsByName(Form)

def retranslateUi(self, Form):
_translate = QtCore.QCoreApplication.translate
Form.setWindowTitle(_translate("Form", "Form"))

import images_rc
40 changes: 40 additions & 0 deletions mDrawGui/WireGui_XY.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>602</width>
<height>608</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QLabel" name="labelModel">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>591</width>
<height>591</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/wire_xy.png</pixmap>
</property>
</widget>
</widget>
<resources>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>
14 changes: 7 additions & 7 deletions mDrawGui/XY.hex
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
:10063000240290932502A0932602B09327020F90E4
:100640000F900F900F90DF91CF91FF90EF90DF9080
:10065000CF90BF90AF909F908F907F906F905F9062
:100660004F9008958091F4010E948B0F019731F40F
:100670008091F6010E948B0F019769F08091FC0137
:100680000E948B0F0197A9F48091FE010E948B0FAD
:100660004F9008958091FC010E948B0F019731F407
:100670008091FE010E948B0F019769F08091F40137
:100680000E948B0F0197A9F48091F6010E948B0FB5
:10069000019779F427C080910C02992787FD9095E6
:1006A0000E94CD0080910C0190910D010E944E0E90
:1006B000D9CF1092130210921202109211021092CE
Expand Down Expand Up @@ -154,13 +154,13 @@
:100990009E1262E471E08AE295E00E94DC116091AF
:1009A0004302709144024AE050E08AE295E00C94E0
:1009B000A61265E471E08AE295E00E94DC11809164
:1009C000F6010E948B0F4AE050E0BC018AE295E0FC
:1009C000FC010E948B0F4AE050E0BC018AE295E0F6
:1009D0000E949E1268E471E08AE295E00E94DC11B8
:1009E0008091F4010E948B0F4AE050E0BC018AE242
:1009E0008091FE010E948B0F4AE050E0BC018AE238
:1009F00095E00E949E1268E471E08AE295E00E9410
:100A0000DC118091FE010E948B0F4AE050E0BC0196
:100A0000DC118091F4010E948B0F4AE050E0BC01A0
:100A10008AE295E00E949E1268E471E08AE295E025
:100A20000E94DC118091FC010E948B0F4AE050E093
:100A20000E94DC118091F6010E948B0F4AE050E099
:100A3000BC018AE295E00C94A6120F931F93CF930A
:100A4000DF9300E312E0C0E0D0E0F80161918F0194
:100A5000CE010E94B3172196C034D105B1F7DF91C2
Expand Down
2 changes: 1 addition & 1 deletion mDrawGui/XYRobot.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def parseEcho(self,msg):
self.robotState = IDLE
elif "M11" in msg:
t = msg.split()
self.robotSetup.ui.label_8.setText("X-:%s X+:%s Y-:%s Y+:%s " %(t[1],t[2],t[3],t[4]))
self.robotSetup.ui.label_8.setText("S1:%s S2:%s S3:%s S4:%s " %(t[1],t[2],t[3],t[4]))


def paint(self, painter, option, widget=None):
Expand Down
4 changes: 2 additions & 2 deletions mDrawGui/XySetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'XySetup.ui'
#
# Created by: PyQt5 UI code generator 5.4.2
# Created by: PyQt5 UI code generator 5.5.1
#
# WARNING! All changes made in this file will be lost!

Expand Down Expand Up @@ -124,7 +124,7 @@ def retranslateUi(self, Form):
self.label_5.setText(_translate("Form", "ClockWise"))
self.label_6.setText(_translate("Form", "Anti ClockWise"))
self.label_7.setText(_translate("Form", "Limit Switch Status:"))
self.label_8.setText(_translate("Form", "X-:0 X+:0 Y-:0 Y+:0 "))
self.label_8.setText(_translate("Form", "S1:0 S2:0 S3:0 S4:0 "))
self.labelSpeed.setText(_translate("Form", "Speed (50%):"))
self.btnOk.setText(_translate("Form", "Ok"))

Expand Down
2 changes: 1 addition & 1 deletion mDrawGui/XySetup.ui
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
</rect>
</property>
<property name="text">
<string>X-:0 X+:0 Y-:0 Y+:0 </string>
<string>S1:0 S2:0 S3:0 S4:0 </string>
</property>
</widget>
<widget class="QSlider" name="slidSpeed">
Expand Down
1 change: 1 addition & 0 deletions mDrawGui/images.qrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<RCC>
<qresource>
<file>images/wire_xy.png</file>
<file>images/mDraw_UI-icon-help_info.png</file>
<file>images/mDraw_UI-icon-help_info-click.png</file>
<file>images/mDraw_UI-icon-help_info-hover.png</file>
Expand Down
Binary file added mDrawGui/images/wire_xy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mDrawGui/images/xy_setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 65dda3b

Please sign in to comment.