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

Convert the interpolator to int32

Browse Source
This commit is contained in:
Ben V. Brown
2022-07-13 20:19:57 +10:00
parent 7b30d040e7
commit c23a29a51a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Core/BSP/Magic/ThermoModel.cpp
View File

@@ -9,7 +9,7 @@
#include "configuration.h" #include "configuration.h"
#ifdef TEMP_uV_LOOKUP_HAKKO #ifdef TEMP_uV_LOOKUP_HAKKO
const uint16_t uVtoDegC[] = { const int32_t uVtoDegC[] = {
// //
// uv -> temp in C // uv -> temp in C
0, 0, // 0, 0, //
@@ -67,6 +67,6 @@ const uint16_t uVtoDegC[] = {
}; };
#endif #endif
const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t)); const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(int32_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); }

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

@@ -7,7 +7,7 @@
#include <Utils.h> #include <Utils.h>
int32_t Utils::InterpolateLookupTable(const uint16_t *lookupTable, const int noItems, const uint16_t value) { int32_t Utils::InterpolateLookupTable(const int32_t *lookupTable, const int noItems, const int32_t value) {
if (value) { if (value) {
for (int i = 1; i < (noItems - 1); i++) { 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 current tip temp is less than current lookup, then this current lookup is the higher point to interpolate

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

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