MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed LUA_NUMBER_INTEGRAL definition in user_config.h.

This commit is contained in:
HuangRui 2015-01-26 19:57:54 +08:00
parent e11721ebfd
commit 646eaec29c
2 changed files with 154 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/include/user_config.h
View File

@ -7,7 +7,7 @@
#define NODE_VERSION_INTERNAL 0U #define NODE_VERSION_INTERNAL 0U
#define NODE_VERSION "NodeMCU 0.9.5" #define NODE_VERSION "NodeMCU 0.9.5"
#define BUILD_DATE "build 20150124" #define BUILD_DATE "build 20150126"
// #define FLASH_512K // #define FLASH_512K
// #define FLASH_1M // #define FLASH_1M
@ -67,8 +67,10 @@
#define LUA_USE_MODULES_MQTT #define LUA_USE_MODULES_MQTT
#endif /* LUA_USE_MODULES */ #endif /* LUA_USE_MODULES */
// #define LUA_NUMBER_INTEGRAL #define LUA_NUMBER_INTEGRAL
#ifndef LUA_NUMBER_INTEGRAL
#define PRINTF_LONG_SUPPORT #define PRINTF_LONG_SUPPORT
#endif
#define LUA_OPTRAM #define LUA_OPTRAM
#ifdef LUA_OPTRAM #ifdef LUA_OPTRAM

96
app/libc/c_math.c
View File

@ -1,15 +1,18 @@
#include "c_math.h" #include "c_math.h"
#include "c_types.h" #include "c_types.h"
double floor(double x){ double floor(double x)
{
return (double) (x < 0.f ? (((int) x) - 1) : ((int) x)); return (double) (x < 0.f ? (((int) x) - 1) : ((int) x));
} }
double pow(double x, double y){ double pow(double x, double y)
{
#define MAXEXP 2031 /* (MAX_EXP * 16) - 1 */ #define MAXEXP 2031 /* (MAX_EXP * 16) - 1 */
#define MINEXP -2047 /* (MIN_EXP * 16) - 1 */ #define MINEXP -2047 /* (MIN_EXP * 16) - 1 */
#define HUGE MAXFLOAT #define HUGE MAXFLOAT
double a1[] = { double a1[] =
{
1.0, 1.0,
0.95760328069857365, 0.95760328069857365,
0.91700404320467123, 0.91700404320467123,
@ -28,7 +31,8 @@ double a1[] = {
0.52213689121370692, 0.52213689121370692,
0.50000000000000000 0.50000000000000000
}; };
double a2[] = { double a2[] =
{
0.24114209503420288E-17, 0.24114209503420288E-17,
0.92291566937243079E-18, 0.92291566937243079E-18,
-0.15241915231122319E-17, -0.15241915231122319E-17,
@ -56,14 +60,17 @@ double k = 0.442695040888963407;
if (y == 0.0) if (y == 0.0)
return (1.0); return (1.0);
if (x <= 0.0) { if (x <= 0.0)
if (x == 0.0) { {
if (x == 0.0)
{
if (y > 0.0) if (y > 0.0)
return (x); return (x);
//cmemsg(FP_POWO, &y); //cmemsg(FP_POWO, &y);
//return(HUGE); //return(HUGE);
} }
else { else
{
//cmemsg(FP_POWN, &x); //cmemsg(FP_POWN, &x);
x = -x; x = -x;
} }
@ -95,15 +102,18 @@ double k = 0.442695040888963407;
w = 0.0625 * (double)((int)(16.0 * w2)); w = 0.0625 * (double)((int)(16.0 * w2));
iw1 = 16.0 * (w1 + w); iw1 = 16.0 * (w1 + w);
w2 -= w; w2 -= w;
while (w2 > 0.0) { while (w2 > 0.0)
{
iw1++; iw1++;
w2 -= 0.0625; w2 -= 0.0625;
} }
if (iw1 > MAXEXP) { if (iw1 > MAXEXP)
{
//cmemsg(FP_POWO, &y); //cmemsg(FP_POWO, &y);
return (HUGE); return (HUGE);
} }
if (iw1 < MINEXP) { if (iw1 < MINEXP)
{
//cmemsg(FP_POWU, &y); //cmemsg(FP_POWU, &y);
return (0.0); return (0.0);
} }
@ -118,34 +128,44 @@ double k = 0.442695040888963407;
#if 0 #if 0
#ifndef __math_68881 #ifndef __math_68881
double atan(double x){ double atan(double x)
{
return x; return x;
} }
double cos(double x){ double cos(double x)
{
return x; return x;
} }
double sin(double x){ double sin(double x)
{
return x; return x;
} }
double tan(double x){ double tan(double x)
{
return x; return x;
} }
double tanh(double x){ double tanh(double x)
{
return x; return x;
} }
double frexp(double x, int *y){ double frexp(double x, int *y)
{
return x; return x;
} }
double modf(double x, double *y){ double modf(double x, double *y)
{
return x; return x;
} }
double ceil(double x){ double ceil(double x)
{
return x; return x;
} }
double fabs(double x){ double fabs(double x)
{
return x; return x;
} }
double floor(double x){ double floor(double x)
{
return x; return x;
} }
#endif /* ! defined (__math_68881) */ #endif /* ! defined (__math_68881) */
@ -154,40 +174,52 @@ double floor(double x){
#ifndef _REENT_ONLY #ifndef _REENT_ONLY
#ifndef __math_68881 #ifndef __math_68881
double acos(double x){ double acos(double x)
{
return x; return x;
} }
double asin(double x){ double asin(double x)
{
return x; return x;
} }
double atan2(double x, double y){ double atan2(double x, double y)
{
return x; return x;
} }
double cosh(double x){ double cosh(double x)
{
return x; return x;
} }
double sinh(double x){ double sinh(double x)
{
return x; return x;
} }
double exp(double x){ double exp(double x)
{
return x; return x;
} }
double ldexp(double x, int y){ double ldexp(double x, int y)
{
return x; return x;
} }
double log(double x){ double log(double x)
{
return x; return x;
} }
double log10(double x){ double log10(double x)
{
return x; return x;
} }
double pow(double x, double y){ double pow(double x, double y)
{
return x; return x;
} }
double sqrt(double x){ double sqrt(double x)
{
return x; return x;
} }
double fmod(double x, double y){ double fmod(double x, double y)
{
return x; return x;
} }
#endif /* ! defined (__math_68881) */ #endif /* ! defined (__math_68881) */