BlackMark/AdaptiveBrightness
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Change sensor interface to provide normalized values

Browse Source
This commit is contained in:
BlackMark 2020-07-06 20:59:20 +02:00
parent 03e2c950ed
commit 2704bb2636
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
AdaptiveBrightness/sensor.cpp
View File

@ -1,5 +1,6 @@
#include "sensor.hpp"
#include <algorithm>
#include <regex>
#include <QSerialPort>
@ -7,25 +8,14 @@
#include <QtGlobal>
#include "log_tr.hpp"
#include "utils.hpp"
Sensor::~Sensor()
{
qDebug(ltr("Destroying sensor on serial port %1").arg(m_serialPortName));
}
std::pair<int, int> Sensor::readRange()
{
qDebug(ltr("Reading range of sensor on port %1").arg(m_serialPortName));
const auto rangeCmd = QByteArray(RANGE_CMD.data(), static_cast<int>(RANGE_CMD.size()));
QByteArray response;
if(!getSensorCommandResponse(m_serialPortName, rangeCmd, response))
return {-1, -1};
return parseRangeResponse(response);
}
std::vector<int> Sensor::readValues()
std::vector<float> Sensor::readValues()
{
qDebug(ltr("Reading values of sensor on port %1").arg(m_serialPortName));
@ -34,7 +24,27 @@ std::vector<int> Sensor::readValues()
if(!getSensorCommandResponse(m_serialPortName, readCmd, response))
return {};
return parseReadResponse(response);
const auto values = parseReadResponse(response);
if(!m_range) {
qDebug(ltr("No sensor range known"));
const auto sensorRange = readRange();
if(m_errorOccurred) {
return {};
}
m_range = sensorRange;
}
std::vector<float> normalizedValues;
for(const auto& value: values) {
const auto mappedValue = utils::map(value, m_range->first, m_range->second, 0.f, 1.f);
normalizedValues.push_back(std::clamp(mappedValue, 0.f, 1.f));
}
return normalizedValues;
}
Sensor::Sensor(const QString& serialPortName) : m_serialPortName(serialPortName)
@ -156,3 +166,15 @@ std::vector<int> Sensor::parseReadResponse(const QByteArray& response) const
return {};
}
std::pair<int, int> Sensor::readRange()
{
qDebug(ltr("Reading range of sensor on port %1").arg(m_serialPortName));
const auto rangeCmd = QByteArray(RANGE_CMD.data(), static_cast<int>(RANGE_CMD.size()));
QByteArray response;
if(!getSensorCommandResponse(m_serialPortName, rangeCmd, response))
return {-1, -1};
return parseRangeResponse(response);
}

8
AdaptiveBrightness/sensor.hpp
View File

@ -1,5 +1,6 @@
#pragma once
#include <optional>
#include <string>
#include <string_view>
#include <utility>
@ -12,8 +13,7 @@ class Sensor {
public:
~Sensor();
std::pair<int, int> readRange();
std::vector<int> readValues();
std::vector<float> readValues();
operator bool() const { return !m_errorOccurred; }
@ -29,6 +29,8 @@ class Sensor {
const QString m_serialPortName;
bool m_errorOccurred = false;
std::optional<std::pair<int, int>> m_range;
Sensor(const QString& serialPortName);
bool isValidSensor();
@ -38,4 +40,6 @@ class Sensor {
std::string parseVersionResponse(const QByteArray& response) const;
std::pair<int, int> parseRangeResponse(const QByteArray& response) const;
std::vector<int> parseReadResponse(const QByteArray& response) const;
std::pair<int, int> readRange();
};