noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix halfPercentage() function issue

This commit is contained in:
Josh Stewart 2022-01-04 22:12:19 +11:00
parent b3843bb293
commit 5e7eebf301
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
speeduino/maths.ino
View File

@ -26,10 +26,12 @@ int fastMap(unsigned long x, int in_min, int in_max, int out_min, int out_max)
unsigned int divu10(unsigned int n)
{
#ifdef USE_LIBDIVIDE
//Check whether 16 or 32 bit divide is required
//if( n <= UINT8_MAX) { return (uint8_t)n / 10; }
if( n <= UINT16_MAX ) { return FAST_DIV16U(n, 10); }
if( n <= UINT8_MAX) { return (uint8_t)n / 10; }
else if( n <= UINT16_MAX ) { return FAST_DIV16U(n, 10); }
else { return libdivide::libdivide_u32_do(n, &libdiv_u32_10); }
//return libdivide::libdivide_u32_do(n, &libdiv_u32_10);
#else
return (n / 10);
@ -55,6 +57,7 @@ unsigned long divu100(unsigned long n)
if( n <= UINT8_MAX) { return (uint8_t)n / 100; }
else if( n <= UINT16_MAX ) { return FAST_DIV16U(n, 100); }
else { return libdivide::libdivide_u32_do(n, &libdiv_u32_100); }
//return libdivide::libdivide_u32_do(n, &libdiv_u32_100);
#else
return (n / 100);
@ -77,9 +80,13 @@ unsigned long percentage(byte x, unsigned long y)
unsigned long halfPercentage(byte x, unsigned long y)
{
#ifdef USE_LIBDIVIDE
//if( x <= UINT8_MAX) { return (uint8_t)x / 200; }
if( x <= UINT16_MAX ) { return FAST_DIV16U(x, 200); }
else { return libdivide::libdivide_u32_do((y * x), &libdiv_u32_200); }
uint32_t numerator = (y * x);
if( numerator <= UINT8_MAX) { return (uint8_t)numerator / 200; }
else if( numerator <= UINT16_MAX ) { return FAST_DIV16U((uint16_t)numerator, 200); }
else { return libdivide::libdivide_u32_do(numerator, &libdiv_u32_200); }
//return libdivide::libdivide_u32_do((y * x), &libdiv_u32_200);
#else
return (y * x) / 200;
#endif
@ -90,8 +97,8 @@ unsigned long halfPercentage(byte x, unsigned long y)
*/
inline long powint(int factor, unsigned int exponent)
{
long product = 1;
unsigned int counter = exponent;
while ( (counter--) > 0) { product *= factor; }
return product;
long product = 1;
unsigned int counter = exponent;
while ( (counter--) > 0) { product *= factor; }
return product;
}