From c12f74836a3389d9f11e13e71dfa755520bb99ba Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 22 May 2017 18:49:29 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=B0=9D=EA=B8=B0=20=EC=A1=B0=EC=A0=88=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EA=B0=92=EC=9D=84=20=EC=9E=98=EB=AA=BB=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20=EC=9D=98=EB=8F=84=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=80=20=EB=B0=9D=EA=B8=B0=EB=A1=9C=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/backlight.cpp | 29 ++++++++++++++++++++++++++--- app/gui/oven_control/inputoverwatcher.cpp | 2 +- app/gui/oven_control/main.cpp | 1 - 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/gui/oven_control/backlight.cpp b/app/gui/oven_control/backlight.cpp index 44403e2..58358bf 100644 --- a/app/gui/oven_control/backlight.cpp +++ b/app/gui/oven_control/backlight.cpp @@ -5,6 +5,29 @@ namespace { int setting = 7; bool lowered = false; + +int toSystem(int setting) +{ + switch (setting) + { + case 0: + return 3; + case 1: + return 4; + case 2: + return 5; + case 3: + return 6; + case 4: + return 7; + case 5: + return 8; + case 6: + return 9; + case 7: + return 10; + } +} } void Backlight::lower() @@ -13,16 +36,16 @@ void Backlight::lower() int t = setting - 2; if (t < 0) - System::setBacklight(0); + System::setBacklight(toSystem(0)); else - System::setBacklight(t); + System::setBacklight(toSystem(t)); } void Backlight::restore() { lowered = false; - System::setBacklight(setting); + System::setBacklight(toSystem(setting)); } void Backlight::set(int level) diff --git a/app/gui/oven_control/inputoverwatcher.cpp b/app/gui/oven_control/inputoverwatcher.cpp index c579daa..a18811f 100644 --- a/app/gui/oven_control/inputoverwatcher.cpp +++ b/app/gui/oven_control/inputoverwatcher.cpp @@ -8,7 +8,7 @@ InputOverwatcher::InputOverwatcher(QObject *parent) : QObject(parent) { - Define::config_item item = Config::getInstance()->getConfigValue(Define::config_backlight); + Define::config_item item = Config::getInstance()->getConfigValue(Define::config_set_auto_darkness); timer.setSingleShot(true); timer.setInterval(item.d32 * 60000); diff --git a/app/gui/oven_control/main.cpp b/app/gui/oven_control/main.cpp index 3d2a6f0..5ac3302 100644 --- a/app/gui/oven_control/main.cpp +++ b/app/gui/oven_control/main.cpp @@ -25,7 +25,6 @@ int main(int argc, char *argv[]) OvenStatistics::getInstance(oven); Config::getInstance(oven); - MainWindow w; w.showFullScreen(); -- 2.1.4