From 12bddeda97b5d428f4ef9006180051c14b01aecc Mon Sep 17 00:00:00 2001
From: daniel-Jones <daniel@danieljon.es>
Date: Wed, 15 Feb 2017 12:17:06 +1030
Subject: Fade with individual speed control now works, can fade each color at
 its own speed. Serial communication revamped to allow extra commands in both
 the front and backend.

---
 qt/RGBController/controllerwindow.cpp | 78 +++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 3 deletions(-)

(limited to 'qt/RGBController/controllerwindow.cpp')

diff --git a/qt/RGBController/controllerwindow.cpp b/qt/RGBController/controllerwindow.cpp
index e9eabd5..9cf41f2 100755
--- a/qt/RGBController/controllerwindow.cpp
+++ b/qt/RGBController/controllerwindow.cpp
@@ -301,19 +301,22 @@ void controllerWindow::on_reload_preset_button_clicked()
 void controllerWindow::on_r_slider_valueChanged(int value)
 {
 	r = value;
-	serial_rgb_change(r, g, b);
+    //serial_rgb_change(r, g, b);
+    portf.send("red=" + QString::number(r));
 }
 
 void controllerWindow::on_g_slider_valueChanged(int value)
 {
 	g = value;
-	serial_rgb_change(r, g, b);
+    //serial_rgb_change(r, g, b);
+    portf.send("green=" + QString::number(g));
 }
 
 void controllerWindow::on_b_slider_valueChanged(int value)
 {
 	b = value;
-	serial_rgb_change(r, g, b);
+    //serial_rgb_change(r, g, b);
+    portf.send("blue=" + QString::number(b));
 }
 
 void controllerWindow::on_red_button_clicked()
@@ -339,6 +342,9 @@ void controllerWindow::on_blue_button_clicked()
 
 void controllerWindow::on_off_button_clicked()
 {
+    ui->r_slider->setValue(1);
+    ui->g_slider->setValue(1);
+    ui->b_slider->setValue(1);
 	ui->r_slider->setValue(0);
 	ui->g_slider->setValue(0);
 	ui->b_slider->setValue(0);
@@ -383,3 +389,69 @@ void controllerWindow::on_preset_delete_button_clicked()
 {
 	delete_preset(ui->presets_dropdown->currentText());
 }
+
+void controllerWindow::on_red_fade_button_clicked()
+{
+    portf.send("redfade");
+}
+
+void controllerWindow::on_green_fade_button_clicked()
+{
+    portf.send("greenfade");
+}
+
+void controllerWindow::on_blue_fade_button_clicked()
+{
+    portf.send("bluefade");
+}
+
+void controllerWindow::on_speed_button_clicked()
+{
+    portf.send("speed=" + QString::number(ui->speed_slider->value()));
+}
+
+void controllerWindow::on_r_speed_slider_valueChanged(int value)
+{
+    portf.send("rspeed=" + QString::number(value));
+}
+
+void controllerWindow::on_g_speed_slider_valueChanged(int value)
+{
+    portf.send("gspeed=" + QString::number(value));
+}
+
+void controllerWindow::on_b_speed_slider_valueChanged(int value)
+{
+    portf.send("bspeed=" + QString::number(value));
+}
+
+void controllerWindow::on_rfrom_valueChanged(int arg1)
+{
+    portf.send("rf=" + QString::number(arg1));
+    ui->r_slider->setValue(arg1);
+}
+
+void controllerWindow::on_rto_valueChanged(int arg1)
+{
+
+}
+
+void controllerWindow::on_gfrom_valueChanged(int arg1)
+{
+
+}
+
+void controllerWindow::on_gto_valueChanged(int arg1)
+{
+
+}
+
+void controllerWindow::on_bfrom_valueChanged(int arg1)
+{
+
+}
+
+void controllerWindow::on_bto_valueChanged(int arg1)
+{
+
+}
-- 
cgit v1.2.3