Skip to content

Commit

Permalink
emit a warning depending on checkVarEntriesVersionCompat.
Browse files Browse the repository at this point in the history
var entry versions aren't actually calculated yet
  • Loading branch information
adriweb committed Jul 10, 2024
1 parent 8defe0b commit 504a696
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
21 changes: 20 additions & 1 deletion src/TIVarFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ namespace tivars
}
this->makeHeaderFromFile();
this->makeVarEntriesFromFile();
this->checkVarEntriesVersionCompat();
this->computedChecksum = this->computeChecksumFromFileData();
this->fileChecksum = this->getChecksumValueFromFile();
if (this->computedChecksum != this->fileChecksum)
{
// puts("[Warning] File is corrupt (read and calculated checksums differ)");
printf("[Warning] File is corrupt (file checksum = 0x%02X, calculated checksum = 0x%02X)\n", this->fileChecksum, this->computedChecksum);
this->corrupt = true;
}
this->close(); // let's free the resource up as early as possible
Expand Down Expand Up @@ -222,10 +223,28 @@ namespace tivars
{
entry.data_length2 = entry.data_length = (uint16_t) entry.data.size();
this->header.entries_len += sizeof(var_entry_t::data_length) + sizeof(var_entry_t::data_length2) + entry.meta_length + entry.data_length;
// todo: update entry version field
}
this->computedChecksum = this->computeChecksumFromInstanceData();
}

void TIVarFile::checkVarEntriesVersionCompat() const
{
if (this->header.ownerPID > 0 && this->calcModel.getFlags() & TIFeatureFlags::hasFlash)
{
uint8_t max_version = 0;
for (const auto& entry : this->entries)
{
const uint8_t maskedVersion = entry.version & ~0x20;
if (maskedVersion > max_version) max_version = maskedVersion;
}
if (this->header.ownerPID < max_version)
{
printf("[Warning] The declared calculator model (owner ID 0x%02X) may not support the var entry version 0x%02X found in this file.\n", this->header.ownerPID, max_version);
}
}
}

void TIVarFile::var_entry_t::setVarName(const std::string &name) {
std::string newName(name);
if (newName.empty())
Expand Down
1 change: 1 addition & 0 deletions src/TIVarFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ namespace tivars
explicit TIVarFile(const std::string& filePath);

void refreshMetadataFields();
void checkVarEntriesVersionCompat() const;

void makeHeaderFromFile();
void makeVarEntriesFromFile();
Expand Down

0 comments on commit 504a696

Please sign in to comment.