Merge pull request #2047 from PX4/nuttx_next_7-9_rand

Updated to Nuttx 7.9 (plus) Includes fix for RAND_MAX
PX4 · Apr 20, 2015 · 98ac880 · 98ac880
2 parents 914cba6 + 4b5ede9
commit 98ac880
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/NuttX b/NuttX
diff --git a/nuttx-patches/Fixed-Shadow-wanings.patch b/nuttx-patches/Fixed-Shadow-wanings.patch
@@ -1,8 +1,8 @@
 diff --git NuttX/nuttx/include/signal.h NuttX/nuttx/include/signal.h
-index ffb77e0..cca6a15 100644
+index 8ef4d5f..f970a49 100644
 --- NuttX/nuttx/include/signal.h
 +++ NuttX/nuttx/include/signal.h
-@@ -260,8 +260,11 @@ int sigfillset(FAR sigset_t *set);
+@@ -271,8 +271,11 @@ int sigfillset(FAR sigset_t *set);
  int sigaddset(FAR sigset_t *set, int signo);
  int sigdelset(FAR sigset_t *set, int signo);
  int sigismember(FAR const sigset_t *set, int signo);
@@ -11,9 +11,9 @@ index ffb77e0..cca6a15 100644
  int sigaction(int sig, FAR const struct sigaction *act,
                FAR struct sigaction *oact);
 +#pragma GCC diagnostic pop
+ void (*sigset(int signo, void (*disp)(int)))(int);
+ int sigignore(int signo);
  int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
- int sigpending(FAR sigset_t *set);
- int sigsuspend(FAR const sigset_t *sigmask);
 diff --git NuttX/nuttx/include/stdio.h NuttX/nuttx/include/stdio.h
 index cb16366..6ff12bb 100644
 --- NuttX/nuttx/include/stdio.h

diff --git a/src/lib/px4_eigen.h b/src/lib/px4_eigen.h
@@ -41,7 +41,6 @@
 #pragma once
 
 #pragma GCC diagnostic push
-#define RAND_MAX __RAND_MAX
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC 1

diff --git a/src/modules/controllib/blocks.hpp b/src/modules/controllib/blocks.hpp
@@ -446,7 +446,7 @@ class __EXPORT BlockRandUniform: public Block
 	};
 	virtual ~BlockRandUniform() {};
 	float update() {
-		static float rand_max = MAX_RAND;
+		static float rand_max = RAND_MAX;
 		float rand_val = rand();
 		float bounds = getMax() - getMin();
 		return getMin() + (rand_val * bounds) / rand_max;
@@ -483,8 +483,8 @@ class __EXPORT BlockRandGauss: public Block
 
 		if (phase == 0) {
 			do {
-				float U1 = (float)rand() / MAX_RAND;
-				float U2 = (float)rand() / MAX_RAND;
+				float U1 = (float)rand() / RAND_MAX;
+				float U2 = (float)rand() / RAND_MAX;
 				V1 = 2 * U1 - 1;
 				V2 = 2 * U2 - 1;
 				S = V1 * V1 + V2 * V2;