From 3442b5fdeb4f8dfef38977078c5c6e801dcc2b51 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Wed, 13 Feb 2019 21:59:29 +0100 Subject: Implemented three dials equivalent to MZ_APO RGB dials. Tested with code compiled by Linux PIC based GCC compiler with calling musl-libc sprintf function. Signed-off-by: Pavel Pisa --- qtmips_gui/mainwindow.cpp | 1 + qtmips_gui/peripheralsdock.cpp | 6 +- qtmips_gui/peripheralsdock.h | 5 +- qtmips_gui/peripheralsview.cpp | 27 +++++++ qtmips_gui/peripheralsview.h | 26 +++++++ qtmips_gui/peripheralsview.ui | 161 +++++++++++++++++++++++++++++++++++++++++ qtmips_gui/programdock.h | 1 + qtmips_gui/qtmips_gui.pro | 9 ++- 8 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 qtmips_gui/peripheralsview.cpp create mode 100644 qtmips_gui/peripheralsview.h create mode 100644 qtmips_gui/peripheralsview.ui (limited to 'qtmips_gui') diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp index b77d0d6..3e95a8f 100644 --- a/qtmips_gui/mainwindow.cpp +++ b/qtmips_gui/mainwindow.cpp @@ -174,6 +174,7 @@ void MainWindow::create_core(const machine::MachineConfig &config) { cache_program->setup(machine->cache_program()); cache_data->setup(machine->cache_data()); terminal->setup(machine->serial_port()); + peripherals->setup(machine->peripheral_spi_led()); // Connect signals for instruction address followup connect(machine->core(), SIGNAL(fetch_inst_addr_value(std::uint32_t)), diff --git a/qtmips_gui/peripheralsdock.cpp b/qtmips_gui/peripheralsdock.cpp index ad423a0..4494948 100644 --- a/qtmips_gui/peripheralsdock.cpp +++ b/qtmips_gui/peripheralsdock.cpp @@ -39,11 +39,13 @@ PeripheralsDock::PeripheralsDock(QWidget *parent, QSettings *settings) : QDockWi top_widget = new QWidget(this); setWidget(top_widget); layout_box = new QVBoxLayout(top_widget); + periph_view = new PeripheralsView(0); + layout_box->addWidget(periph_view); setObjectName("Peripherals"); setWindowTitle("Peripherals"); } -void PeripheralsDock::setup(const machine::QtMipsMachine *machine) { - +void PeripheralsDock::setup(const machine::PeripSpiLed *perip_spi_led) { + periph_view->setup(perip_spi_led); } diff --git a/qtmips_gui/peripheralsdock.h b/qtmips_gui/peripheralsdock.h index b611515..d1f8b47 100644 --- a/qtmips_gui/peripheralsdock.h +++ b/qtmips_gui/peripheralsdock.h @@ -39,6 +39,8 @@ #include #include #include +#include +#include "peripspiled.h" #include "peripheral.h" #include "qtmipsmachine.h" @@ -47,12 +49,13 @@ class PeripheralsDock : public QDockWidget { public: PeripheralsDock(QWidget *parent, QSettings *settings); - void setup(const machine::QtMipsMachine *machine); + void setup(const machine::PeripSpiLed *perip_spi_led); private: QVBoxLayout *layout_box; QWidget *top_widget, *top_form; QFormLayout *layout_top_form; + PeripheralsView *periph_view; }; #endif // PERIPHERALSDOCK_H diff --git a/qtmips_gui/peripheralsview.cpp b/qtmips_gui/peripheralsview.cpp new file mode 100644 index 0000000..5a8ec70 --- /dev/null +++ b/qtmips_gui/peripheralsview.cpp @@ -0,0 +1,27 @@ +#include "peripheralsview.h" +#include "ui_peripheralsview.h" + +PeripheralsView::PeripheralsView(QWidget *parent) : + QWidget(parent), + ui(new Ui::PeripheralsView) +{ + ui->setupUi(this); + + connect(ui->dialRed, SIGNAL(valueChanged(int)), ui->spinRed, SLOT(setValue(int))); + connect(ui->dialGreen, SIGNAL(valueChanged(int)), ui->spinGreen, SLOT(setValue(int))); + connect(ui->dialBlue, SIGNAL(valueChanged(int)), ui->spinBlue, SLOT(setValue(int))); + connect(ui->spinRed, SIGNAL(valueChanged(int)), ui->dialRed, SLOT(setValue(int))); + connect(ui->spinGreen, SIGNAL(valueChanged(int)), ui->dialGreen, SLOT(setValue(int))); + connect(ui->spinBlue, SIGNAL(valueChanged(int)), ui->dialBlue, SLOT(setValue(int))); +} + +PeripheralsView::~PeripheralsView() +{ + delete ui; +} + +void PeripheralsView::setup(const machine::PeripSpiLed *perip_spi_led) { + connect(ui->spinRed, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(red_knob_update(int))); + connect(ui->spinGreen, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(green_knob_update(int))); + connect(ui->spinBlue, SIGNAL(valueChanged(int)), perip_spi_led, SLOT(blue_knob_update(int))); +} diff --git a/qtmips_gui/peripheralsview.h b/qtmips_gui/peripheralsview.h new file mode 100644 index 0000000..8aaf9b9 --- /dev/null +++ b/qtmips_gui/peripheralsview.h @@ -0,0 +1,26 @@ +#ifndef PERIPHERALSVIEW_H +#define PERIPHERALSVIEW_H + +#include + +#include "peripspiled.h" + +namespace Ui { +class PeripheralsView; +} + +class PeripheralsView : public QWidget +{ + Q_OBJECT + +public: + explicit PeripheralsView(QWidget *parent = 0); + ~PeripheralsView(); + + void setup(const machine::PeripSpiLed *perip_spi_led); + +private: + Ui::PeripheralsView *ui; +}; + +#endif // PERIPHERALSVIEW_H diff --git a/qtmips_gui/peripheralsview.ui b/qtmips_gui/peripheralsview.ui new file mode 100644 index 0000000..59a1e4d --- /dev/null +++ b/qtmips_gui/peripheralsview.ui @@ -0,0 +1,161 @@ + + + PeripheralsView + + + + 0 + 0 + 573 + 484 + + + + Form + + + + + + QLayout::SetMaximumSize + + + + + QLayout::SetNoConstraint + + + + + + + 255 + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 255 + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 255 + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 255 + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 255 + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 255 + + + + + + + + + + + + + b31 + + + false + + + + + + + b30 + + + + + + + b29 + + + + + + + + + + + + diff --git a/qtmips_gui/programdock.h b/qtmips_gui/programdock.h index 529730a..56fb1b7 100644 --- a/qtmips_gui/programdock.h +++ b/qtmips_gui/programdock.h @@ -39,6 +39,7 @@ #include #include #include +#include "peripheralsview.h" #include "qtmipsmachine.h" class ProgramDock : public QDockWidget { diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro index fa1cbc6..56e6909 100644 --- a/qtmips_gui/qtmips_gui.pro +++ b/qtmips_gui/qtmips_gui.pro @@ -53,7 +53,8 @@ SOURCES += \ programtableview.cpp \ aboutdialog.cpp \ peripheralsdock.cpp \ - terminaldock.cpp + terminaldock.cpp \ + peripheralsview.cpp HEADERS += \ mainwindow.h \ @@ -87,12 +88,14 @@ HEADERS += \ programtableview.h \ aboutdialog.h \ peripheralsdock.h \ - terminaldock.h + terminaldock.h \ + peripheralsview.h FORMS += \ NewDialog.ui \ NewDialogCache.ui \ - MainWindow.ui + MainWindow.ui \ + peripheralsview.ui RESOURCES += \ icons.qrc -- cgit v1.2.3