diff --git a/software/Makefile b/software/Makefile index 5af1307..dbea95b 100644 --- a/software/Makefile +++ b/software/Makefile @@ -1,4 +1,4 @@ -all: edubrm mainUi.py resources_rc.py modules/ModuleDebugUi.py +all: edubrm mainUi.py resources_rc.py modules/ModuleAUi.py modules/ModuleDebugUi.py mainUi.py: main.ui pyuic4 $< -o $@ @@ -6,7 +6,7 @@ mainUi.py: main.ui resources_rc.py: resources.qrc pyrcc4 $< -o $@ -modules/ModuleDebugUi.py: modules/ModuleDebug.ui +modules/Module%Ui.py: modules/Module%.ui pyuic4 $< -o $@ clean: diff --git a/software/modules/ModuleA.png b/software/modules/ModuleA.png index af7cef4..8a7db96 100644 Binary files a/software/modules/ModuleA.png and b/software/modules/ModuleA.png differ diff --git a/software/modules/ModuleA.py b/software/modules/ModuleA.py index 84665df..c40141a 100644 --- a/software/modules/ModuleA.py +++ b/software/modules/ModuleA.py @@ -1,11 +1,36 @@ +from PyQt4.QtGui import QWidget +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtCore import SIGNAL +from PyQt4.QtCore import QObject +from PyQt4.QtCore import QTimer +from ModuleAUi import Ui_ModuleA +from device import Device + +class ModuleAWidget(QWidget): + + def __init__(self): + QWidget.__init__(self) + self.ui = Ui_ModuleA() + self.ui.setupUi(self) + + self.timer = QTimer() + QObject.connect(self.timer, SIGNAL("timeout()"), self.read_inputs) + + def read_inputs(self): + r = self.dev.read() + v = r[0]/1023.0 * 3.3 + self.ui.labelV.setText('{:0.3f} V'.format(v)) + self.ui.progressV.setValue(1000*v) + class ModuleA(): def __init__(self): - self.title = 'A' - self.widget = None + self.title = 'Simple dynamo' + self.widget = ModuleAWidget() def start(self): - print 'start A' + self.widget.dev = Device() + self.widget.timer.start(50) def stop(self): - print 'stop A' + self.widget.timer.stop() diff --git a/software/modules/ModuleA.ui b/software/modules/ModuleA.ui new file mode 100644 index 0000000..c7be4f6 --- /dev/null +++ b/software/modules/ModuleA.ui @@ -0,0 +1,67 @@ + + + ModuleA + + + + 0 + 0 + 781 + 531 + + + + Form + + + + + 80 + 10 + 691 + 481 + + + + + + + 10 + 10 + 61 + 481 + + + + 4000 + + + 0 + + + false + + + Qt::Vertical + + + + + + 10 + 500 + 61 + 21 + + + + 0.000 V + + + Qt::AlignCenter + + + + + + diff --git a/software/modules/ModuleDebug.py b/software/modules/ModuleDebug.py index aa981e5..032ed74 100644 --- a/software/modules/ModuleDebug.py +++ b/software/modules/ModuleDebug.py @@ -126,7 +126,6 @@ class ModuleDebugWidget(QWidget): self.ui.labelIO2.setText('IO2: -') self.ui.labelIO3.setText('IO3: -') - def read_inputs(self): r = self.dev.read() self.ui.labelAD0.setText('AD0: ' + str(r[0])) @@ -147,9 +146,7 @@ class ModuleDebug(): self.widget = ModuleDebugWidget() def start(self): - print 'start Debug' self.widget.dev = Device() def stop(self): - print 'stop Debug' self.widget.timer.stop()