Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lint checked

Browse Source
This commit is contained in:
Magnus Persson
2022-01-06 21:54:34 +01:00
parent 299d2dd0fe
commit 5d9115137f
2 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/calc.cpp
View File

@ -21,19 +21,19 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#include "calc.h" #include "src/calc.h"
#include "helper.h"
#include "config.h"
#include <tinyexpr.h> #include <tinyexpr.h>
#include "tempsensor.h"
#include <curveFitting.h> #include <curveFitting.h>
#include "src/helper.h"
#include "src/config.h"
#include "src/tempsensor.h"
#define FORMULA_MAX_DEVIATION 1.5 #define FORMULA_MAX_DEVIATION 1.5
// //
// Use values to derive a formula // Use values to derive a formula
// //
int createFormula( RawFormulaData& fd, char *formulaBuffer, int order ) { int createFormula(RawFormulaData& fd, char *formulaBuffer, int formulaBufferSize, int order) {
int noAngles = 0; int noAngles = 0;
@ -66,13 +66,13 @@ int createFormula( RawFormulaData& fd, char *formulaBuffer, int order ) {
// Print the formula based on 'order' // Print the formula based on 'order'
if ( order == 4 ) { if ( order == 4 ) {
sprintf( formulaBuffer, "%.8f*tilt^4+%.8f*tilt^3+%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2], coeffs[3], coeffs[4] ); snprintf(formulaBuffer, formulaBufferSize, "%.8f*tilt^4+%.8f*tilt^3+%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2], coeffs[3], coeffs[4]);
} else if ( order == 3 ) { } else if ( order == 3 ) {
sprintf( formulaBuffer, "%.8f*tilt^3+%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2], coeffs[3] ); snprintf(formulaBuffer, formulaBufferSize, "%.8f*tilt^3+%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2], coeffs[3]);
} else if ( order == 2 ) { } else if ( order == 2 ) {
sprintf( formulaBuffer, "%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2] ); snprintf(formulaBuffer, formulaBufferSize, "%.8f*tilt^2+%.8f*tilt+%.8f", coeffs[0], coeffs[1], coeffs[2]);
} else { // order == 1 } else { // order == 1
sprintf( formulaBuffer, "%.8f*tilt+%.8f", coeffs[0], coeffs[1] ); snprintf(formulaBuffer, formulaBufferSize, "%.8f*tilt+%.8f", coeffs[0], coeffs[1]);
} }
#if LOG_LEVEL == 6 #if LOG_LEVEL == 6

12
src/calc.h
View File

@ -21,12 +21,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
#ifndef _CALC_H #ifndef SRC_CALC_H_
#define _CALC_H #define SRC_CALC_H_
// Includes // Includes
#include "helper.h" #include "src/helper.h"
#include "config.h" #include "src/config.h"
#define ERR_FORMULA_NOTENOUGHVALUES -1 #define ERR_FORMULA_NOTENOUGHVALUES -1
#define ERR_FORMULA_INTERNAL -2 #define ERR_FORMULA_INTERNAL -2
@ -35,8 +35,8 @@ SOFTWARE.
// Functions // Functions
double calculateGravity(double angle, double temp, const char *tempFormula = 0); double calculateGravity(double angle, double temp, const char *tempFormula = 0);
double gravityTemperatureCorrection(double gravity, double temp, char tempFormat, double calTemp = 20); double gravityTemperatureCorrection(double gravity, double temp, char tempFormat, double calTemp = 20);
int createFormula( RawFormulaData& fd, char *formulaBuffer, int order); int createFormula(RawFormulaData& fd, char *formulaBuffer, int formulaBufferSize, int order);
#endif // _CALC_H #endif // SRC_CALC_H_
// EOF // EOF