Skip to content

Validate sensor calibration files #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eirenliel merged 2 commits into from
May 30, 2026
+36 −5
Merged

Validate sensor calibration files #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3fa8b9
Validate sensor calibration files; fix FS I/O
unlogisch04 May 27, 2026
6d5fd20
format
unlogisch04 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/FSHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class File {
size_t size() const { return m_File.size(); }
bool isDirectory() { return m_File.isDirectory(); }
bool seek(size_t pos) { return m_File.seek(pos); }
bool read(uint8_t* buffer, size_t size) { return m_File.read(buffer, size); }
bool write(const uint8_t* buffer, size_t size) {
size_t read(uint8_t* buffer, size_t size) { return m_File.read(buffer, size); }
size_t write(const uint8_t* buffer, size_t size) {
return m_File.write(buffer, size);
}
void close() { return m_File.close(); }
Expand Down
37 changes: 34 additions & 3 deletions src/configuration/Configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,41 @@ void Configuration::eraseSensors() {

void Configuration::loadSensors() {
SlimeVR::Utils::forEachFile(DIR_CALIBRATIONS, [&](SlimeVR::Utils::File f) {
SensorConfig sensorConfig;
f.read((uint8_t*)&sensorConfig, sizeof(SensorConfig));

uint8_t sensorId = strtoul(f.name(), nullptr, 10);

if (f.size() != sizeof(SensorConfig)) {
m_Logger.warn(
"Skipping incompatible sensor calibration file index %d (size=%u "
"expected=%u)",
sensorId,
static_cast<unsigned>(f.size()),
static_cast<unsigned>(sizeof(SensorConfig))
);
return;
}

SensorConfig sensorConfig{};
auto bytesRead = f.read((uint8_t*)&sensorConfig, sizeof(SensorConfig));
if (bytesRead != sizeof(SensorConfig)) {
m_Logger.warn(
"Skipping unreadable sensor calibration file index %d (read=%u "
"expected=%u)",
sensorId,
static_cast<unsigned>(bytesRead),
static_cast<unsigned>(sizeof(SensorConfig))
);
return;
}

if (sensorConfig.type > SensorConfigType::RUNTIME_CALIBRATION) {
m_Logger.warn(
"Skipping sensor calibration file index %d with invalid type=%d",
sensorId,
static_cast<int>(sensorConfig.type)
);
return;
}

m_Logger.debug(
"Found sensor calibration for %s at index %d",
calibrationConfigTypeToString(sensorConfig.type),
Expand Down