sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Style

Browse Source
This commit is contained in:
Ben V. Brown
2021-04-28 21:08:42 +10:00
parent fe2469fdb5
commit 56a885ed42
4 changed files with 136 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Core/Drivers/TipThermoModel.cpp
View File

@@ -8,9 +8,9 @@
#include "TipThermoModel.h"
#include "BSP.h"
#include "Settings.h"
#include "Utils.h"
#include "configuration.h"
#include "main.hpp"
#include "Utils.h"
#include "power.hpp"
/*
* The hardware is laid out as a non-inverting op-amp
@@ -218,9 +218,7 @@ const uint16_t uVtoDegC[] = {
#endif
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t));
uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
return Utils::InterpolateLookupTable(uVtoDegC,uVtoDegCItems,tipuVDelta);
}
uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); }
uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) { return convertCtoF(convertuVToDegC(tipuVDelta)); }

33
source/Core/Drivers/Utils.cpp
View File

@@ -7,26 +7,17 @@
#include <Utils.h>
int32_t Utils::InterpolateLookupTable(const uint16_t *lookupTable,
const int noItems, const uint16_t value) {
if (value) {
for (int i = 1; i < (noItems - 1); i++) {
// If current tip temp is less than current lookup, then this current lookup is the higher point to interpolate
if (value < lookupTable[i * 2]) {
return LinearInterpolate(lookupTable[(i - 1) * 2],
lookupTable[((i - 1) * 2) + 1], lookupTable[i * 2],
lookupTable[(i * 2) + 1], value);
}
}
return LinearInterpolate(lookupTable[(noItems - 2) * 2],
lookupTable[((noItems - 2) * 2) + 1],
lookupTable[(noItems - 1) * 2],
lookupTable[((noItems - 1) * 2) + 1], value);
}
return 0;
int32_t Utils::InterpolateLookupTable(const uint16_t *lookupTable, const int noItems, const uint16_t value) {
if (value) {
for (int i = 1; i < (noItems - 1); i++) {
// If current tip temp is less than current lookup, then this current lookup is the higher point to interpolate
if (value < lookupTable[i * 2]) {
return LinearInterpolate(lookupTable[(i - 1) * 2], lookupTable[((i - 1) * 2) + 1], lookupTable[i * 2], lookupTable[(i * 2) + 1], value);
}
}
return LinearInterpolate(lookupTable[(noItems - 2) * 2], lookupTable[((noItems - 2) * 2) + 1], lookupTable[(noItems - 1) * 2], lookupTable[((noItems - 1) * 2) + 1], value);
}
return 0;
}
int32_t Utils::LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2,
int32_t x) {
return y1 + (((((x - x1) * 1000) / (x2 - x1)) * (y2 - y1))) / 1000;
}
int32_t Utils::LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x) { return y1 + (((((x - x1) * 1000) / (x2 - x1)) * (y2 - y1))) / 1000; }

7
source/Core/Drivers/Utils.h
View File

@@ -10,11 +10,8 @@
#include <stdint.h>
class Utils {
public:
static int32_t InterpolateLookupTable(const uint16_t *lookupTable,
const int noItems, const uint16_t value);
static int32_t LinearInterpolate(int32_t x1, int32_t y1, int32_t x2,
int32_t y2, int32_t x);
static int32_t InterpolateLookupTable(const uint16_t *lookupTable, const int noItems, const uint16_t value);
static int32_t LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x);
};
#endif /* CORE_DRIVERS_UTILS_H_ */