adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New kernel drivers and device migrations (#563)

Browse Source
This commit is contained in:
Ken Van Hoeylandt
2026-07-14 20:26:57 +02:00
committed by GitHub
parent 955416dac8
commit 8af6204ba1
215 changed files with 6359 additions and 3633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactility/Source/settings/TouchCalibrationSettings.cpp
+1 -63
View File
@@ -2,10 +2,8 @@
#include <Tactility/file/File.h>
#include <Tactility/file/PropertiesFile.h>
#include <Tactility/Mutex.h>
#include <Tactility/Paths.h>
#include <algorithm>
#include <cstdlib>
#include <cerrno>
#include <climits>
@@ -24,11 +22,6 @@ constexpr auto* SETTINGS_KEY_X_MAX = "xMax";
constexpr auto* SETTINGS_KEY_Y_MIN = "yMin";
constexpr auto* SETTINGS_KEY_Y_MAX = "yMax";
static bool runtimeCalibrationEnabled = true;
static bool cacheInitialized = false;
static TouchCalibrationSettings cachedSettings;
static tt::Mutex cacheMutex;
static bool toBool(const std::string& value) {
return value == "1" || value == "true" || value == "True";
}
@@ -127,62 +120,7 @@ bool save(const TouchCalibrationSettings& settings) {
return false;
}
if (!file::savePropertiesFile(settings_path, map)) {
return false;
}
auto lock = cacheMutex.asScopedLock();
lock.lock();
cachedSettings = settings;
cacheInitialized = true;
return true;
}
TouchCalibrationSettings getActive() {
auto lock = cacheMutex.asScopedLock();
lock.lock();
if (!cacheInitialized) {
cachedSettings = loadOrGetDefault();
cacheInitialized = true;
}
if (!runtimeCalibrationEnabled) {
auto disabled = cachedSettings;
disabled.enabled = false;
return disabled;
}
return cachedSettings;
}
void setRuntimeCalibrationEnabled(bool enabled) {
auto lock = cacheMutex.asScopedLock();
lock.lock();
runtimeCalibrationEnabled = enabled;
}
void invalidateCache() {
auto lock = cacheMutex.asScopedLock();
lock.lock();
cacheInitialized = false;
}
bool applyCalibration(const TouchCalibrationSettings& settings, uint16_t xMax, uint16_t yMax, uint16_t& x, uint16_t& y) {
if (!settings.enabled || !isValid(settings)) {
return false;
}
const int32_t in_x = static_cast<int32_t>(x);
const int32_t in_y = static_cast<int32_t>(y);
const int64_t mapped_x = (static_cast<int64_t>(in_x) - static_cast<int64_t>(settings.xMin)) *
static_cast<int64_t>(xMax) /
(static_cast<int64_t>(settings.xMax) - static_cast<int64_t>(settings.xMin));
const int64_t mapped_y = (static_cast<int64_t>(in_y) - static_cast<int64_t>(settings.yMin)) *
static_cast<int64_t>(yMax) /
(static_cast<int64_t>(settings.yMax) - static_cast<int64_t>(settings.yMin));
x = static_cast<uint16_t>(std::clamp<int64_t>(mapped_x, 0, static_cast<int64_t>(xMax)));
y = static_cast<uint16_t>(std::clamp<int64_t>(mapped_y, 0, static_cast<int64_t>(yMax)));
return true;
return file::savePropertiesFile(settings_path, map);
}
} // namespace tt::settings::touch