From 84cf187da89ceb5c8a3cf3fa551d2329b29b0e59 Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Thu, 16 Feb 2017 15:30:49 +1030 Subject: Fade minimum and maximum values now correctly function. --- .gitignore | 4 ++++ arduino/rgb/.rgb.ino.swo | Bin 0 -> 16384 bytes qt/RGBController/RGBController | Bin 93104 -> 93104 bytes qt/RGBController/controllerwindow.cpp | 12 +++++++----- qt/RGBController/controllerwindow.o | Bin 98264 -> 101504 bytes 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 arduino/rgb/.rgb.ino.swo diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01eef74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +*.swp +*.swo +*.o diff --git a/arduino/rgb/.rgb.ino.swo b/arduino/rgb/.rgb.ino.swo new file mode 100644 index 0000000..259a52b Binary files /dev/null and b/arduino/rgb/.rgb.ino.swo differ diff --git a/qt/RGBController/RGBController b/qt/RGBController/RGBController index ddb96b0..8607dc8 100755 Binary files a/qt/RGBController/RGBController and b/qt/RGBController/RGBController differ diff --git a/qt/RGBController/controllerwindow.cpp b/qt/RGBController/controllerwindow.cpp index 9cf41f2..cf53f82 100755 --- a/qt/RGBController/controllerwindow.cpp +++ b/qt/RGBController/controllerwindow.cpp @@ -433,25 +433,27 @@ void controllerWindow::on_rfrom_valueChanged(int arg1) void controllerWindow::on_rto_valueChanged(int arg1) { - + portf.send("rt=" + QString::number(arg1)); } void controllerWindow::on_gfrom_valueChanged(int arg1) { - + portf.send("gf=" + QString::number(arg1)); + ui->g_slider->setValue(arg1); } void controllerWindow::on_gto_valueChanged(int arg1) { - +portf.send("gt=" + QString::number(arg1)); } void controllerWindow::on_bfrom_valueChanged(int arg1) { - + portf.send("bf=" + QString::number(arg1)); + ui->b_slider->setValue(arg1); } void controllerWindow::on_bto_valueChanged(int arg1) { - + portf.send("bt=" + QString::number(arg1)); } diff --git a/qt/RGBController/controllerwindow.o b/qt/RGBController/controllerwindow.o index 3ccf97f..6c6c914 100644 Binary files a/qt/RGBController/controllerwindow.o and b/qt/RGBController/controllerwindow.o differ -- cgit v1.2.3