summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaniel-Jones <daniel@danieljon.es>2017-02-16 15:30:49 +1030
committerdaniel-Jones <daniel@danieljon.es>2017-02-16 15:30:49 +1030
commit84cf187da89ceb5c8a3cf3fa551d2329b29b0e59 (patch)
treeaceb34e88274391ab2ec9bc716a6351267f2f01a
parent12bddeda97b5d428f4ef9006180051c14b01aecc (diff)
downloadRGB-Controller-84cf187da89ceb5c8a3cf3fa551d2329b29b0e59.tar.gz
RGB-Controller-84cf187da89ceb5c8a3cf3fa551d2329b29b0e59.zip
Fade minimum and maximum values now correctly function.
-rw-r--r--.gitignore4
-rw-r--r--arduino/rgb/.rgb.ino.swobin0 -> 16384 bytes
-rwxr-xr-xqt/RGBController/RGBControllerbin93104 -> 93104 bytes
-rwxr-xr-xqt/RGBController/controllerwindow.cpp12
-rw-r--r--qt/RGBController/controllerwindow.obin98264 -> 101504 bytes
5 files changed, 11 insertions, 5 deletions
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
--- /dev/null
+++ b/arduino/rgb/.rgb.ino.swo
Binary files differ
diff --git a/qt/RGBController/RGBController b/qt/RGBController/RGBController
index ddb96b0..8607dc8 100755
--- a/qt/RGBController/RGBController
+++ b/qt/RGBController/RGBController
Binary files 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
--- a/qt/RGBController/controllerwindow.o
+++ b/qt/RGBController/controllerwindow.o
Binary files differ