ALPAKA/driver-w25qxxx
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/driver-w25qxxx.git synced 2025-12-17 19:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated search

Browse Source
This commit is contained in:
dario
2024-06-24 10:16:31 +02:00
parent fd6d1d61c2
commit cee54f1d8c
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/sta/utils/logger.tpp
View File

@@ -4,6 +4,8 @@
#include <sta/debug/debug.hpp>
#include <sta/drivers/w25qxx.hpp>
#define STA_LOGGER_VALID_DATA_BYTE 0x42
namespace sta
{
template <typename T>
@@ -73,8 +75,8 @@ namespace sta
middle = (left + right) / 2;
address_ = ((middle * (sizeof(T)+1)) / W25QXX_PAGE_SIZE) * W25QXX_PAGE_SIZE;
ptr_ = 0;
ptr_ = (middle * sizeof(T)+1) % W25QXX_PAGE_SIZE;
address_ = (middle * sizeof(T)+1) - ptr_;
}
template <typename T>
@@ -97,7 +99,7 @@ namespace sta
std::memcpy(buffer+1, data, sizeof(T));
// Set the first byte to 0x42 to mark it as a valid data point.
buffer[0] = 0x42;
buffer[0] = STA_LOGGER_VALID_DATA_BYTE;
uint8_t * buff_ptr = buffer;
uint32_t length = sizeof(T)+1;
@@ -163,25 +165,25 @@ namespace sta
}
template <typename T>
size_t Logger<T>::count()
uint32_t Logger<T>::count()
{
return ((address_ + ptr_) - start_ * W25QXX_SECTOR_SIZE) / (sizeof(T)+1);
}
template <typename T>
size_t Logger<T>::remaining()
uint32_t Logger<T>::remaining()
{
return (end_ * W25QXX_SECTOR_SIZE - (address_ + ptr_)) / (sizeof(T)+1);
}
template <typename T>
size_t Logger<T>::capacity()
uint32_t Logger<T>::capacity()
{
return (end_ - start_) * W25QXX_SECTOR_SIZE / (sizeof(T)+1);
return ((end_ - start_) * W25QXX_SECTOR_SIZE) / (sizeof(T)+1);
}
template <typename T>
bool Logger<T>::isValid(std::size_t i)
bool Logger<T>::isValid(uint32_t i)
{
uint32_t address = start_ * W25QXX_SECTOR_SIZE + i * (sizeof(T)+1);
@@ -189,18 +191,18 @@ namespace sta
if (address / W25QXX_PAGE_SIZE == address_ / W25QXX_PAGE_SIZE)
{
uint8_t * ptr = buffer_ + address % W25QXX_PAGE_SIZE;
return (bool)*ptr;
return *ptr == STA_LOGGER_VALID_DATA_BYTE;
}
else
{
uint8_t buffer[sizeof(T)+1];
flash_->readData(address, buffer, sizeof(T)+1);
return (bool)*buffer;
return buffer[0] == STA_LOGGER_VALID_DATA_BYTE;
}
}
template <typename T>
T Logger<T>::get(std::size_t i)
T Logger<T>::get(uint32_t i)
{
uint32_t address = start_ * W25QXX_SECTOR_SIZE + i * (sizeof(T)+1);