5 Commits

4 changed files with 32 additions and 2 deletions

View File

@@ -60,6 +60,9 @@
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="monitorMaxBrightnessSlider"> <widget class="QSlider" name="monitorMaxBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -74,6 +77,9 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="monitorMinBrightnessSlider"> <widget class="QSlider" name="monitorMinBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -117,6 +123,9 @@
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSlider" name="monitorBrightnessSlider"> <widget class="QSlider" name="monitorBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -160,6 +169,9 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="monitorOverallMinBrightnessSlider"> <widget class="QSlider" name="monitorOverallMinBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -184,6 +196,9 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="monitorOverallMaxBrightnessSlider"> <widget class="QSlider" name="monitorOverallMaxBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -243,6 +258,9 @@
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSlider" name="monitorOverallBrightnessSlider"> <widget class="QSlider" name="monitorOverallBrightnessSlider">
<property name="value">
<number>50</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>

View File

@@ -19,7 +19,7 @@
#include "sensor_driver.hpp" #include "sensor_driver.hpp"
#include "utils.hpp" #include "utils.hpp"
MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), m_mtx(QMutex::RecursionMode::Recursive)
{ {
qDebug(ltr("Creating main window")); qDebug(ltr("Creating main window"));
@@ -29,6 +29,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
enumMonitors(); enumMonitors();
setupMonitorsTab(); setupMonitorsTab();
setupSensorsTab();
setupTrayIcon(); setupTrayIcon();
@@ -53,6 +54,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
void MainWindow::enumSensors() void MainWindow::enumSensors()
{ {
m_sensors.clear();
auto sensors = enumerateSensors(); auto sensors = enumerateSensors();
for(auto& sensor: sensors) { for(auto& sensor: sensors) {
@@ -124,6 +127,8 @@ void MainWindow::setupMonitorsTab()
setupBrightness(); setupBrightness();
setupOverallBrightness(); setupOverallBrightness();
resetAllMonitorSettings();
} }
void MainWindow::setupLimitsSlider() void MainWindow::setupLimitsSlider()
@@ -216,6 +221,11 @@ void MainWindow::setupOverallBrightness()
}); });
} }
void MainWindow::setupSensorsTab()
{
m_ui.tabs->removeTab(1);
}
void MainWindow::setupTrayIcon() void MainWindow::setupTrayIcon()
{ {
loadIcons(); loadIcons();

View File

@@ -40,6 +40,8 @@ class MainWindow : public QMainWindow {
void setupBrightness(); void setupBrightness();
void setupOverallBrightness(); void setupOverallBrightness();
void setupSensorsTab();
void setupTrayIcon(); void setupTrayIcon();
void setupCallbackTimer(); void setupCallbackTimer();

View File

@@ -56,7 +56,7 @@ Found DFU: [0483:df11] ver=2200, devnum=57, cfg=1, intf=0, path="2-13.2.2", alt=
Found DFU: [0483:df11] ver=2200, devnum=57, cfg=1, intf=0, path="2-13.2.2", alt=0, name="@Internal Flash /0x08000000/032*0001Kg", serial="FFFFFFFEFFFF" Found DFU: [0483:df11] ver=2200, devnum=57, cfg=1, intf=0, path="2-13.2.2", alt=0, name="@Internal Flash /0x08000000/032*0001Kg", serial="FFFFFFFEFFFF"
``` ```
The firmware can then be flashing using: The firmware can then be flashed using:
```console ```console
$ dfu-util -a 0 -s 0x08000000 -D AdaptiveBrightnessFirmware.bin $ dfu-util -a 0 -s 0x08000000 -D AdaptiveBrightnessFirmware.bin