martin/swimtracker-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup and fixes

Browse Source
This commit is contained in:
Martin Bauer
2023-09-14 16:16:17 +02:00
parent 4900c36e0b
commit 5e56ede55c
14 changed files with 258 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/lib/logging/Logger.cpp
View File

@@ -14,10 +14,6 @@ void Logger::init()
{
theLogger = new Logger();
#ifdef PLATFORM_ESP32
Serial.begin(115200);
while (!Serial)
{
}
#endif
}

7
firmware/lib/logging/Logger.h
View File

@@ -18,10 +18,12 @@
Logger::getInstance()->log(__VA_ARGS__); \
}
#define LOG_TRACE(...) \
/*#define LOG_TRACE(...) \
{ \
Logger::getInstance()->log(__VA_ARGS__); \
}
*/
#define LOG_TRACE(...) {}
#define LOG_WARNING(...) \
{ \
@@ -55,8 +57,7 @@ public:
std::forward<Args>(args)...);
#pragma GCC diagnostic pop
//Serial.println(&data_[currentSize_]);
Serial.println(&data_[currentSize_]);
if(charsWritten > 0)
{
currentSize_ += charsWritten + 1; // + 1 for trailing zero

4
firmware/lib/scale/Scale.h
View File

@@ -8,7 +8,7 @@ public:
bool measure(uint16_t &measurementOut)
{
long value = hx711_.read_average(CONFIG_MEASUREMENT_AVG_COUNT);
LOG_TRACE("rv %ld\n", value);
LOG_TRACE("rv %ld", value);
value -= offset_;
if (value < 0)
@@ -28,7 +28,7 @@ public:
{
auto v1 = hx711_.read_average(3);
offset_ = hx711_.read_average(numMeasurementsToAverage);
LOG_INFO("Init reading %ld, Tare offset %ld\n", v1, offset_);
LOG_INFO("Init reading %ld, Tare offset %ld", v1, offset_);
}
const long &offset() const { return offset_; }

5
firmware/lib/session/SimpleMeasurementSession.h
View File

@@ -85,7 +85,7 @@ private:
// use error codes of write instead? anyway: test it!
LOG_INFO("%ld saveToFileSystem start", millis());
deleteUntilBytesFree(CONFIG_SESSION_MAX_SIZE);
LOG_INFO(" %ld after deleteUntilBytesFree()", millis());
LOG_INFO("%ld after deleteUntilBytesFree()", millis());
using fs_string = portablefs::string;
fs_string filename = fs_string(CONFIG_DATA_PATH) + "/" + portablefs::to_string(chunk->getStartTime());
@@ -105,11 +105,12 @@ private:
}
else
{
LOG_INFO("Creating new session file");
auto file = portablefs::open(filename.c_str(), "w");
StreamingMsgPackEncoder<portablefs::File> encoder(&file);
chunk->serialize(encoder);
}
LOG_INFO(" %ld saveToFileSystem done", millis());
LOG_INFO("%ld saveToFileSystem done", millis());
}
void deleteUntilBytesFree(size_t requiredSpace)