scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Update clang-tidy configuration and fix some warnings (#1474)

Browse source 
Don't enable coding conventions from unrelated projects. Only enable
generic checks.
This commit is contained in:
Riku Isokoski 2022-12-18 19:14:36 +02:00 • committed by GitHub
parent bfedf47d1a
commit afea7ca0d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 153 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/components/heartrate/Ppg.cpp
View file

@ -29,8 +29,9 @@ namespace {
auto z1 = CompareShift(d, mn - 1, size);
for (int i = mn; i < mx + 1; i++) {
auto z = CompareShift(d, i, size);
if (z2 > z1 && z1 < z)
if (z2 > z1 && z1 < z) {
return i;
}
z2 = z1;
z1 = z;
}
@ -52,41 +53,48 @@ int8_t Ppg::Preprocess(float spl) {
auto spl_int = static_cast<int8_t>(spl);
if (dataIndex < 200)
if (dataIndex < 200) {
data[dataIndex++] = spl_int;
}
return spl_int;
}
float Ppg::HeartRate() {
if (dataIndex < 200)
int Ppg::HeartRate() {
if (dataIndex < 200) {
return 0;
}
NRF_LOG_INFO("PREPROCESS, offset = %d", offset);
auto hr = ProcessHeartRate();
dataIndex = 0;
return hr;
}
float Ppg::ProcessHeartRate() {
auto t0 = Trough(data.data(), dataIndex, 7, 48);
if (t0 < 0)
return 0;
float t1 = t0 * 2;
int Ppg::ProcessHeartRate() {
int t0 = Trough(data.data(), dataIndex, 7, 48);
if (t0 < 0) {
return 0;
}
int t1 = t0 * 2;
t1 = Trough(data.data(), dataIndex, t1 - 5, t1 + 5);
if (t1 < 0)
if (t1 < 0) {
return 0;
}
float t2 = static_cast<int>(t1 * 3) / 2;
int t2 = (t1 * 3) / 2;
t2 = Trough(data.data(), dataIndex, t2 - 5, t2 + 5);
if (t2 < 0)
if (t2 < 0) {
return 0;
}
float t3 = static_cast<int>(t2 * 4) / 3;
int t3 = (t2 * 4) / 3;
t3 = Trough(data.data(), dataIndex, t3 - 4, t3 + 4);
if (t3 < 0)
return static_cast<int>(60 * 24 * 3) / static_cast<int>(t2);
if (t3 < 0) {
return (60 * 24 * 3) / t2;
}
return static_cast<int>(60 * 24 * 4) / static_cast<int>(t3);
return (60 * 24 * 4) / t3;
}
void Ppg::SetOffset(uint16_t offset) {

6
src/components/heartrate/Ppg.h
View file

@ -12,9 +12,9 @@ namespace Pinetime {
public:
Ppg();
int8_t Preprocess(float spl);
float HeartRate();
int HeartRate();
void SetOffset(uint16_t i);
void SetOffset(uint16_t offset);
void Reset();
private:
@ -25,7 +25,7 @@ namespace Pinetime {
Ptagc agc;
Biquad lpf;
float ProcessHeartRate();
int ProcessHeartRate();
};
}
}

8
src/components/heartrate/Ptagc.cpp
View file

@ -14,13 +14,15 @@ Ptagc::Ptagc(float start, float decay, float threshold) : peak {start}, decay {d
}
float Ptagc::Step(float spl) {
if (std::abs(spl) > peak)
if (std::abs(spl) > peak) {
peak *= boost;
else
} else {
peak *= decay;
}
if ((spl > (peak * threshold)) || (spl < (peak * -threshold)))
if ((spl > (peak * threshold)) || (spl < (peak * -threshold))) {
return 0.0f;
}
spl = 100.0f * spl / (2.0f * peak);
return spl;